From bd766f04788d89f3c3b48a5e81c1c2ba0bd35f2b Mon Sep 17 00:00:00 2001 From: cpovirk Date: Tue, 17 Oct 2023 11:08:58 -0700 Subject: [PATCH] Bump `failureaccess` dep to 1.0.2. Fixes https://github.com/google/guava/issues/6776 RELNOTES=n/a PiperOrigin-RevId: 574207363 --- README.md | 2 +- android/guava/pom.xml | 2 +- guava/module.json | 8 ++++---- guava/pom.xml | 2 +- integration-tests/gradle/build.gradle.kts | 9 +++------ 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index a20a6193eb3c..677f1065ab12 100644 --- a/README.md +++ b/README.md @@ -107,7 +107,7 @@ flavor. options open in case of surprises (like, say, a serious security problem). 3. Guava has one dependency that is needed for linkage at runtime: - `com.google.guava:failureaccess:1.0.1`. It also has + `com.google.guava:failureaccess:1.0.2`. It also has [some annotation-only dependencies][guava-deps], which we discuss in more detail at that link. diff --git a/android/guava/pom.xml b/android/guava/pom.xml index a7b79ff6b57a..7444cd6972ba 100644 --- a/android/guava/pom.xml +++ b/android/guava/pom.xml @@ -21,7 +21,7 @@ com.google.guava failureaccess - 1.0.1 + 1.0.2 com.google.guava diff --git a/guava/module.json b/guava/module.json index 1818f3549334..0e7e5d85d087 100644 --- a/guava/module.json +++ b/guava/module.json @@ -30,7 +30,7 @@ "group": "com.google.guava", "module": "failureaccess", "version": { - "requires": "1.0.1" + "requires": "1.0.2" } }, { @@ -103,7 +103,7 @@ "group": "com.google.guava", "module": "failureaccess", "version": { - "requires": "1.0.1" + "requires": "1.0.2" } }, { @@ -169,7 +169,7 @@ "group": "com.google.guava", "module": "failureaccess", "version": { - "requires": "1.0.1" + "requires": "1.0.2" } }, { @@ -242,7 +242,7 @@ "group": "com.google.guava", "module": "failureaccess", "version": { - "requires": "1.0.1" + "requires": "1.0.2" } }, { diff --git a/guava/pom.xml b/guava/pom.xml index af22c26f8831..913fc387a619 100644 --- a/guava/pom.xml +++ b/guava/pom.xml @@ -21,7 +21,7 @@ com.google.guava failureaccess - 1.0.1 + 1.0.2 com.google.guava diff --git a/integration-tests/gradle/build.gradle.kts b/integration-tests/gradle/build.gradle.kts index 5e6e93104915..4e71630e8c68 100644 --- a/integration-tests/gradle/build.gradle.kts +++ b/integration-tests/gradle/build.gradle.kts @@ -7,7 +7,7 @@ val guavaVersionJre = val expectedReducedRuntimeClasspathAndroidVersion = setOf( "guava-${guavaVersionJre.replace("jre", "android")}.jar", - "failureaccess-1.0.1.jar", + "failureaccess-1.0.2.jar", "jsr305-3.0.2.jar", "checker-qual-3.37.0.jar", "error_prone_annotations-2.21.1.jar", @@ -16,7 +16,7 @@ val expectedReducedRuntimeClasspathAndroidVersion = val expectedReducedRuntimeClasspathJreVersion = setOf( "guava-$guavaVersionJre.jar", - "failureaccess-1.0.1.jar", + "failureaccess-1.0.2.jar", "jsr305-3.0.2.jar", "checker-qual-3.37.0.jar", "error_prone_annotations-2.21.1.jar", @@ -27,10 +27,7 @@ val expectedCompileClasspathAndroidVersion = val expectedCompileClasspathJreVersion = expectedReducedRuntimeClasspathJreVersion + setOf("j2objc-annotations-2.8.jar") -val extraLegacyDependencies = - setOf( - "google-collections-1.0.jar" - ) +val extraLegacyDependencies = setOf("google-collections-1.0.jar") buildscript { val agpVersion = if (gradle.gradleVersion.startsWith("5.")) "3.6.4" else "7.0.4"