diff --git a/guava/module.json b/guava/module.json index bf3ee35ba1bf..5ffbb8f4fc1c 100644 --- a/guava/module.json +++ b/guava/module.json @@ -111,18 +111,6 @@ "version": { "requires": "1.0.1" } - }, - { - "group": "com.google.code.findbugs", - "module": "jsr305" - }, - { - "group": "org.checkerframework", - "module": "checker-qual" - }, - { - "group": "com.google.errorprone", - "module": "error_prone_annotations" } ], "files": [ @@ -245,18 +233,6 @@ "version": { "requires": "1.0.1" } - }, - { - "group": "com.google.code.findbugs", - "module": "jsr305" - }, - { - "group": "org.checkerframework", - "module": "checker-qual" - }, - { - "group": "com.google.errorprone", - "module": "error_prone_annotations" } ], "files": [ diff --git a/integration-tests/gradle/build.gradle.kts b/integration-tests/gradle/build.gradle.kts index 2ea35a88d22c..db9b7de3449d 100644 --- a/integration-tests/gradle/build.gradle.kts +++ b/integration-tests/gradle/build.gradle.kts @@ -7,23 +7,27 @@ val guavaVersionJre = val expectedReducedRuntimeClasspathAndroidVersion = setOf( "guava-${guavaVersionJre.replace("jre", "android")}.jar", - "failureaccess-1.0.1.jar", - "jsr305-3.0.2.jar", - "checker-qual-3.33.0.jar", - "error_prone_annotations-2.18.0.jar" + "failureaccess-1.0.1.jar" ) val expectedReducedRuntimeClasspathJreVersion = setOf( "guava-$guavaVersionJre.jar", - "failureaccess-1.0.1.jar", + "failureaccess-1.0.1.jar" + ) +val expectedCompileClasspathAndroidVersion = + expectedReducedRuntimeClasspathAndroidVersion + setOf( + "j2objc-annotations-2.8.jar", "jsr305-3.0.2.jar", "checker-qual-3.33.0.jar", "error_prone_annotations-2.18.0.jar" ) -val expectedCompileClasspathAndroidVersion = - expectedReducedRuntimeClasspathAndroidVersion + setOf("j2objc-annotations-2.8.jar") val expectedCompileClasspathJreVersion = - expectedReducedRuntimeClasspathJreVersion + setOf("j2objc-annotations-2.8.jar") + expectedReducedRuntimeClasspathJreVersion + setOf( + "j2objc-annotations-2.8.jar", + "jsr305-3.0.2.jar", + "checker-qual-3.33.0.jar", + "error_prone_annotations-2.18.0.jar" + ) val extraLegacyDependencies = setOf(