Skip to content

Commit e4f3118

Browse files
cpovirkGoogle Java Core Libraries
authored andcommitted
Use Java 24 for javac and javadoc.
As usual, Guava continues to be usable from Java 8; this CL changes only the build tools that we use to produce it. RELNOTES=n/a PiperOrigin-RevId: 744082109
1 parent 7e1cae6 commit e4f3118

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ jobs:
4040
# When we specify multiple JDKs, the final one becomes the default, which is used to execute Maven itself.
4141
# Our Maven configuration then specifies different JDKs to use for some of the steps:
4242
# - 11 (sometimes) to *download* to support anyone who runs JDiff or our Gradle integration tests (including our doc snapshots and our Java 11 CI test run) but not to use directly
43-
# - 23 for running Javadoc and javac (to help people who build Guava locally and might not use a recent JDK to run Maven)
43+
# - 24 for running Javadoc and javac (to help people who build Guava locally and might not use a recent JDK to run Maven)
4444
- name: 'Set up JDKs'
4545
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
4646
with:
4747
java-version: |
4848
${{ matrix.java }}
49-
23
49+
24
5050
distribution: 'temurin'
5151
cache: 'maven'
5252
- name: 'Install'
@@ -78,7 +78,7 @@ jobs:
7878
with:
7979
# For discussion, see the first setup-java block.
8080
# The publish-snapshot workflow doesn't run tests, so we don't have to care which version Maven would select for that step.
81-
java-version: 23
81+
java-version: 24
8282
distribution: 'temurin'
8383
server-id: sonatype-nexus-snapshots
8484
server-username: CI_DEPLOY_USERNAME
@@ -108,7 +108,7 @@ jobs:
108108
# But we need Java 11 for JDiff.
109109
java-version: |
110110
11
111-
23
111+
24
112112
distribution: 'temurin'
113113
cache: 'maven'
114114
- name: 'Generate latest docs'

android/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@
342342
<configuration>
343343
<toolchains>
344344
<jdk>
345-
<version>23</version>
345+
<version>24</version>
346346
</jdk>
347347
</toolchains>
348348
</configuration>
@@ -413,14 +413,14 @@
413413
(But don't run that if you have put something into ~/.m2/toolchains.xml yourself.)
414414
-->
415415
<execution>
416-
<id>download-23-and-surefire-version</id>
416+
<id>download-24-and-surefire-version</id>
417417
<goals>
418418
<goal>toolchain</goal>
419419
</goals>
420420
<configuration>
421421
<toolchains>
422422
<jdk>
423-
<version>23</version>
423+
<version>24</version>
424424
<vendor>temurin</vendor>
425425
</jdk>
426426
<testJdk>

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@
343343
<configuration>
344344
<toolchains>
345345
<jdk>
346-
<version>23</version>
346+
<version>24</version>
347347
</jdk>
348348
</toolchains>
349349
</configuration>
@@ -408,14 +408,14 @@
408408
(But don't run that if you have put something into ~/.m2/toolchains.xml yourself.)
409409
-->
410410
<execution>
411-
<id>download-23-and-surefire-version</id>
411+
<id>download-24-and-surefire-version</id>
412412
<goals>
413413
<goal>toolchain</goal>
414414
</goals>
415415
<configuration>
416416
<toolchains>
417417
<jdk>
418-
<version>23</version>
418+
<version>24</version>
419419
<vendor>temurin</vendor>
420420
</jdk>
421421
<testJdk>

0 commit comments

Comments
 (0)