From 9852923f1e156caff6bab4d2217357bf6791b994 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Jul 2026 15:18:04 +0000 Subject: [PATCH 1/2] Bump com.google.guava:guava from 31.1-android to 33.6.0-android Bumps [com.google.guava:guava](https://github.com/google/guava) from 31.1-android to 33.6.0-android. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava dependency-version: 33.6.0-android dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- lib/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/build.gradle b/lib/build.gradle index c0a5ce2..4b86dda 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -31,7 +31,7 @@ dependencies { testImplementation "org.mockito:mockito-core:3.12.4" implementation 'com.google.code.gson:gson:2.8.9' - implementation 'com.google.guava:guava:31.1-android' + implementation 'com.google.guava:guava:33.6.0-android' implementation group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.70' implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.13' From 9af7f54d24bc548a6d337b21ca8a4240afeed76d Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 7 Jul 2026 15:50:11 +0000 Subject: [PATCH 2/2] Regenerate Gradle dependency lockfile for Guava 33.6.0-android Dependabot bumped the guava version string in build.gradle but did not regenerate lib/gradle.lockfile, which still pinned the old dependency graph under dependencyLocking. This left the build failing with "Cannot find a version of 'com.google.guava:guava' that satisfies the version constraints" since the lock strictly enforced 31.1-android. Regenerated via `gradle :lib:dependencies --write-locks`, which also picks up guava's downstream annotation dependency swap (jsr305 + checker-qual -> jspecify) and minor bumps to failureaccess, error_prone_annotations, and j2objc-annotations. --- lib/gradle.lockfile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/gradle.lockfile b/lib/gradle.lockfile index cc4d350..6561093 100644 --- a/lib/gradle.lockfile +++ b/lib/gradle.lockfile @@ -8,13 +8,12 @@ com.fasterxml.jackson:jackson-bom:2.13.0=testCompileClasspath,testRuntimeClasspa com.github.jknack:handlebars-helpers:4.3.0=testCompileClasspath,testRuntimeClasspath com.github.jknack:handlebars:4.3.0=testCompileClasspath,testRuntimeClasspath com.github.tomakehurst:wiremock-jre8:2.32.0=testCompileClasspath,testRuntimeClasspath -com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.8.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:31.1-android=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-android=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.j2objc:j2objc-annotations:1.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.jayway.jsonpath:json-path:2.6.0=testCompileClasspath,testRuntimeClasspath commons-codec:commons-codec:1.11=compileClasspath,runtimeClasspath commons-codec:commons-codec:1.15=testCompileClasspath,testRuntimeClasspath @@ -36,7 +35,6 @@ org.apache.httpcomponents:httpclient:4.5.13=compileClasspath,runtimeClasspath,te org.apache.httpcomponents:httpcore:4.4.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.0=testCompileClasspath,testRuntimeClasspath org.bouncycastle:bcprov-jdk15on:1.70=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.checkerframework:checker-qual:3.12.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty.http2:http2-common:9.4.44.v20210927=testCompileClasspath,testRuntimeClasspath org.eclipse.jetty.http2:http2-hpack:9.4.44.v20210927=testCompileClasspath,testRuntimeClasspath org.eclipse.jetty.http2:http2-server:9.4.44.v20210927=testCompileClasspath,testRuntimeClasspath @@ -62,6 +60,7 @@ org.eclipse.jetty:jetty-webapp:9.4.44.v20210927=testCompileClasspath,testRuntime org.eclipse.jetty:jetty-xml:9.4.44.v20210927=testCompileClasspath,testRuntimeClasspath org.hamcrest:hamcrest-core:2.2=testCompileClasspath,testRuntimeClasspath org.hamcrest:hamcrest:2.2=testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.7.2=testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-engine:5.7.2=testRuntimeClasspath org.junit.jupiter:junit-jupiter-params:5.7.2=testCompileClasspath,testRuntimeClasspath