diff --git a/guava/module.json b/guava/module.json index 0e7e5d85d087..c125a282dedf 100644 --- a/guava/module.json +++ b/guava/module.json @@ -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": [ diff --git a/integration-tests/gradle/build.gradle.kts b/integration-tests/gradle/build.gradle.kts index 46e37a047da7..f2830db76f36 100644 --- a/integration-tests/gradle/build.gradle.kts +++ b/integration-tests/gradle/build.gradle.kts @@ -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")