update tutorials AGP to 7.3.0

RBusarow · RBusarow · commit fce8a4202f55 · 2022-09-26T17:25:39.000-05:00
diff --git a/samples/tutorial/build.gradle b/samples/tutorial/build.gradle
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
   ext {
-    kotlin_version = "1.6.10"
+    kotlin_version = '1.6.21'
     workflow_version = "1.7.1"
 
     deps = [
diff --git a/samples/tutorial/tutorial-1-complete/build.gradle b/samples/tutorial/tutorial-1-complete/build.gradle
@@ -4,12 +4,12 @@ plugins {
 }
 
 android {
-  compileSdkVersion 31
+  compileSdk = 32
 
   defaultConfig {
     applicationId "com.squareup.workflow.tutorial"
-    minSdkVersion 21
-    targetSdkVersion 30
+    minSdk = 21
+    targetSdk = 32
     versionCode 1
     versionName "1.0"
 
@@ -23,6 +23,7 @@ android {
   kotlinOptions {
     jvmTarget = '1.8'
   }
+  namespace 'workflow.tutorial'
 }
 
 dependencies {
diff --git a/samples/tutorial/tutorial-1-complete/src/main/AndroidManifest.xml b/samples/tutorial/tutorial-1-complete/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="workflow.tutorial">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
   <application
       android:allowBackup="true"
@@ -9,11 +8,13 @@
       android:roundIcon="@mipmap/ic_launcher_round"
       android:supportsRtl="true"
       android:theme="@style/Theme.WorkflowTutorial">
-    <activity android:name=".TutorialActivity">
+    <activity
+        android:name=".TutorialActivity"
+        android:exported="true">
       <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
+        <action android:name="android.intent.action.MAIN"/>
 
-        <category android:name="android.intent.category.LAUNCHER" />
+        <category android:name="android.intent.category.LAUNCHER"/>
       </intent-filter>
     </activity>
   </application>
diff --git a/samples/tutorial/tutorial-2-complete/build.gradle b/samples/tutorial/tutorial-2-complete/build.gradle
@@ -4,12 +4,12 @@ plugins {
 }
 
 android {
-  compileSdkVersion 31
+  compileSdk = 32
 
   defaultConfig {
     applicationId "workflow.tutorial"
-    minSdkVersion 21
-    targetSdkVersion 30
+    minSdk = 21
+    targetSdk = 32
     versionCode 1
     versionName "1.0"
 
@@ -23,6 +23,7 @@ android {
   kotlinOptions {
     jvmTarget = '1.8'
   }
+  namespace 'workflow.tutorial'
 }
 
 dependencies {
diff --git a/samples/tutorial/tutorial-2-complete/src/main/AndroidManifest.xml b/samples/tutorial/tutorial-2-complete/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="workflow.tutorial">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
   <application
       android:allowBackup="true"
@@ -9,11 +8,13 @@
       android:roundIcon="@mipmap/ic_launcher_round"
       android:supportsRtl="true"
       android:theme="@style/Theme.WorkflowTutorial">
-    <activity android:name=".TutorialActivity">
+    <activity
+        android:name=".TutorialActivity"
+        android:exported="true">
       <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
+        <action android:name="android.intent.action.MAIN"/>
 
-        <category android:name="android.intent.category.LAUNCHER" />
+        <category android:name="android.intent.category.LAUNCHER"/>
       </intent-filter>
     </activity>
   </application>
diff --git a/samples/tutorial/tutorial-3-complete/build.gradle b/samples/tutorial/tutorial-3-complete/build.gradle
@@ -4,12 +4,12 @@ plugins {
 }
 
 android {
-  compileSdkVersion 31
+  compileSdk = 32
 
   defaultConfig {
     applicationId "workflow.tutorial"
-    minSdkVersion 21
-    targetSdkVersion 30
+    minSdk = 21
+    targetSdk = 32
     versionCode 1
     versionName "1.0"
 
@@ -23,6 +23,7 @@ android {
   kotlinOptions {
     jvmTarget = '1.8'
   }
+  namespace 'workflow.tutorial'
 }
 
 dependencies {
diff --git a/samples/tutorial/tutorial-3-complete/src/main/AndroidManifest.xml b/samples/tutorial/tutorial-3-complete/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="workflow.tutorial">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
   <application
       android:allowBackup="true"
@@ -9,11 +8,13 @@
       android:roundIcon="@mipmap/ic_launcher_round"
       android:supportsRtl="true"
       android:theme="@style/Theme.WorkflowTutorial">
-    <activity android:name=".TutorialActivity">
+    <activity
+        android:name=".TutorialActivity"
+        android:exported="true">
       <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
+        <action android:name="android.intent.action.MAIN"/>
 
-        <category android:name="android.intent.category.LAUNCHER" />
+        <category android:name="android.intent.category.LAUNCHER"/>
       </intent-filter>
     </activity>
   </application>
diff --git a/samples/tutorial/tutorial-4-complete/build.gradle b/samples/tutorial/tutorial-4-complete/build.gradle
@@ -4,12 +4,12 @@ plugins {
 }
 
 android {
-  compileSdkVersion 31
+  compileSdk = 32
 
   defaultConfig {
     applicationId "workflow.tutorial"
-    minSdkVersion 21
-    targetSdkVersion 30
+    minSdk = 21
+    targetSdk = 32
     versionCode 1
     versionName "1.0"
 
@@ -23,6 +23,7 @@ android {
   kotlinOptions {
     jvmTarget = '1.8'
   }
+  namespace 'workflow.tutorial'
 }
 
 dependencies {
diff --git a/samples/tutorial/tutorial-4-complete/src/main/AndroidManifest.xml b/samples/tutorial/tutorial-4-complete/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="workflow.tutorial">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
   <application
       android:allowBackup="true"
@@ -9,11 +8,13 @@
       android:roundIcon="@mipmap/ic_launcher_round"
       android:supportsRtl="true"
       android:theme="@style/Theme.WorkflowTutorial">
-    <activity android:name=".TutorialActivity">
+    <activity
+        android:name=".TutorialActivity"
+        android:exported="true">
       <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
+        <action android:name="android.intent.action.MAIN"/>
 
-        <category android:name="android.intent.category.LAUNCHER" />
+        <category android:name="android.intent.category.LAUNCHER"/>
       </intent-filter>
     </activity>
   </application>
diff --git a/samples/tutorial/tutorial-base/build.gradle b/samples/tutorial/tutorial-base/build.gradle
@@ -4,12 +4,12 @@ plugins {
 }
 
 android {
-  compileSdkVersion 31
+  compileSdk = 32
 
   defaultConfig {
     applicationId "workflow.tutorial"
-    minSdkVersion 21
-    targetSdkVersion 30
+    minSdk = 21
+    targetSdk = 32
     versionCode 1
     versionName "1.0"
 
@@ -23,6 +23,7 @@ android {
   kotlinOptions {
     jvmTarget = '1.8'
   }
+  namespace 'workflow.tutorial'
 }
 
 dependencies {
diff --git a/samples/tutorial/tutorial-base/src/main/AndroidManifest.xml b/samples/tutorial/tutorial-base/src/main/AndroidManifest.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="workflow.tutorial">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
   <application
       android:icon="@mipmap/ic_launcher"
       android:label="@string/app_name"
       android:roundIcon="@mipmap/ic_launcher_round"
       android:supportsRtl="true"
       android:theme="@style/Theme.WorkflowTutorial">
-    <activity android:name=".TutorialActivity">
+    <activity
+        android:name=".TutorialActivity"
+        android:exported="true">
       <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
+        <action android:name="android.intent.action.MAIN"/>
 
-        <category android:name="android.intent.category.LAUNCHER" />
+        <category android:name="android.intent.category.LAUNCHER"/>
       </intent-filter>
     </activity>
   </application>
diff --git a/samples/tutorial/tutorial-final/build.gradle b/samples/tutorial/tutorial-final/build.gradle
@@ -4,12 +4,12 @@ plugins {
 }
 
 android {
-  compileSdkVersion 31
+  compileSdk = 32
 
   defaultConfig {
     applicationId "workflow.tutorial"
-    minSdkVersion 21
-    targetSdkVersion 30
+    minSdk = 21
+    targetSdk = 32
     versionCode 1
     versionName "1.0"
 
@@ -23,6 +23,7 @@ android {
   kotlinOptions {
     jvmTarget = '1.8'
   }
+  namespace 'workflow.tutorial'
 }
 
 dependencies {
diff --git a/samples/tutorial/tutorial-final/src/main/AndroidManifest.xml b/samples/tutorial/tutorial-final/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="workflow.tutorial">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
   <application
       android:allowBackup="true"
@@ -9,11 +8,13 @@
       android:roundIcon="@mipmap/ic_launcher_round"
       android:supportsRtl="true"
       android:theme="@style/Theme.WorkflowTutorial">
-    <activity android:name=".TutorialActivity">
+    <activity
+        android:name=".TutorialActivity"
+        android:exported="true">
       <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
+        <action android:name="android.intent.action.MAIN"/>
 
-        <category android:name="android.intent.category.LAUNCHER" />
+        <category android:name="android.intent.category.LAUNCHER"/>
       </intent-filter>
     </activity>
   </application>
diff --git a/samples/tutorial/tutorial-views/build.gradle b/samples/tutorial/tutorial-views/build.gradle
@@ -4,13 +4,11 @@ plugins {
 }
 
 android {
-  compileSdkVersion 31
+  compileSdk = 32
 
   defaultConfig {
-    minSdkVersion 21
-    targetSdkVersion 30
-    versionCode 1
-    versionName "1.0"
+    minSdk = 21
+    targetSdk = 32
 
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }
@@ -27,6 +25,7 @@ android {
   buildFeatures {
     viewBinding = true
   }
+  namespace 'workflow.tutorial.views'
 }
 
 dependencies {
diff --git a/samples/tutorial/tutorial-views/src/main/AndroidManifest.xml b/samples/tutorial/tutorial-views/src/main/AndroidManifest.xml

Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,12 @@ plugins {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`android {`
`7`		`- compileSdkVersion 31`
	`7`	`+ compileSdk = 32`
`8`	`8`
`9`	`9`	`defaultConfig {`
`10`	`10`	`applicationId "com.squareup.workflow.tutorial"`
`11`		`- minSdkVersion 21`
`12`		`- targetSdkVersion 30`
	`11`	`+ minSdk = 21`
	`12`	`+ targetSdk = 32`
`13`	`13`	`versionCode 1`
`14`	`14`	`versionName "1.0"`
`15`	`15`
`@@ -23,6 +23,7 @@ android {`
`23`	`23`	`kotlinOptions {`
`24`	`24`	`jvmTarget = '1.8'`
`25`	`25`	`}`
	`26`	`+ namespace 'workflow.tutorial'`
`26`	`27`	`}`
`27`	`28`
`28`	`29`	`dependencies {`