Skip to content

Commit

Permalink
Remove annotation-only Jars from runtime classpath (in Gradle)
Browse files Browse the repository at this point in the history
  • Loading branch information
jjohannes committed Jun 29, 2023
1 parent ce78fc6 commit ec56503
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 32 deletions.
24 changes: 0 additions & 24 deletions guava/module.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down Expand Up @@ -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": [
Expand Down
20 changes: 12 additions & 8 deletions integration-tests/gradle/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down

0 comments on commit ec56503

Please sign in to comment.