Skip to content

Commit

Permalink
Remove comments about compiling with JDK 8.
Browse files Browse the repository at this point in the history
As of cl/655647768, we always build with JDK 22.

RELNOTES=n/a
PiperOrigin-RevId: 668969633
  • Loading branch information
cpovirk authored and Google Java Core Libraries committed Aug 29, 2024
1 parent bff7090 commit 9c84ddb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 18 deletions.
11 changes: 2 additions & 9 deletions android/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,7 @@
<arg>-Xplugin:ErrorProne -Xep:NullArgumentForNonNullParameter:OFF -Xep:Java8ApiChecker:ERROR</arg>
<!-- https://github.com/google/error-prone/blob/f8e33bc460be82ab22256a7ef8b979d7a2cacaba/docs/installation.md#jdk-16 -->
<!-- TODO(cpovirk): Use .mvn/jvm.config instead (per
https://errorprone.info/docs/installation#maven) if it can
be made not to interfere with JDK8 or if we stop building
with JDK8. -->
https://errorprone.info/docs/installation#maven). -->
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
Expand All @@ -178,12 +176,7 @@
<version>2.23.0</version>
</path>
</annotationProcessorPaths>
<!-- Fork:
- for JDK8 because we use a javac9 bootclasspath
- for JDK9+ because we need args like add-exports
-->
<!-- Fork because we need args like add-exports. (But see the TODO above about .mvn/jvm.config.) -->
<fork>true</fork>
</configuration>
</plugin>
Expand Down
11 changes: 2 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,7 @@
<arg>-Xplugin:ErrorProne -Xep:NullArgumentForNonNullParameter:OFF -Xep:Java8ApiChecker:ERROR</arg>
<!-- https://github.com/google/error-prone/blob/f8e33bc460be82ab22256a7ef8b979d7a2cacaba/docs/installation.md#jdk-16 -->
<!-- TODO(cpovirk): Use .mvn/jvm.config instead (per
https://errorprone.info/docs/installation#maven) if it can
be made not to interfere with JDK8 or if we stop building
with JDK8. -->
https://errorprone.info/docs/installation#maven). -->
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
Expand All @@ -179,12 +177,7 @@
<version>2.23.0</version>
</path>
</annotationProcessorPaths>
<!-- Fork:
- for JDK8 because we use a javac9 bootclasspath
- for JDK9+ because we need args like add-exports
-->
<!-- Fork because we need args like add-exports. (But see the TODO above about .mvn/jvm.config.) -->
<fork>true</fork>
</configuration>
</plugin>
Expand Down

0 comments on commit 9c84ddb

Please sign in to comment.