Remove annotation-only Jars from runtime classpath (in Gradle)

google · Jun 29, 2023 · ec56503 · ec56503
1 parent ce78fc6
commit ec56503
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 32 deletions.
diff --git 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
@@ -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(