Merge pull request #838 from ascopes/task/jdk-25

Build on Java 25

Author: ascopes

.github/workflows/build.yml

@@ -24,12 +24,12 @@ jobs:
         java-version:
           - 17  # LTS
           - 21  # LTS
-          - GA  # General access
+          - 25  # LTS
         include:
-          - os-name: windows-latest
-            java-version: GA
+          - os-name: windows-11-arm
+            java-version: 25  # LTS
           - os-name: macos-latest
-            java-version: GA
+            java-version: 25  # LTS
 
     steps:
       - name: Checkout repository
@@ -38,20 +38,12 @@ jobs:
           fetch-depth: 2
 
       - name: Initialize Zulu JDK
-        if: matrix.java-version != 'GA'
         uses: actions/setup-java@v5
         with:
           check-latest: true
           distribution: zulu
           java-version: ${{ matrix.java-version }}
 
-      - name: Initialize Oracle JDK
-        if: matrix.java-version == 'GA'
-        uses: oracle-actions/setup-java@v1
-        with:
-          website: jdk.java.net
-          release: ${{ matrix.java-version }}
-
       - name: Maven cache
         uses: actions/cache@v4
         env:

.github/workflows/deploy.yml

@@ -40,7 +40,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: zulu
-          java-version: 24
+          java-version: 25
           server-id: central
           server-username: CENTRAL_USERNAME
           server-password: CENTRAL_TOKEN
@@ -94,3 +94,4 @@ jobs:
           name: v${{ env.release_version }}
           generateReleaseNotes: true
           token: ${{ secrets.GITHUB_TOKEN }}
+

.github/workflows/pages.yml

@@ -20,13 +20,13 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v5
         with:
-          java-version: 23
-          distribution: 'temurin'
+          java-version: 25
+          distribution: zulu
 
       - name: Generate JavaDocs
         shell: bash
         run: >-
-          ./mvnw  -B -U -am -pl java-compiler-testing
+          ./mvnw -B -U -am -pl java-compiler-testing
           -Dmaven.test.skip=true
           -Dcheckstyle.skip=true
           -Dlicense.skip=true

.github/workflows/security.yml

@@ -21,7 +21,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: zulu
-          java-version: 23
+          java-version: 25
 
       - name: Submit Dependency Snapshot
         uses: advanced-security/maven-dependency-submission-action@v5

.mvn/jvm.config

@@ -1 +1,2 @@
--XX:+TieredCompilation -XX:TieredStopAtLevel=1
+-XX:+TieredCompilation
+-XX:TieredStopAtLevel=1

.mvn/wrapper/maven-wrapper.properties

@@ -1,19 +1,3 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-wrapperVersion=3.3.2
+wrapperVersion=3.3.4
 distributionType=only-script
 distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip

java-compiler-testing/src/test/java/io/github/ascopes/jct/compilers/AbstractJctCompilerTest.java

@@ -1835,15 +1835,7 @@ final <T> List<T> concat(List<T> first, List<T>... more) {
   ///
 
   AbstractObjectAssert<?, ?> assertThatCompilerField(String field) {
-    try {
-      var fieldObj = AbstractJctCompiler.class.getDeclaredField(field);
-      fieldObj.setAccessible(true);
-      var fieldValue = fieldObj.get(compiler);
-      return assertThat(fieldValue)
-          .as("CompilerImpl.%s (%s)", field, fieldValue);
-    } catch (ReflectiveOperationException ex) {
-      return fail("Failed to extract field " + field, ex);
-    }
+    return assertThat(compiler).extracting(field);
   }
 
   <T> T setFieldOnCompiler(String field, T value) {