From 470fb9cf48d679aab60ed03fc8b7f24243d66f42 Mon Sep 17 00:00:00 2001 From: Stephen Edwards Date: Tue, 17 Dec 2024 10:08:43 -0500 Subject: [PATCH] Update to AGP 8.3.2, Gradle 8.11 --- dependencies/classpath.txt | 162 +++++++++++------------ gradle/libs.versions.toml | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- samples/tutorial/build.gradle | 2 +- 4 files changed, 83 insertions(+), 85 deletions(-) diff --git a/dependencies/classpath.txt b/dependencies/classpath.txt index fc2b08750..40876eb46 100644 --- a/dependencies/classpath.txt +++ b/dependencies/classpath.txt @@ -1,46 +1,46 @@ -androidx.databinding:databinding-common:8.1.2 -androidx.databinding:databinding-compiler-common:8.1.2 -com.android.databinding:baseLibrary:8.1.2 -com.android.tools.analytics-library:crash:31.1.2 -com.android.tools.analytics-library:protos:31.1.2 -com.android.tools.analytics-library:shared:31.1.2 -com.android.tools.analytics-library:tracker:31.1.2 +androidx.databinding:databinding-common:8.3.2 +androidx.databinding:databinding-compiler-common:8.3.2 +com.android.databinding:baseLibrary:8.3.2 +com.android.tools.analytics-library:crash:31.3.2 +com.android.tools.analytics-library:protos:31.3.2 +com.android.tools.analytics-library:shared:31.3.2 +com.android.tools.analytics-library:tracker:31.3.2 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:8.1.2-10154469 -com.android.tools.build:aaptcompiler:8.1.2 -com.android.tools.build:apksig:8.1.2 -com.android.tools.build:apkzlib:8.1.2 -com.android.tools.build:builder-model:8.1.2 -com.android.tools.build:builder-test-api:8.1.2 -com.android.tools.build:builder:8.1.2 -com.android.tools.build:bundletool:1.14.0 -com.android.tools.build:gradle-api:8.1.2 -com.android.tools.build:gradle-settings-api:8.1.2 -com.android.tools.build:gradle:8.1.2 -com.android.tools.build:manifest-merger:31.1.2 +com.android.tools.build:aapt2-proto:8.3.2-10880808 +com.android.tools.build:aaptcompiler:8.3.2 +com.android.tools.build:apksig:8.3.2 +com.android.tools.build:apkzlib:8.3.2 +com.android.tools.build:builder-model:8.3.2 +com.android.tools.build:builder-test-api:8.3.2 +com.android.tools.build:builder:8.3.2 +com.android.tools.build:bundletool:1.15.6 +com.android.tools.build:gradle-api:8.3.2 +com.android.tools.build:gradle-settings-api:8.3.2 +com.android.tools.build:gradle:8.3.2 +com.android.tools.build:manifest-merger:31.3.2 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api -com.android.tools.ddms:ddmlib:31.1.2 -com.android.tools.layoutlib:layoutlib-api:31.1.2 -com.android.tools.lint:lint-model:31.1.2 -com.android.tools.lint:lint-typedef-remover:31.1.2 -com.android.tools.utp:android-device-provider-ddmlib-proto:31.1.2 -com.android.tools.utp:android-device-provider-gradle-proto:31.1.2 -com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.1.2 -com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.1.2 -com.android.tools.utp:android-test-plugin-host-coverage-proto:31.1.2 -com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.1.2 -com.android.tools.utp:android-test-plugin-host-logcat-proto:31.1.2 -com.android.tools.utp:android-test-plugin-host-retention-proto:31.1.2 -com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.1.2 -com.android.tools:annotations:31.1.2 -com.android.tools:common:31.1.2 -com.android.tools:dvlib:31.1.2 -com.android.tools:repository:31.1.2 -com.android.tools:sdk-common:31.1.2 -com.android.tools:sdklib:31.1.2 -com.android:signflinger:8.1.2 -com.android:zipflinger:8.1.2 +com.android.tools.ddms:ddmlib:31.3.2 +com.android.tools.layoutlib:layoutlib-api:31.3.2 +com.android.tools.lint:lint-model:31.3.2 +com.android.tools.lint:lint-typedef-remover:31.3.2 +com.android.tools.utp:android-device-provider-ddmlib-proto:31.3.2 +com.android.tools.utp:android-device-provider-gradle-proto:31.3.2 +com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.3.2 +com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.3.2 +com.android.tools.utp:android-test-plugin-host-coverage-proto:31.3.2 +com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.3.2 +com.android.tools.utp:android-test-plugin-host-logcat-proto:31.3.2 +com.android.tools.utp:android-test-plugin-host-retention-proto:31.3.2 +com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.3.2 +com.android.tools:annotations:31.3.2 +com.android.tools:common:31.3.2 +com.android.tools:dvlib:31.3.2 +com.android.tools:repository:31.3.2 +com.android.tools:sdk-common:31.3.2 +com.android.tools:sdklib:31.3.2 +com.android:signflinger:8.3.2 +com.android:zipflinger:8.3.2 com.dropbox.dependency-guard:dependency-guard:0.5.0 com.fasterxml.jackson.core:jackson-annotations:2.12.7 com.fasterxml.jackson.core:jackson-core:2.12.7 @@ -51,25 +51,25 @@ com.fasterxml.jackson.module:jackson-module-kotlin:2.12.7 com.fasterxml.jackson:jackson-bom:2.12.7 com.fasterxml.woodstox:woodstox-core:6.2.4 com.google.android:annotations:4.1.1.4 -com.google.api.grpc:proto-google-common-protos:2.0.1 +com.google.api.grpc:proto-google-common-protos:2.17.0 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.code.gson:gson:2.10.1 com.google.crypto.tink:tink:1.7.0 com.google.dagger:dagger:2.28.3 com.google.devtools.ksp:symbol-processing-api:1.9.24-1.0.20 com.google.devtools.ksp:symbol-processing-common-deps:1.9.24-1.0.20 com.google.devtools.ksp:symbol-processing-gradle-plugin:1.9.24-1.0.20 -com.google.errorprone:error_prone_annotations:2.11.0 +com.google.errorprone:error_prone_annotations:2.18.0 com.google.flatbuffers:flatbuffers-java:1.12.0 com.google.guava:failureaccess:1.0.1 -com.google.guava:guava:31.1-jre +com.google.guava:guava:32.0.1-jre com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava -com.google.j2objc:j2objc-annotations:1.3 +com.google.j2objc:j2objc-annotations:2.8 com.google.jimfs:jimfs:1.1 -com.google.protobuf:protobuf-java-util:3.19.3 -com.google.protobuf:protobuf-java:3.19.3 -com.google.testing.platform:core-proto:0.0.8-alpha08 +com.google.protobuf:protobuf-java-util:3.22.3 +com.google.protobuf:protobuf-java:3.22.3 +com.google.testing.platform:core-proto:0.0.9-alpha02 com.googlecode.java-diff-utils:diffutils:1.3.0 com.googlecode.juniversalchardet:juniversalchardet:1.0.3 com.rickbusarow.kgx:kotlin-gradle-extensions:0.1.12 @@ -91,28 +91,28 @@ com.sun.xml.fastinfoset:FastInfoset:1.2.16 com.vanniktech:gradle-maven-publish-plugin:0.27.0 com.vanniktech:nexus:0.27.0 commons-codec:commons-codec:1.11 -commons-io:commons-io:2.4 +commons-io:commons-io:2.13.0 commons-logging:commons-logging:1.2 io.github.java-diff-utils:java-diff-utils:4.12 -io.grpc:grpc-api:1.45.1 -io.grpc:grpc-context:1.45.1 -io.grpc:grpc-core:1.45.1 -io.grpc:grpc-netty:1.45.1 -io.grpc:grpc-protobuf-lite:1.45.1 -io.grpc:grpc-protobuf:1.45.1 -io.grpc:grpc-stub:1.45.1 -io.netty:netty-buffer:4.1.72.Final -io.netty:netty-codec-http2:4.1.72.Final -io.netty:netty-codec-http:4.1.72.Final -io.netty:netty-codec-socks:4.1.72.Final -io.netty:netty-codec:4.1.72.Final -io.netty:netty-common:4.1.72.Final -io.netty:netty-handler-proxy:4.1.72.Final -io.netty:netty-handler:4.1.72.Final -io.netty:netty-resolver:4.1.72.Final -io.netty:netty-tcnative-classes:2.0.46.Final -io.netty:netty-transport:4.1.72.Final -io.perfmark:perfmark-api:0.23.0 +io.grpc:grpc-api:1.57.0 +io.grpc:grpc-context:1.57.0 +io.grpc:grpc-core:1.57.0 +io.grpc:grpc-netty:1.57.0 +io.grpc:grpc-protobuf-lite:1.57.0 +io.grpc:grpc-protobuf:1.57.0 +io.grpc:grpc-stub:1.57.0 +io.netty:netty-buffer:4.1.93.Final +io.netty:netty-codec-http2:4.1.93.Final +io.netty:netty-codec-http:4.1.93.Final +io.netty:netty-codec-socks:4.1.93.Final +io.netty:netty-codec:4.1.93.Final +io.netty:netty-common:4.1.93.Final +io.netty:netty-handler-proxy:4.1.93.Final +io.netty:netty-handler:4.1.93.Final +io.netty:netty-resolver:4.1.93.Final +io.netty:netty-transport-native-unix-common:4.1.93.Final +io.netty:netty-transport:4.1.93.Final +io.perfmark:perfmark-api:0.26.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 @@ -122,14 +122,14 @@ net.java.dev.jna:jna:5.6.0 net.sf.jopt-simple:jopt-simple:4.9 net.sf.kxml:kxml2:2.3.0 org.apache.commons:commons-compress:1.21 -org.apache.httpcomponents:httpclient:4.5.13 -org.apache.httpcomponents:httpcore:4.4.15 +org.apache.httpcomponents:httpclient:4.5.14 +org.apache.httpcomponents:httpcore:4.4.16 org.apache.httpcomponents:httpmime:4.5.6 org.bitbucket.b_c:jose4j:0.7.0 org.bouncycastle:bcpkix-jdk15on:1.67 org.bouncycastle:bcprov-jdk15on:1.67 -org.checkerframework:checker-qual:3.12.0 -org.codehaus.mojo:animal-sniffer-annotations:1.19 +org.checkerframework:checker-qual:3.33.0 +org.codehaus.mojo:animal-sniffer-annotations:1.23 org.codehaus.woodstox:stax2-api:4.2.1 org.glassfish.jaxb:jaxb-runtime:2.3.2 org.glassfish.jaxb:txw2:2.3.2 @@ -154,16 +154,16 @@ org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.9.24 org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.9.24 org.jetbrains.kotlin:kotlin-native-utils:1.9.24 org.jetbrains.kotlin:kotlin-project-model:1.9.24 -org.jetbrains.kotlin:kotlin-reflect:1.9.10 +org.jetbrains.kotlin:kotlin-reflect:2.0.20 org.jetbrains.kotlin:kotlin-scripting-common:1.9.24 org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.24 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.24 org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.24 org.jetbrains.kotlin:kotlin-serialization:1.9.24 -org.jetbrains.kotlin:kotlin-stdlib-common:1.9.10 +org.jetbrains.kotlin:kotlin-stdlib-common:2.0.20 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.24 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.24 -org.jetbrains.kotlin:kotlin-stdlib:1.9.10 +org.jetbrains.kotlin:kotlin-stdlib:2.0.20 org.jetbrains.kotlin:kotlin-tooling-core:1.9.24 org.jetbrains.kotlin:kotlin-util-io:1.9.24 org.jetbrains.kotlin:kotlin-util-klib:1.9.24 @@ -174,12 +174,10 @@ org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.3 org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.6.2 org.jetbrains:annotations:13.0 org.jvnet.staxex:stax-ex:1.8.1 -org.ow2.asm:asm-analysis:9.2 -org.ow2.asm:asm-commons:9.2 -org.ow2.asm:asm-tree:9.2 -org.ow2.asm:asm-util:9.2 -org.ow2.asm:asm:9.2 +org.ow2.asm:asm-analysis:9.6 +org.ow2.asm:asm-commons:9.6 +org.ow2.asm:asm-tree:9.6 +org.ow2.asm:asm-util:9.6 +org.ow2.asm:asm:9.6 org.slf4j:slf4j-api:1.7.30 org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2 -xerces:xercesImpl:2.12.0 -xml-apis:xml-apis:1.4.01 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9b988262f..280fec04a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -agpVersion = "8.1.2" +agpVersion = "8.3.2" compileSdk = "34" minSdk = "24" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fce403e45..bbb57cf06 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/samples/tutorial/build.gradle b/samples/tutorial/build.gradle index ed0a7ef59..21157ad41 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:8.1.2", + agp: "com.android.tools.build:gradle:8.3.2", appcompat: 'androidx.appcompat:appcompat:1.3.1', constraintlayout: 'androidx.constraintlayout:constraintlayout:2.0.1', kotlin: [