Skip to content

Commit 865bf67

Browse files
committed
Build and test using Java 25
1 parent a41872e commit 865bf67

File tree

4 files changed

+19
-10
lines changed

4 files changed

+19
-10
lines changed

.github/workflows/master.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
gradle-argument: [ 'assemble && ./gradlew check -x test','testWithJava11', 'testWithJava17', 'test -x testWithJava11 -x testWithJava17' ]
14+
gradle-argument: [ 'assemble && ./gradlew check -x test','testWithJava11', 'testWithJava17','testWithJava21', 'test -x testWithJava11 -x testWithJava17 -x testWithJava21' ]
1515
steps:
1616
- uses: actions/checkout@v5
1717
- uses: gradle/actions/wrapper-validation@v5
18-
- name: Set up JDK 21
18+
- name: Set up JDK 25
1919
uses: actions/setup-java@v5
2020
with:
21-
java-version: '21'
21+
java-version: '25'
2222
distribution: 'corretto'
2323
- name: build and test
2424
run: ./gradlew ${{matrix.gradle-argument}} --info --stacktrace
@@ -30,6 +30,7 @@ jobs:
3030
**/build/test-results/test/TEST-*.xml
3131
**/build/test-results/testWithJava11/TEST-*.xml
3232
**/build/test-results/testWithJava17/TEST-*.xml
33+
**/build/test-results/testWithJava21/TEST-*.xml
3334
publishToMavenCentral:
3435
needs: buildAndTest
3536
runs-on: ubuntu-latest
@@ -43,10 +44,10 @@ jobs:
4344
steps:
4445
- uses: actions/checkout@v5
4546
- uses: gradle/actions/wrapper-validation@v5
46-
- name: Set up JDK 21
47+
- name: Set up JDK 25
4748
uses: actions/setup-java@v5
4849
with:
49-
java-version: '21'
50+
java-version: '25'
5051
distribution: 'corretto'
5152
- name: publishToMavenCentral
5253
run: ./gradlew assemble && ./gradlew check -x test -x testng --info && ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -x check --info --stacktrace

.github/workflows/pull_request.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ jobs:
2020
runs-on: ubuntu-latest
2121
strategy:
2222
matrix:
23-
gradle-argument: [ 'assemble && ./gradlew check -x test','testWithJava11', 'testWithJava17', 'test -x testWithJava11 -x testWithJava17' ]
23+
gradle-argument: [ 'assemble && ./gradlew check -x test','testWithJava11', 'testWithJava17','testWithJava21', 'test -x testWithJava11 -x testWithJava17 -x testWithJava21' ]
2424
steps:
2525
- uses: actions/checkout@v5
2626
- uses: gradle/actions/wrapper-validation@v5
27-
- name: Set up JDK 21
27+
- name: Set up JDK 25
2828
uses: actions/setup-java@v5
2929
with:
30-
java-version: '21'
30+
java-version: '25'
3131
distribution: 'corretto'
3232
- name: build and test
3333
run: ./gradlew ${{matrix.gradle-argument}} --info --stacktrace
@@ -39,3 +39,4 @@ jobs:
3939
**/build/test-results/test/TEST-*.xml
4040
**/build/test-results/testWithJava11/TEST-*.xml
4141
**/build/test-results/testWithJava17/TEST-*.xml
42+
**/build/test-results/testWithJava21/TEST-*.xml

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121
steps:
2222
- uses: actions/checkout@v5
2323
- uses: gradle/actions/wrapper-validation@v5
24-
- name: Set up JDK 21
24+
- name: Set up JDK 25
2525
uses: actions/setup-java@v5
2626
with:
27-
java-version: '21'
27+
java-version: '25'
2828
distribution: 'corretto'
2929
- name: build test and publish
3030
run: ./gradlew assemble && ./gradlew check --info && ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -x check --info --stacktrace

build.gradle

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,12 @@ tasks.withType(Test) {
358358
}
359359
}
360360

361+
tasks.register('testWithJava21', Test) {
362+
javaLauncher = javaToolchains.launcherFor {
363+
languageVersion = JavaLanguageVersion.of(21)
364+
}
365+
}
366+
361367
tasks.register('testWithJava17', Test) {
362368
javaLauncher = javaToolchains.launcherFor {
363369
languageVersion = JavaLanguageVersion.of(17)
@@ -368,6 +374,7 @@ tasks.register('testWithJava11', Test) {
368374
languageVersion = JavaLanguageVersion.of(11)
369375
}
370376
}
377+
test.dependsOn testWithJava21
371378
test.dependsOn testWithJava17
372379
test.dependsOn testWithJava11
373380

0 commit comments

Comments
 (0)