Skip to content

Commit

Permalink
Bump j2objc-annotations to 3.0.0.
Browse files Browse the repository at this point in the history
This is another baby step toward google#2970.

RELNOTES=n/a
PiperOrigin-RevId: 614287410
  • Loading branch information
cpovirk authored and Google Java Core Libraries committed Mar 9, 2024
1 parent 52a62b2 commit 8b9387e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion android/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<jsr305.version>3.0.2</jsr305.version>
<checker.version>3.42.0</checker.version>
<errorprone.version>2.24.1</errorprone.version>
<j2objc.version>2.8</j2objc.version>
<j2objc.version>3.0.0</j2objc.version>
<javac.version>9+181-r4173-1</javac.version>
<!-- Empty for all JDKs but 9-12 -->
<maven-javadoc-plugin.additionalJOptions></maven-javadoc-plugin.additionalJOptions>
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/gradle/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ val expectedReducedRuntimeClasspathJreVersion =
"listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
)
val expectedCompileClasspathAndroidVersion =
expectedReducedRuntimeClasspathAndroidVersion + setOf("j2objc-annotations-2.8.jar")
expectedReducedRuntimeClasspathAndroidVersion + setOf("j2objc-annotations-3.0.0.jar")
val expectedCompileClasspathJreVersion =
expectedReducedRuntimeClasspathJreVersion + setOf("j2objc-annotations-2.8.jar")
expectedReducedRuntimeClasspathJreVersion + setOf("j2objc-annotations-3.0.0.jar")

val extraLegacyDependencies = setOf("google-collections-1.0.jar")

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<jsr305.version>3.0.2</jsr305.version>
<checker.version>3.42.0</checker.version>
<errorprone.version>2.24.1</errorprone.version>
<j2objc.version>2.8</j2objc.version>
<j2objc.version>3.0.0</j2objc.version>
<javac.version>9+181-r4173-1</javac.version>
<!-- Empty for all JDKs but 9-12 -->
<maven-javadoc-plugin.additionalJOptions></maven-javadoc-plugin.additionalJOptions>
Expand Down

0 comments on commit 8b9387e

Please sign in to comment.