google/guava
google/guava
1
0
Fork 0
mirror of https://github.com/google/guava.git synced 2024-10-23 08:44:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Include j2objc-annotations in the Gradle runtime classpath.

Browse Source 
While that artifact contains no runtime-retention annotations, it does contain class-retention annotations (which could drive a runtime bytecode-rewriting agent). And, more practically, the Android Gradle Plugin has started reporting errors for `compileOnly` dependencies.

Fixes https://github.com/google/guava/issues/7397

Relevant to https://github.com/firebase/firebase-android-sdk/issues/6232 and https://github.com/androidx/media/issues/1700

RELNOTES=Added `j2objc-annotations` to the Gradle runtime classpath to avoid [an Android Gradle Plugin error](https://github.com/google/guava/issues/7397).
PiperOrigin-RevId: 677842769
This commit is contained in:
cpovirk 2024-09-23 10:13:03 -07:00 committed by Google Java Core Libraries
parent 6a070d8046
commit a3b51888c2
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
guava/module.json
View File

@ -133,6 +133,13 @@
"version": {
"requires": "${errorprone.version}"
}
},
{
"group": "com.google.j2objc",
"module": "j2objc-annotations",
"version": {
"requires": "${j2objc.version}"
}
}
],
"files": [
@ -272,6 +279,13 @@
"version": {
"requires": "${errorprone.version}"
}
},
{
"group": "com.google.j2objc",
"module": "j2objc-annotations",
"version": {
"requires": "${j2objc.version}"
}
}
],
"files": [

8
integration-tests/gradle/build.gradle.kts
View File

@ -8,6 +8,7 @@ val expectedReducedRuntimeClasspathAndroidVersion =
setOf(
"guava-${guavaVersionJre.replace("jre", "android")}.jar",
"failureaccess-1.0.2.jar",
"j2objc-annotations-3.0.0.jar",
"jsr305-3.0.2.jar",
"checker-qual-3.43.0.jar",
"error_prone_annotations-2.28.0.jar",
@ -17,15 +18,14 @@ val expectedReducedRuntimeClasspathJreVersion =
setOf(
"guava-$guavaVersionJre.jar",
"failureaccess-1.0.2.jar",
"j2objc-annotations-3.0.0.jar",
"jsr305-3.0.2.jar",
"checker-qual-3.43.0.jar",
"error_prone_annotations-2.28.0.jar",
"listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
)
val expectedCompileClasspathAndroidVersion =
expectedReducedRuntimeClasspathAndroidVersion + setOf("j2objc-annotations-3.0.0.jar")
val expectedCompileClasspathJreVersion =
expectedReducedRuntimeClasspathJreVersion + setOf("j2objc-annotations-3.0.0.jar")
val expectedCompileClasspathAndroidVersion = expectedReducedRuntimeClasspathAndroidVersion
val expectedCompileClasspathJreVersion = expectedReducedRuntimeClasspathJreVersion
val extraLegacyDependencies = setOf("google-collections-1.0.jar")