diff --git a/MODULE.bazel b/MODULE.bazel index fdaaaff317e..85c8b1aec13 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -14,7 +14,7 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [ "com.google.auto.value:auto-value-annotations:1.11.0", "com.google.auto.value:auto-value:1.11.0", "com.google.code.findbugs:jsr305:3.0.2", - "com.google.code.gson:gson:2.12.1", + "com.google.code.gson:gson:2.13.2", "com.google.errorprone:error_prone_annotations:2.45.0", "com.google.guava:failureaccess:1.0.1", "com.google.guava:guava:33.5.0-android", diff --git a/android-interop-testing/build.gradle b/android-interop-testing/build.gradle index 49569b911e0..ebb31fddca2 100644 --- a/android-interop-testing/build.gradle +++ b/android-interop-testing/build.gradle @@ -79,7 +79,7 @@ dependencies { exclude group: 'com.google.guava' } - androidTestImplementation 'androidx.test.ext:junit:1.1.3', + androidTestImplementation libraries.androidx.test.ext.junit, 'androidx.test:runner:1.4.0' } diff --git a/examples/example-gauth/pom.xml b/examples/example-gauth/pom.xml index 4b64eaed454..9fb854629b4 100644 --- a/examples/example-gauth/pom.xml +++ b/examples/example-gauth/pom.xml @@ -28,6 +28,11 @@ pom import + + com.google.code.gson + gson + 2.13.2 + diff --git a/examples/example-oauth/pom.xml b/examples/example-oauth/pom.xml index 480923df5f4..9ce20f2f684 100644 --- a/examples/example-oauth/pom.xml +++ b/examples/example-oauth/pom.xml @@ -30,6 +30,11 @@ pom import + + com.google.code.gson + gson + 2.13.2 + diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3806fa3404e..039ff63d81c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,19 +6,21 @@ android-annotations = "com.google.android:annotations:4.1.1.4" # 1.9.1+ uses Kotlin and requires Android Gradle Plugin 9+ # checkForUpdates: androidx-annotation:1.9.0 androidx-annotation = "androidx.annotation:annotation:1.9.0" -# 1.15.0+ requires minSdkVersion 21 in android-interop-testing (1.14.x doesn't exist) +# 1.14.x doesn't exist. +# 1.15.0+ requires compileSdkVersion 35 which officially requires AGP 8.6.0+. +# It might work before then, but AGP 7.4.1 fails with: +# RES_TABLE_TYPE_TYPE entry offsets overlap actual entry data. +# 1.16.0+ requires AGP 8.6.0+ # checkForUpdates: androidx-core:1.13.+ androidx-core = "androidx.core:core:1.13.1" -# 2.9+ requires minSdkVersion 21 in android-intetrop-testing +# 2.9+ requires AGP 8.1.1+ # checkForUpdates: androidx-lifecycle-common:2.8.+ androidx-lifecycle-common = "androidx.lifecycle:lifecycle-common:2.8.7" # checkForUpdates: androidx-lifecycle-service:2.8.+ androidx-lifecycle-service = "androidx.lifecycle:lifecycle-service:2.8.7" androidx-test-core = "androidx.test:core:1.7.0" androidx-test-ext-junit = "androidx.test.ext:junit:1.3.0" -# 1.7.0+ requires minSdkVersion 21 in android-interop-testing -# checkForUpdates: androidx-test-rules:1.6.+ -androidx-test-rules = "androidx.test:rules:1.6.1" +androidx-test-rules = "androidx.test:rules:1.7.0" animalsniffer = "org.codehaus.mojo:animal-sniffer:1.26" animalsniffer-annotations = "org.codehaus.mojo:animal-sniffer-annotations:1.26" assertj-core = "org.assertj:assertj-core:3.27.6" @@ -37,7 +39,7 @@ checkstyle = "com.puppycrawl.tools:checkstyle:10.26.1" checkstylejava8 = "com.puppycrawl.tools:checkstyle:9.3" commons-math3 = "org.apache.commons:commons-math3:3.6.1" conscrypt = "org.conscrypt:conscrypt-openjdk-uber:2.5.2" -# 141.7340.3+ requires minSdkVersion 23 +# 141.7340.3+ requires Java 17+ # checkForUpdates: cronet-api:119.6045.31 cronet-api = "org.chromium.net:cronet-api:119.6045.31" # checkForUpdates: cronet-embedded:119.6045.31 @@ -54,9 +56,7 @@ google-auth-credentials = "com.google.auth:google-auth-library-credentials:1.41. google-auth-oauth2Http = "com.google.auth:google-auth-library-oauth2-http:1.41.0" # Release notes: https://cloud.google.com/logging/docs/release-notes google-cloud-logging = "com.google.cloud:google-cloud-logging:3.23.9" -# 2.13.0 requires error_prone_annotations:2.37.0, but we are stuck with 2.36.0 -# checkForUpdates: gson:2.12.+ -gson = "com.google.code.gson:gson:2.12.1" +gson = "com.google.code.gson:gson:2.13.2" guava = "com.google.guava:guava:33.5.0-android" guava-betaChecker = "com.google.guava:guava-beta-checker:1.0" guava-testlib = "com.google.guava:guava-testlib:33.5.0-android" diff --git a/repositories.bzl b/repositories.bzl index c89e1bdff32..de0729c35ab 100644 --- a/repositories.bzl +++ b/repositories.bzl @@ -18,7 +18,7 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [ "com.google.auto.value:auto-value-annotations:1.11.0", "com.google.auto.value:auto-value:1.11.0", "com.google.code.findbugs:jsr305:3.0.2", - "com.google.code.gson:gson:2.12.1", + "com.google.code.gson:gson:2.13.2", "com.google.errorprone:error_prone_annotations:2.45.0", "com.google.guava:failureaccess:1.0.1", "com.google.guava:guava:33.5.0-android",