From 8b9387e6c77e36a61f12087bfc1e9240732b341d Mon Sep 17 00:00:00 2001 From: cpovirk Date: Sat, 9 Mar 2024 15:32:40 -0800 Subject: [PATCH] Bump `j2objc-annotations` to 3.0.0. This is another baby step toward https://github.com/google/guava/issues/2970. RELNOTES=n/a PiperOrigin-RevId: 614287410 --- android/pom.xml | 2 +- integration-tests/gradle/build.gradle.kts | 4 ++-- pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android/pom.xml b/android/pom.xml index d59ce39455b6..52837fa733d4 100644 --- a/android/pom.xml +++ b/android/pom.xml @@ -18,7 +18,7 @@ 3.0.2 3.42.0 2.24.1 - 2.8 + 3.0.0 9+181-r4173-1 diff --git a/integration-tests/gradle/build.gradle.kts b/integration-tests/gradle/build.gradle.kts index cafccc49b790..51c733a8cb6e 100644 --- a/integration-tests/gradle/build.gradle.kts +++ b/integration-tests/gradle/build.gradle.kts @@ -23,9 +23,9 @@ val expectedReducedRuntimeClasspathJreVersion = "listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" ) val expectedCompileClasspathAndroidVersion = - expectedReducedRuntimeClasspathAndroidVersion + setOf("j2objc-annotations-2.8.jar") + expectedReducedRuntimeClasspathAndroidVersion + setOf("j2objc-annotations-3.0.0.jar") val expectedCompileClasspathJreVersion = - expectedReducedRuntimeClasspathJreVersion + setOf("j2objc-annotations-2.8.jar") + expectedReducedRuntimeClasspathJreVersion + setOf("j2objc-annotations-3.0.0.jar") val extraLegacyDependencies = setOf("google-collections-1.0.jar") diff --git a/pom.xml b/pom.xml index 83c3fa11ab3b..79ecb39a58dc 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 3.0.2 3.42.0 2.24.1 - 2.8 + 3.0.0 9+181-r4173-1