Skip to content

Commit

Permalink
Bump failureaccess dep to 1.0.2.
Browse files Browse the repository at this point in the history
Fixes #6776

RELNOTES=n/a
PiperOrigin-RevId: 573991633
  • Loading branch information
cpovirk authored and Google Java Core Libraries committed Oct 17, 2023
1 parent 46be346 commit 46e4a9d
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 13 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion android/guava/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>failureaccess</artifactId>
<version>1.0.1</version>
<version>1.0.2</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
Expand Down
8 changes: 4 additions & 4 deletions guava/module.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"group": "com.google.guava",
"module": "failureaccess",
"version": {
"requires": "1.0.1"
"requires": "1.0.2"
}
},
{
Expand Down Expand Up @@ -103,7 +103,7 @@
"group": "com.google.guava",
"module": "failureaccess",
"version": {
"requires": "1.0.1"
"requires": "1.0.2"
}
},
{
Expand Down Expand Up @@ -169,7 +169,7 @@
"group": "com.google.guava",
"module": "failureaccess",
"version": {
"requires": "1.0.1"
"requires": "1.0.2"
}
},
{
Expand Down Expand Up @@ -242,7 +242,7 @@
"group": "com.google.guava",
"module": "failureaccess",
"version": {
"requires": "1.0.1"
"requires": "1.0.2"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion guava/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>failureaccess</artifactId>
<version>1.0.1</version>
<version>1.0.2</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
Expand Down
9 changes: 3 additions & 6 deletions integration-tests/gradle/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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"
Expand Down

0 comments on commit 46e4a9d

Please sign in to comment.