Merge pull request #879 from square/rick/AGP_7.2.2

update AGP to 7.3.0

Author: RBusarow

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
 }
 

benchmarks/dungeon-benchmark/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.squareup.sample.dungeon.benchmark">
+    xmlns:tools="http://schemas.android.com/tools">
 
   <queries>
     <package android:name="com.squareup.sample.dungeon" />

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
 }
 

benchmarks/performance-poetry/complex-benchmark/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.squareup.benchmarks.performance.poetry.complex.benchmark">
+    xmlns:tools="http://schemas.android.com/tools">
 
   <queries>
     <package android:name="com.squareup.benchmarks.performance.complex.poetry" />

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 {

benchmarks/performance-poetry/complex-poetry/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.squareup.benchmarks.performance.complex.poetry">
+    xmlns:tools="http://schemas.android.com/tools">
 
   <uses-permission
       android:name="android.permission.WRITE_EXTERNAL_STORAGE"

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

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 
-androidTools = "7.1.3"
+androidTools = "7.3.0"
 
 compileSdk = "31"
 minSdkVersion = "21"

samples/compose-samples/build.gradle.kts

@@ -16,6 +16,7 @@ android {
   composeOptions {
     kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
   }
+  namespace = "com.squareup.sample.compose"
 }
 
 dependencies {

samples/compose-samples/src/main/AndroidManifest.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.squareup.sample.compose"
-    >
+    xmlns:tools="http://schemas.android.com/tools">
 
   <application
       android:allowBackup="false"