From 31141b6c96ebf46f15bb372aca7466b44fd253cb Mon Sep 17 00:00:00 2001 From: Rick Busarow Date: Mon, 26 Sep 2022 14:05:28 -0500 Subject: [PATCH 1/4] update AGP to 7.2.2 --- gradle/libs.versions.toml | 2 +- samples/tutorial/build.gradle | 2 +- .../java/com/squareup/workflow1/ui/container/ViewStateCache.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 799fd3dd19..de782f3ef7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -androidTools = "7.1.3" +androidTools = "7.2.2" compileSdk = "31" minSdkVersion = "21" diff --git a/samples/tutorial/build.gradle b/samples/tutorial/build.gradle index 0f27dcbe73..67df530b23 100644 --- a/samples/tutorial/build.gradle +++ b/samples/tutorial/build.gradle @@ -8,7 +8,7 @@ buildscript { deps = [ activityktx: 'androidx.activity:activity-ktx:1.3.0', - agp: "com.android.tools.build:gradle:7.1.3", + agp: "com.android.tools.build:gradle:7.2.2", appcompat: 'androidx.appcompat:appcompat:1.3.1', constraintlayout: 'androidx.constraintlayout:constraintlayout:2.0.1', kotlin: [ diff --git a/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/container/ViewStateCache.kt b/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/container/ViewStateCache.kt index 15cd002265..a7ea528da9 100644 --- a/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/container/ViewStateCache.kt +++ b/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/container/ViewStateCache.kt @@ -32,7 +32,7 @@ import com.squareup.workflow1.ui.showing public class ViewStateCache @VisibleForTesting(otherwise = PRIVATE) internal constructor( - @VisibleForTesting(otherwise = PRIVATE) + @get:VisibleForTesting(otherwise = PRIVATE) internal val viewStates: MutableMap ) { public constructor() : this(mutableMapOf()) From 54bc8bf52e7161a19e21c178e1244e0863d2b996 Mon Sep 17 00:00:00 2001 From: Rick Busarow Date: Mon, 26 Sep 2022 14:51:06 -0500 Subject: [PATCH 2/4] update AGP to 7.3.0 --- dependencies/classpath.txt | 134 +++++++++++++++++----------------- gradle/libs.versions.toml | 2 +- samples/tutorial/build.gradle | 2 +- 3 files changed, 69 insertions(+), 69 deletions(-) diff --git a/dependencies/classpath.txt b/dependencies/classpath.txt index f619e1e144..65d2887e49 100644 --- a/dependencies/classpath.txt +++ b/dependencies/classpath.txt @@ -1,41 +1,42 @@ -androidx.databinding:databinding-common:7.1.3 -androidx.databinding:databinding-compiler-common:7.1.3 -com.android.databinding:baseLibrary:7.1.3 -com.android.tools.analytics-library:crash:30.1.3 -com.android.tools.analytics-library:protos:30.1.3 -com.android.tools.analytics-library:shared:30.1.3 -com.android.tools.analytics-library:tracker:30.1.3 -com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09 -com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09 -com.android.tools.build:aapt2-proto:7.1.3-7984345 -com.android.tools.build:aaptcompiler:7.1.3 -com.android.tools.build:apksig:7.1.3 -com.android.tools.build:apkzlib:7.1.3 -com.android.tools.build:builder-model:7.1.3 -com.android.tools.build:builder-test-api:7.1.3 -com.android.tools.build:builder:7.1.3 -com.android.tools.build:bundletool:1.8.0 -com.android.tools.build:gradle-api:7.1.3 -com.android.tools.build:gradle:7.1.3 -com.android.tools.build:manifest-merger:30.1.3 +androidx.databinding:databinding-common:7.3.0 +androidx.databinding:databinding-compiler-common:7.3.0 +com.android.databinding:baseLibrary:7.3.0 +com.android.tools.analytics-library:crash:30.3.0 +com.android.tools.analytics-library:protos:30.3.0 +com.android.tools.analytics-library:shared:30.3.0 +com.android.tools.analytics-library:tracker:30.3.0 +com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10 +com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10 +com.android.tools.build:aapt2-proto:7.3.0-8691043 +com.android.tools.build:aaptcompiler:7.3.0 +com.android.tools.build:apksig:7.3.0 +com.android.tools.build:apkzlib:7.3.0 +com.android.tools.build:builder-model:7.3.0 +com.android.tools.build:builder-test-api:7.3.0 +com.android.tools.build:builder:7.3.0 +com.android.tools.build:bundletool:1.9.0 +com.android.tools.build:gradle-api:7.3.0 +com.android.tools.build:gradle:7.3.0 +com.android.tools.build:manifest-merger:30.3.0 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api -com.android.tools.ddms:ddmlib:30.1.3 -com.android.tools.layoutlib:layoutlib-api:30.1.3 -com.android.tools.lint:lint-model:30.1.3 -com.android.tools.utp:android-device-provider-ddmlib-proto:30.1.3 -com.android.tools.utp:android-device-provider-gradle-proto:30.1.3 -com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.1.3 -com.android.tools.utp:android-test-plugin-host-coverage-proto:30.1.3 -com.android.tools.utp:android-test-plugin-host-retention-proto:30.1.3 -com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.1.3 -com.android.tools:annotations:30.1.3 -com.android.tools:common:30.1.3 -com.android.tools:dvlib:30.1.3 -com.android.tools:repository:30.1.3 -com.android.tools:sdk-common:30.1.3 -com.android.tools:sdklib:30.1.3 -com.android:signflinger:7.1.3 -com.android:zipflinger:7.1.3 +com.android.tools.ddms:ddmlib:30.3.0 +com.android.tools.layoutlib:layoutlib-api:30.3.0 +com.android.tools.lint:lint-model:30.3.0 +com.android.tools.lint:lint-typedef-remover:30.3.0 +com.android.tools.utp:android-device-provider-ddmlib-proto:30.3.0 +com.android.tools.utp:android-device-provider-gradle-proto:30.3.0 +com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.3.0 +com.android.tools.utp:android-test-plugin-host-coverage-proto:30.3.0 +com.android.tools.utp:android-test-plugin-host-retention-proto:30.3.0 +com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.3.0 +com.android.tools:annotations:30.3.0 +com.android.tools:common:30.3.0 +com.android.tools:dvlib:30.3.0 +com.android.tools:repository:30.3.0 +com.android.tools:sdk-common:30.3.0 +com.android.tools:sdklib:30.3.0 +com.android:signflinger:7.3.0 +com.android:zipflinger:7.3.0 com.fasterxml.jackson.core:jackson-annotations:2.12.4 com.fasterxml.jackson.core:jackson-core:2.12.4 com.fasterxml.jackson.core:jackson-databind:2.12.4 @@ -46,22 +47,22 @@ com.fasterxml.jackson:jackson-bom:2.12.4 com.fasterxml.woodstox:woodstox-core:6.2.4 com.github.gundy:semver4j:0.16.4 com.google.android:annotations:4.1.1.4 -com.google.api.grpc:proto-google-common-protos:1.12.0 +com.google.api.grpc:proto-google-common-protos:2.0.1 com.google.auto.value:auto-value-annotations:1.6.2 com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.8.9 com.google.crypto.tink:tink:1.3.0-rc2 com.google.dagger:dagger:2.28.3 com.google.devtools.ksp:symbol-processing-gradle-plugin:1.6.21-1.0.6 -com.google.errorprone:error_prone_annotations:2.3.4 +com.google.errorprone:error_prone_annotations:2.4.0 com.google.flatbuffers:flatbuffers-java:1.12.0 com.google.guava:failureaccess:1.0.1 com.google.guava:guava:30.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava com.google.j2objc:j2objc-annotations:1.3 com.google.jimfs:jimfs:1.1 -com.google.protobuf:protobuf-java-util:3.10.0 -com.google.protobuf:protobuf-java:3.10.0 +com.google.protobuf:protobuf-java-util:3.17.2 +com.google.protobuf:protobuf-java:3.17.2 com.google.testing.platform:core-proto:0.0.8-alpha07 com.googlecode.java-diff-utils:diffutils:1.3.0 com.googlecode.json-simple:json-simple:1.1 @@ -79,48 +80,47 @@ com.sun.istack:istack-commons-runtime:3.0.8 com.sun.xml.fastinfoset:FastInfoset:1.2.16 com.vanniktech:gradle-maven-publish-plugin:0.21.0 com.vanniktech:nexus:0.21.0 -commons-codec:commons-codec:1.10 +commons-codec:commons-codec:1.11 commons-io:commons-io:2.4 commons-logging:commons-logging:1.2 de.undercouch:gradle-download-task:4.1.1 -io.grpc:grpc-api:1.21.1 -io.grpc:grpc-context:1.21.1 -io.grpc:grpc-core:1.21.1 -io.grpc:grpc-netty:1.21.1 -io.grpc:grpc-protobuf-lite:1.21.1 -io.grpc:grpc-protobuf:1.21.1 -io.grpc:grpc-stub:1.21.1 -io.netty:netty-buffer:4.1.34.Final -io.netty:netty-codec-http2:4.1.34.Final -io.netty:netty-codec-http:4.1.34.Final -io.netty:netty-codec-socks:4.1.34.Final -io.netty:netty-codec:4.1.34.Final -io.netty:netty-common:4.1.34.Final -io.netty:netty-handler-proxy:4.1.34.Final -io.netty:netty-handler:4.1.34.Final -io.netty:netty-resolver:4.1.34.Final -io.netty:netty-transport:4.1.34.Final -io.opencensus:opencensus-api:0.21.0 -io.opencensus:opencensus-contrib-grpc-metrics:0.21.0 +io.grpc:grpc-api:1.39.0 +io.grpc:grpc-context:1.39.0 +io.grpc:grpc-core:1.39.0 +io.grpc:grpc-netty:1.39.0 +io.grpc:grpc-protobuf-lite:1.39.0 +io.grpc:grpc-protobuf:1.39.0 +io.grpc:grpc-stub:1.39.0 +io.netty:netty-buffer:4.1.52.Final +io.netty:netty-codec-http2:4.1.52.Final +io.netty:netty-codec-http:4.1.52.Final +io.netty:netty-codec-socks:4.1.52.Final +io.netty:netty-codec:4.1.52.Final +io.netty:netty-common:4.1.52.Final +io.netty:netty-handler-proxy:4.1.52.Final +io.netty:netty-handler:4.1.52.Final +io.netty:netty-resolver:4.1.52.Final +io.netty:netty-transport:4.1.52.Final +io.perfmark:perfmark-api:0.23.0 it.unimi.dsi:fastutil:8.4.0 jakarta.activation:jakarta.activation-api:1.2.1 jakarta.xml.bind:jakarta.xml.bind-api:2.3.2 +javax.annotation:javax.annotation-api:1.3.2 javax.inject:javax.inject:1 net.java.dev.jna:jna-platform:5.6.0 net.java.dev.jna:jna:5.6.0 net.sf.jopt-simple:jopt-simple:4.9 net.sf.kxml:kxml2:2.3.0 -org.antlr:antlr4:4.5.3 org.apache.commons:commons-compress:1.20 org.apache.commons:commons-math3:3.2 -org.apache.httpcomponents:httpclient:4.5.6 -org.apache.httpcomponents:httpcore:4.4.10 +org.apache.httpcomponents:httpclient:4.5.13 +org.apache.httpcomponents:httpcore:4.4.13 org.apache.httpcomponents:httpmime:4.5.6 org.bitbucket.b_c:jose4j:0.7.0 -org.bouncycastle:bcpkix-jdk15on:1.56 -org.bouncycastle:bcprov-jdk15on:1.56 +org.bouncycastle:bcpkix-jdk15on:1.67 +org.bouncycastle:bcprov-jdk15on:1.67 org.checkerframework:checker-qual:3.5.0 -org.codehaus.mojo:animal-sniffer-annotations:1.17 +org.codehaus.mojo:animal-sniffer-annotations:1.19 org.codehaus.woodstox:stax2-api:4.2.1 org.glassfish.jaxb:jaxb-runtime:2.3.2 org.glassfish.jaxb:txw2:2.3.2 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index de782f3ef7..9dee054455 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -androidTools = "7.2.2" +androidTools = "7.3.0" compileSdk = "31" minSdkVersion = "21" diff --git a/samples/tutorial/build.gradle b/samples/tutorial/build.gradle index 67df530b23..175b71cfe6 100644 --- a/samples/tutorial/build.gradle +++ b/samples/tutorial/build.gradle @@ -8,7 +8,7 @@ buildscript { deps = [ activityktx: 'androidx.activity:activity-ktx:1.3.0', - agp: "com.android.tools.build:gradle:7.2.2", + agp: "com.android.tools.build:gradle:7.3.0", appcompat: 'androidx.appcompat:appcompat:1.3.1', constraintlayout: 'androidx.constraintlayout:constraintlayout:2.0.1', kotlin: [ From 5aadf110e1e1ea4fd241ee8498a922cd1ffb7bef Mon Sep 17 00:00:00 2001 From: Rick Busarow Date: Mon, 26 Sep 2022 14:53:21 -0500 Subject: [PATCH 3/4] declare namespace in `build.gradle.kts` instead of `AndroidManifest.xml` --- benchmarks/dungeon-benchmark/build.gradle.kts | 1 + benchmarks/dungeon-benchmark/src/main/AndroidManifest.xml | 3 +-- .../performance-poetry/complex-benchmark/build.gradle.kts | 1 + .../complex-benchmark/src/main/AndroidManifest.xml | 3 +-- .../performance-poetry/complex-poetry/build.gradle.kts | 1 + .../complex-poetry/src/main/AndroidManifest.xml | 3 +-- samples/compose-samples/build.gradle.kts | 1 + samples/compose-samples/src/main/AndroidManifest.xml | 4 +--- samples/containers/android/build.gradle.kts | 1 + samples/containers/android/src/main/AndroidManifest.xml | 5 ----- samples/containers/app-poetry/build.gradle.kts | 1 + samples/containers/app-poetry/src/main/AndroidManifest.xml | 4 +--- samples/containers/app-raven/build.gradle.kts | 1 + samples/containers/app-raven/src/main/AndroidManifest.xml | 4 +--- samples/containers/hello-back-button/build.gradle.kts | 1 + .../hello-back-button/src/main/AndroidManifest.xml | 4 +--- samples/containers/poetry/build.gradle.kts | 4 ++++ samples/containers/poetry/src/main/AndroidManifest.xml | 5 ----- samples/dungeon/app/build.gradle.kts | 1 + samples/dungeon/app/src/main/AndroidManifest.xml | 3 +-- samples/dungeon/timemachine-shakeable/build.gradle.kts | 4 ++++ .../timemachine-shakeable/src/main/AndroidManifest.xml | 1 - samples/hello-workflow-fragment/build.gradle.kts | 1 + samples/hello-workflow-fragment/src/main/AndroidManifest.xml | 4 +--- samples/hello-workflow/build.gradle.kts | 1 + samples/hello-workflow/src/main/AndroidManifest.xml | 4 +--- samples/stub-visibility/build.gradle.kts | 1 + samples/stub-visibility/src/main/AndroidManifest.xml | 4 +--- samples/tictactoe/app/build.gradle.kts | 1 + samples/tictactoe/app/src/main/AndroidManifest.xml | 4 +--- samples/todo-android/app/build.gradle.kts | 1 + samples/todo-android/app/src/main/AndroidManifest.xml | 4 +--- workflow-config/config-android/build.gradle.kts | 1 + workflow-config/config-android/src/main/AndroidManifest.xml | 1 - workflow-ui/compose-tooling/build.gradle.kts | 1 + .../compose-tooling/src/androidTest/AndroidManifest.xml | 3 +-- workflow-ui/compose-tooling/src/main/AndroidManifest.xml | 1 - workflow-ui/compose/build.gradle.kts | 2 ++ workflow-ui/compose/src/androidTest/AndroidManifest.xml | 3 +-- workflow-ui/compose/src/main/AndroidManifest.xml | 1 - workflow-ui/container-android/build.gradle.kts | 4 ++++ .../container-android/src/androidTest/AndroidManifest.xml | 3 +-- workflow-ui/container-android/src/main/AndroidManifest.xml | 1 - workflow-ui/core-android/build.gradle.kts | 4 ++++ workflow-ui/core-android/src/androidTest/AndroidManifest.xml | 3 +-- workflow-ui/core-android/src/main/AndroidManifest.xml | 1 - workflow-ui/internal-testing-android/build.gradle.kts | 4 ++++ .../internal-testing-android/src/main/AndroidManifest.xml | 3 +-- workflow-ui/internal-testing-compose/build.gradle.kts | 4 ++++ .../internal-testing-compose/src/main/AndroidManifest.xml | 5 ----- workflow-ui/radiography/build.gradle.kts | 4 ++++ workflow-ui/radiography/src/androidTest/AndroidManifest.xml | 1 - workflow-ui/radiography/src/main/AndroidManifest.xml | 2 +- 53 files changed, 65 insertions(+), 68 deletions(-) delete mode 100644 samples/containers/android/src/main/AndroidManifest.xml delete mode 100644 samples/containers/poetry/src/main/AndroidManifest.xml delete mode 100644 samples/dungeon/timemachine-shakeable/src/main/AndroidManifest.xml delete mode 100644 workflow-config/config-android/src/main/AndroidManifest.xml delete mode 100644 workflow-ui/compose-tooling/src/main/AndroidManifest.xml delete mode 100644 workflow-ui/compose/src/main/AndroidManifest.xml delete mode 100644 workflow-ui/container-android/src/main/AndroidManifest.xml delete mode 100644 workflow-ui/core-android/src/main/AndroidManifest.xml delete mode 100644 workflow-ui/internal-testing-compose/src/main/AndroidManifest.xml delete mode 100644 workflow-ui/radiography/src/androidTest/AndroidManifest.xml diff --git a/benchmarks/dungeon-benchmark/build.gradle.kts b/benchmarks/dungeon-benchmark/build.gradle.kts index f1240671b9..6f251f2179 100644 --- a/benchmarks/dungeon-benchmark/build.gradle.kts +++ b/benchmarks/dungeon-benchmark/build.gradle.kts @@ -35,6 +35,7 @@ android { } targetProjectPath = ":samples:dungeon:app" + namespace = "com.squareup.sample.dungeon.benchmark" experimentalProperties["android.experimental.self-instrumenting"] = true } diff --git a/benchmarks/dungeon-benchmark/src/main/AndroidManifest.xml b/benchmarks/dungeon-benchmark/src/main/AndroidManifest.xml index d52b8b74f1..226cc67d8b 100644 --- a/benchmarks/dungeon-benchmark/src/main/AndroidManifest.xml +++ b/benchmarks/dungeon-benchmark/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> diff --git a/benchmarks/performance-poetry/complex-benchmark/build.gradle.kts b/benchmarks/performance-poetry/complex-benchmark/build.gradle.kts index 293a57a044..ee759e3fde 100644 --- a/benchmarks/performance-poetry/complex-benchmark/build.gradle.kts +++ b/benchmarks/performance-poetry/complex-benchmark/build.gradle.kts @@ -44,6 +44,7 @@ android { } targetProjectPath = ":benchmarks:performance-poetry:complex-poetry" + namespace = "com.squareup.benchmarks.performance.poetry.complex.benchmark" experimentalProperties["android.experimental.self-instrumenting"] = true } diff --git a/benchmarks/performance-poetry/complex-benchmark/src/main/AndroidManifest.xml b/benchmarks/performance-poetry/complex-benchmark/src/main/AndroidManifest.xml index 37d1a1b7ee..8805088665 100644 --- a/benchmarks/performance-poetry/complex-benchmark/src/main/AndroidManifest.xml +++ b/benchmarks/performance-poetry/complex-benchmark/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> diff --git a/benchmarks/performance-poetry/complex-poetry/build.gradle.kts b/benchmarks/performance-poetry/complex-poetry/build.gradle.kts index 74dd2f48d6..62f9d8e00e 100644 --- a/benchmarks/performance-poetry/complex-poetry/build.gradle.kts +++ b/benchmarks/performance-poetry/complex-poetry/build.gradle.kts @@ -43,6 +43,7 @@ android { resources.excludes.add("META-INF/AL2.0") resources.excludes.add("META-INF/LGPL2.1") } + namespace = "com.squareup.benchmarks.performance.complex.poetry" } dependencies { diff --git a/benchmarks/performance-poetry/complex-poetry/src/main/AndroidManifest.xml b/benchmarks/performance-poetry/complex-poetry/src/main/AndroidManifest.xml index 2e48d8fc2a..6e2828cf50 100644 --- a/benchmarks/performance-poetry/complex-poetry/src/main/AndroidManifest.xml +++ b/benchmarks/performance-poetry/complex-poetry/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> + xmlns:tools="http://schemas.android.com/tools"> - diff --git a/samples/containers/app-poetry/build.gradle.kts b/samples/containers/app-poetry/build.gradle.kts index 9e59dfdd60..e29cba9833 100644 --- a/samples/containers/app-poetry/build.gradle.kts +++ b/samples/containers/app-poetry/build.gradle.kts @@ -9,6 +9,7 @@ android { defaultConfig { applicationId = "com.squareup.sample.containers.poetry" } + namespace = "com.squareup.sample.container.poetryapp" } dependencies { diff --git a/samples/containers/app-poetry/src/main/AndroidManifest.xml b/samples/containers/app-poetry/src/main/AndroidManifest.xml index b1f9293359..8b398d0b2d 100644 --- a/samples/containers/app-poetry/src/main/AndroidManifest.xml +++ b/samples/containers/app-poetry/src/main/AndroidManifest.xml @@ -1,8 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> + xmlns:tools="http://schemas.android.com/tools"> + xmlns:tools="http://schemas.android.com/tools"> - diff --git a/samples/dungeon/app/build.gradle.kts b/samples/dungeon/app/build.gradle.kts index 5a48a816bf..fa1822612c 100644 --- a/samples/dungeon/app/build.gradle.kts +++ b/samples/dungeon/app/build.gradle.kts @@ -19,6 +19,7 @@ android { isDebuggable = false } } + namespace = "com.squareup.sample.dungeon" } dependencies { diff --git a/samples/dungeon/app/src/main/AndroidManifest.xml b/samples/dungeon/app/src/main/AndroidManifest.xml index 46c927beb0..a8cc3bb22d 100644 --- a/samples/dungeon/app/src/main/AndroidManifest.xml +++ b/samples/dungeon/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/samples/dungeon/timemachine-shakeable/build.gradle.kts b/samples/dungeon/timemachine-shakeable/build.gradle.kts index bf4529f680..7794ba4c4c 100644 --- a/samples/dungeon/timemachine-shakeable/build.gradle.kts +++ b/samples/dungeon/timemachine-shakeable/build.gradle.kts @@ -4,6 +4,10 @@ plugins { `android-defaults` } +android { + namespace = "com.squareup.sample.timemachine.shakeable" +} + dependencies { api(libs.kotlinx.coroutines.core) diff --git a/samples/dungeon/timemachine-shakeable/src/main/AndroidManifest.xml b/samples/dungeon/timemachine-shakeable/src/main/AndroidManifest.xml deleted file mode 100644 index dffb8ece08..0000000000 --- a/samples/dungeon/timemachine-shakeable/src/main/AndroidManifest.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/samples/hello-workflow-fragment/build.gradle.kts b/samples/hello-workflow-fragment/build.gradle.kts index 684d979b9f..cbc93bc9a6 100644 --- a/samples/hello-workflow-fragment/build.gradle.kts +++ b/samples/hello-workflow-fragment/build.gradle.kts @@ -9,6 +9,7 @@ android { defaultConfig { applicationId = "com.squareup.sample.helloworkflowfragment" } + namespace = "com.squareup.sample.helloworkflowfragment" } dependencies { diff --git a/samples/hello-workflow-fragment/src/main/AndroidManifest.xml b/samples/hello-workflow-fragment/src/main/AndroidManifest.xml index 5b48ebc985..38b8dc545d 100644 --- a/samples/hello-workflow-fragment/src/main/AndroidManifest.xml +++ b/samples/hello-workflow-fragment/src/main/AndroidManifest.xml @@ -1,8 +1,6 @@ + xmlns:android="http://schemas.android.com/apk/res/android"> + xmlns:tools="http://schemas.android.com/tools"> + xmlns:tools="http://schemas.android.com/tools"> + xmlns:android="http://schemas.android.com/apk/res/android"> + xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/workflow-ui/compose-tooling/build.gradle.kts b/workflow-ui/compose-tooling/build.gradle.kts index e77a716852..bf7e67d629 100644 --- a/workflow-ui/compose-tooling/build.gradle.kts +++ b/workflow-ui/compose-tooling/build.gradle.kts @@ -13,6 +13,7 @@ android { composeOptions { kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get() } + namespace = "com.squareup.workflow1.ui.compose.tooling" } tasks.withType { diff --git a/workflow-ui/compose-tooling/src/androidTest/AndroidManifest.xml b/workflow-ui/compose-tooling/src/androidTest/AndroidManifest.xml index 26c0bd9700..1258204722 100644 --- a/workflow-ui/compose-tooling/src/androidTest/AndroidManifest.xml +++ b/workflow-ui/compose-tooling/src/androidTest/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/workflow-ui/compose-tooling/src/main/AndroidManifest.xml b/workflow-ui/compose-tooling/src/main/AndroidManifest.xml deleted file mode 100644 index 53ca86b966..0000000000 --- a/workflow-ui/compose-tooling/src/main/AndroidManifest.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/workflow-ui/compose/build.gradle.kts b/workflow-ui/compose/build.gradle.kts index 9cee32f854..7d37d9de0a 100644 --- a/workflow-ui/compose/build.gradle.kts +++ b/workflow-ui/compose/build.gradle.kts @@ -13,6 +13,8 @@ android { composeOptions { kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get() } + namespace = "com.squareup.workflow1.ui.compose" + testNamespace = "$namespace.test" } tasks.withType { diff --git a/workflow-ui/compose/src/androidTest/AndroidManifest.xml b/workflow-ui/compose/src/androidTest/AndroidManifest.xml index 5ac2378db6..1258204722 100644 --- a/workflow-ui/compose/src/androidTest/AndroidManifest.xml +++ b/workflow-ui/compose/src/androidTest/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/workflow-ui/compose/src/main/AndroidManifest.xml b/workflow-ui/compose/src/main/AndroidManifest.xml deleted file mode 100644 index bc54873272..0000000000 --- a/workflow-ui/compose/src/main/AndroidManifest.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/workflow-ui/container-android/build.gradle.kts b/workflow-ui/container-android/build.gradle.kts index f744c5bb7d..70c09a669b 100644 --- a/workflow-ui/container-android/build.gradle.kts +++ b/workflow-ui/container-android/build.gradle.kts @@ -6,6 +6,10 @@ plugins { published } +android { + namespace = "com.squareup.workflow1.ui.container" +} + dependencies { androidTestImplementation(libs.truth) diff --git a/workflow-ui/container-android/src/androidTest/AndroidManifest.xml b/workflow-ui/container-android/src/androidTest/AndroidManifest.xml index a6184b59e4..65f648973b 100644 --- a/workflow-ui/container-android/src/androidTest/AndroidManifest.xml +++ b/workflow-ui/container-android/src/androidTest/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/workflow-ui/container-android/src/main/AndroidManifest.xml b/workflow-ui/container-android/src/main/AndroidManifest.xml deleted file mode 100644 index 71d6c67c76..0000000000 --- a/workflow-ui/container-android/src/main/AndroidManifest.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/workflow-ui/core-android/build.gradle.kts b/workflow-ui/core-android/build.gradle.kts index 993fbb53b7..f1b403931e 100644 --- a/workflow-ui/core-android/build.gradle.kts +++ b/workflow-ui/core-android/build.gradle.kts @@ -6,6 +6,10 @@ plugins { published } +android { + namespace = "com.squareup.workflow1.ui" +} + dependencies { androidTestImplementation(libs.androidx.appcompat) androidTestImplementation(libs.truth) diff --git a/workflow-ui/core-android/src/androidTest/AndroidManifest.xml b/workflow-ui/core-android/src/androidTest/AndroidManifest.xml index c94fa29cc5..21a1bb76f4 100644 --- a/workflow-ui/core-android/src/androidTest/AndroidManifest.xml +++ b/workflow-ui/core-android/src/androidTest/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/workflow-ui/internal-testing-android/build.gradle.kts b/workflow-ui/internal-testing-android/build.gradle.kts index d2fd2b0419..89b5e679de 100644 --- a/workflow-ui/internal-testing-android/build.gradle.kts +++ b/workflow-ui/internal-testing-android/build.gradle.kts @@ -7,6 +7,10 @@ plugins { // This module is not published, since it's just internal testing utilities. +android { + namespace = "com.squareup.workflow1.ui.internal.test" +} + dependencies { api(libs.androidx.appcompat) api(libs.androidx.lifecycle.core) diff --git a/workflow-ui/internal-testing-android/src/main/AndroidManifest.xml b/workflow-ui/internal-testing-android/src/main/AndroidManifest.xml index a86b70eb03..09bce65b3b 100644 --- a/workflow-ui/internal-testing-android/src/main/AndroidManifest.xml +++ b/workflow-ui/internal-testing-android/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + - - - diff --git a/workflow-ui/radiography/build.gradle.kts b/workflow-ui/radiography/build.gradle.kts index 6e8c369f7d..389783a0af 100644 --- a/workflow-ui/radiography/build.gradle.kts +++ b/workflow-ui/radiography/build.gradle.kts @@ -6,6 +6,10 @@ plugins { published } +android { + namespace = "com.squareup.workflow1.ui.radiography" +} + dependencies { androidTestImplementation(libs.androidx.test.core) androidTestImplementation(libs.androidx.test.truth) diff --git a/workflow-ui/radiography/src/androidTest/AndroidManifest.xml b/workflow-ui/radiography/src/androidTest/AndroidManifest.xml deleted file mode 100644 index 181f05d22b..0000000000 --- a/workflow-ui/radiography/src/androidTest/AndroidManifest.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/workflow-ui/radiography/src/main/AndroidManifest.xml b/workflow-ui/radiography/src/main/AndroidManifest.xml index 4fa5b6e00c..cc947c5679 100644 --- a/workflow-ui/radiography/src/main/AndroidManifest.xml +++ b/workflow-ui/radiography/src/main/AndroidManifest.xml @@ -1 +1 @@ - + From 2ceef0b35ae74a778d15a42598dfedcdf0c418fd Mon Sep 17 00:00:00 2001 From: Rick Busarow Date: Mon, 26 Sep 2022 17:25:07 -0500 Subject: [PATCH 4/4] update tutorials AGP to 7.3.0 --- samples/tutorial/build.gradle | 2 +- samples/tutorial/tutorial-1-complete/build.gradle | 7 ++++--- .../tutorial-1-complete/src/main/AndroidManifest.xml | 11 ++++++----- samples/tutorial/tutorial-2-complete/build.gradle | 7 ++++--- .../tutorial-2-complete/src/main/AndroidManifest.xml | 11 ++++++----- samples/tutorial/tutorial-3-complete/build.gradle | 7 ++++--- .../tutorial-3-complete/src/main/AndroidManifest.xml | 11 ++++++----- samples/tutorial/tutorial-4-complete/build.gradle | 7 ++++--- .../tutorial-4-complete/src/main/AndroidManifest.xml | 11 ++++++----- samples/tutorial/tutorial-base/build.gradle | 7 ++++--- .../tutorial-base/src/main/AndroidManifest.xml | 11 ++++++----- samples/tutorial/tutorial-final/build.gradle | 7 ++++--- .../tutorial-final/src/main/AndroidManifest.xml | 11 ++++++----- samples/tutorial/tutorial-views/build.gradle | 9 ++++----- .../tutorial-views/src/main/AndroidManifest.xml | 2 -- 15 files changed, 65 insertions(+), 56 deletions(-) delete mode 100644 samples/tutorial/tutorial-views/src/main/AndroidManifest.xml diff --git a/samples/tutorial/build.gradle b/samples/tutorial/build.gradle index 175b71cfe6..81c9c992ef 100644 --- 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 index 576f340f82..c9c7e8b7b8 100644 --- 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 index d0ce3344ed..bfc92c7b0c 100644 --- a/samples/tutorial/tutorial-1-complete/src/main/AndroidManifest.xml +++ b/samples/tutorial/tutorial-1-complete/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + - + - + - + diff --git a/samples/tutorial/tutorial-2-complete/build.gradle b/samples/tutorial/tutorial-2-complete/build.gradle index f693daecf8..c9b9f9d056 100644 --- 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 index d0ce3344ed..bfc92c7b0c 100644 --- a/samples/tutorial/tutorial-2-complete/src/main/AndroidManifest.xml +++ b/samples/tutorial/tutorial-2-complete/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + - + - + - + diff --git a/samples/tutorial/tutorial-3-complete/build.gradle b/samples/tutorial/tutorial-3-complete/build.gradle index f693daecf8..c9b9f9d056 100644 --- 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 index d0ce3344ed..bfc92c7b0c 100644 --- a/samples/tutorial/tutorial-3-complete/src/main/AndroidManifest.xml +++ b/samples/tutorial/tutorial-3-complete/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + - + - + - + diff --git a/samples/tutorial/tutorial-4-complete/build.gradle b/samples/tutorial/tutorial-4-complete/build.gradle index f693daecf8..c9b9f9d056 100644 --- 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 index d0ce3344ed..bfc92c7b0c 100644 --- a/samples/tutorial/tutorial-4-complete/src/main/AndroidManifest.xml +++ b/samples/tutorial/tutorial-4-complete/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + - + - + - + diff --git a/samples/tutorial/tutorial-base/build.gradle b/samples/tutorial/tutorial-base/build.gradle index 5666297ef6..4ff9af2363 100644 --- 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 index 0088c67987..3c0e4ce754 100644 --- a/samples/tutorial/tutorial-base/src/main/AndroidManifest.xml +++ b/samples/tutorial/tutorial-base/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + - + - + - + diff --git a/samples/tutorial/tutorial-final/build.gradle b/samples/tutorial/tutorial-final/build.gradle index 3e87d5cf1b..8b8cb1e6fe 100644 --- 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 index d0ce3344ed..bfc92c7b0c 100644 --- a/samples/tutorial/tutorial-final/src/main/AndroidManifest.xml +++ b/samples/tutorial/tutorial-final/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + - + - + - + diff --git a/samples/tutorial/tutorial-views/build.gradle b/samples/tutorial/tutorial-views/build.gradle index 480b9aaff2..7e94a61699 100644 --- 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 deleted file mode 100644 index 7f04383e27..0000000000 --- a/samples/tutorial/tutorial-views/src/main/AndroidManifest.xml +++ /dev/null @@ -1,2 +0,0 @@ - -