Skip to content

Commit 36a43fc

Browse files
authored
Cleanup old checkForUpdates restrictions (#12687)
f36defa upgraded error_prone_annotations and 4de4718 bumped minSdkVersion for android-interop-testing.
1 parent 679882b commit 36a43fc

6 files changed

Lines changed: 22 additions & 12 deletions

File tree

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
1414
"com.google.auto.value:auto-value-annotations:1.11.0",
1515
"com.google.auto.value:auto-value:1.11.0",
1616
"com.google.code.findbugs:jsr305:3.0.2",
17-
"com.google.code.gson:gson:2.12.1",
17+
"com.google.code.gson:gson:2.13.2",
1818
"com.google.errorprone:error_prone_annotations:2.45.0",
1919
"com.google.guava:failureaccess:1.0.1",
2020
"com.google.guava:guava:33.5.0-android",

android-interop-testing/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ dependencies {
7979
exclude group: 'com.google.guava'
8080
}
8181

82-
androidTestImplementation 'androidx.test.ext:junit:1.1.3',
82+
androidTestImplementation libraries.androidx.test.ext.junit,
8383
'androidx.test:runner:1.4.0'
8484
}
8585

examples/example-gauth/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@
2828
<type>pom</type>
2929
<scope>import</scope>
3030
</dependency>
31+
<dependency><!-- upgrade version from google-auth-library-oauth2-http -->
32+
<groupId>com.google.code.gson</groupId>
33+
<artifactId>gson</artifactId>
34+
<version>2.13.2</version>
35+
</dependency>
3136
</dependencies>
3237
</dependencyManagement>
3338

examples/example-oauth/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@
3030
<type>pom</type>
3131
<scope>import</scope>
3232
</dependency>
33+
<dependency><!-- upgrade version from google-auth-library-oauth2-http -->
34+
<groupId>com.google.code.gson</groupId>
35+
<artifactId>gson</artifactId>
36+
<version>2.13.2</version>
37+
</dependency>
3338
</dependencies>
3439
</dependencyManagement>
3540

gradle/libs.versions.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,21 @@ android-annotations = "com.google.android:annotations:4.1.1.4"
66
# 1.9.1+ uses Kotlin and requires Android Gradle Plugin 9+
77
# checkForUpdates: androidx-annotation:1.9.0
88
androidx-annotation = "androidx.annotation:annotation:1.9.0"
9-
# 1.15.0+ requires minSdkVersion 21 in android-interop-testing (1.14.x doesn't exist)
9+
# 1.14.x doesn't exist.
10+
# 1.15.0+ requires compileSdkVersion 35 which officially requires AGP 8.6.0+.
11+
# It might work before then, but AGP 7.4.1 fails with:
12+
# RES_TABLE_TYPE_TYPE entry offsets overlap actual entry data.
13+
# 1.16.0+ requires AGP 8.6.0+
1014
# checkForUpdates: androidx-core:1.13.+
1115
androidx-core = "androidx.core:core:1.13.1"
12-
# 2.9+ requires minSdkVersion 21 in android-intetrop-testing
16+
# 2.9+ requires AGP 8.1.1+
1317
# checkForUpdates: androidx-lifecycle-common:2.8.+
1418
androidx-lifecycle-common = "androidx.lifecycle:lifecycle-common:2.8.7"
1519
# checkForUpdates: androidx-lifecycle-service:2.8.+
1620
androidx-lifecycle-service = "androidx.lifecycle:lifecycle-service:2.8.7"
1721
androidx-test-core = "androidx.test:core:1.7.0"
1822
androidx-test-ext-junit = "androidx.test.ext:junit:1.3.0"
19-
# 1.7.0+ requires minSdkVersion 21 in android-interop-testing
20-
# checkForUpdates: androidx-test-rules:1.6.+
21-
androidx-test-rules = "androidx.test:rules:1.6.1"
23+
androidx-test-rules = "androidx.test:rules:1.7.0"
2224
animalsniffer = "org.codehaus.mojo:animal-sniffer:1.26"
2325
animalsniffer-annotations = "org.codehaus.mojo:animal-sniffer-annotations:1.26"
2426
assertj-core = "org.assertj:assertj-core:3.27.6"
@@ -37,7 +39,7 @@ checkstyle = "com.puppycrawl.tools:checkstyle:10.26.1"
3739
checkstylejava8 = "com.puppycrawl.tools:checkstyle:9.3"
3840
commons-math3 = "org.apache.commons:commons-math3:3.6.1"
3941
conscrypt = "org.conscrypt:conscrypt-openjdk-uber:2.5.2"
40-
# 141.7340.3+ requires minSdkVersion 23
42+
# 141.7340.3+ requires Java 17+
4143
# checkForUpdates: cronet-api:119.6045.31
4244
cronet-api = "org.chromium.net:cronet-api:119.6045.31"
4345
# checkForUpdates: cronet-embedded:119.6045.31
@@ -54,9 +56,7 @@ google-auth-credentials = "com.google.auth:google-auth-library-credentials:1.41.
5456
google-auth-oauth2Http = "com.google.auth:google-auth-library-oauth2-http:1.41.0"
5557
# Release notes: https://cloud.google.com/logging/docs/release-notes
5658
google-cloud-logging = "com.google.cloud:google-cloud-logging:3.23.9"
57-
# 2.13.0 requires error_prone_annotations:2.37.0, but we are stuck with 2.36.0
58-
# checkForUpdates: gson:2.12.+
59-
gson = "com.google.code.gson:gson:2.12.1"
59+
gson = "com.google.code.gson:gson:2.13.2"
6060
guava = "com.google.guava:guava:33.5.0-android"
6161
guava-betaChecker = "com.google.guava:guava-beta-checker:1.0"
6262
guava-testlib = "com.google.guava:guava-testlib:33.5.0-android"

repositories.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
1818
"com.google.auto.value:auto-value-annotations:1.11.0",
1919
"com.google.auto.value:auto-value:1.11.0",
2020
"com.google.code.findbugs:jsr305:3.0.2",
21-
"com.google.code.gson:gson:2.12.1",
21+
"com.google.code.gson:gson:2.13.2",
2222
"com.google.errorprone:error_prone_annotations:2.45.0",
2323
"com.google.guava:failureaccess:1.0.1",
2424
"com.google.guava:guava:33.5.0-android",

0 commit comments

Comments
 (0)