Skip to content

Commit bdcb7ee

Browse files
committed
Use JDK 24 toolchain to run Gradle and Java-related tasks
1 parent 934d05e commit bdcb7ee

File tree

15 files changed

+60
-16
lines changed

15 files changed

+60
-16
lines changed

.github/actions/run-gradle/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ runs:
1515
id: setup-gradle-jdk
1616
with:
1717
distribution: temurin
18-
java-version: 21
18+
java-version: 24
1919
check-latest: true
2020
- uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
2121
with:

.github/workflows/cross-version.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ jobs:
2222
fail-fast: false
2323
matrix:
2424
jdk:
25-
- version: 24
26-
type: ga
2725
- version: 25
2826
type: ea
2927
name: "OpenJDK ${{ matrix.jdk.version }} (${{ matrix.jdk.release || matrix.jdk.type }})"
@@ -71,7 +69,7 @@ jobs:
7169
strategy:
7270
fail-fast: false
7371
matrix:
74-
jdk: [ 21 ]
72+
jdk: [ 24 ]
7573
name: "OpenJ9 ${{ matrix.jdk }}"
7674
runs-on: ubuntu-latest
7775
steps:

.github/workflows/gradle-dependency-submission.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
2323
with:
2424
distribution: temurin
25-
java-version: 21
25+
java-version: 24
2626
check-latest: true
2727
- name: Generate and submit dependency graph
2828
uses: gradle/actions/dependency-submission@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
with:
3030
distribution: graalvm-community
3131
version: 'latest'
32-
java-version: '21'
32+
java-version: '24'
3333
github-token: ${{ secrets.GITHUB_TOKEN }}
3434
- name: Build
3535
uses: ./.github/actions/main-build

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
- name: Set up JDK
8888
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
8989
with:
90-
java-version: 21
90+
java-version: 24
9191
distribution: temurin
9292
- uses: sbt/setup-sbt@69a46ab4acd4316aa16e68d91a9249a98d7e78d5 # v1.1.8
9393
- name: Update JUnit dependencies in samples
@@ -245,7 +245,7 @@ jobs:
245245
- name: Set up JDK
246246
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
247247
with:
248-
java-version: 21
248+
java-version: 24
249249
distribution: temurin
250250
- uses: sbt/setup-sbt@69a46ab4acd4316aa16e68d91a9249a98d7e78d5 # v1.1.8
251251
- name: Update JUnit dependencies in samples

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ task outputs from previous CI builds.
7070

7171
## Building from Source
7272

73-
You need [JDK 21] to build JUnit. [Gradle toolchains] are used to detect and
73+
You need [JDK 24] to build JUnit. [Gradle toolchains] are used to detect and
7474
potentially download additional JDKs for compilation and test execution.
7575

7676
All modules can be _built_ and _tested_ with the [Gradle Wrapper] using the following command:
@@ -100,7 +100,7 @@ of the JUnit Platform, JUnit Jupiter, and JUnit Vintage.
100100
[Gradle Wrapper]: https://docs.gradle.org/current/userguide/gradle_wrapper.html#sec:using_wrapper
101101
[JaCoCo]: https://www.eclemma.org/jacoco/
102102
[Javadoc]: https://junit.org/junit5/docs/current/api/
103-
[JDK 21]: https://javaalmanac.io/jdk/21/
103+
[JDK 24]: https://javaalmanac.io/jdk/24/
104104
[Release Notes]: https://junit.org/junit5/docs/current/release-notes/
105105
[Samples]: https://github.com/junit-team/junit5-samples
106106
[StackOverflow]: https://stackoverflow.com/questions/tagged/junit5
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21
2+
13
plugins {
24
`kotlin-dsl`
35
}
6+
7+
java {
8+
sourceCompatibility = JavaVersion.VERSION_21
9+
targetCompatibility = JavaVersion.VERSION_21
10+
}
11+
12+
kotlin {
13+
compilerOptions.jvmTarget = JVM_21
14+
}

gradle/gradle-daemon-jvm.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#This file is generated by updateDaemonJvm
2-
toolchainVersion=21
2+
toolchainVersion=24

gradle/plugins/build-parameters/build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ plugins {
44

55
group = "junitbuild"
66

7+
java {
8+
sourceCompatibility = JavaVersion.VERSION_21
9+
targetCompatibility = JavaVersion.VERSION_21
10+
}
11+
712
buildParameters {
813
pluginId("junitbuild.build-parameters")
914
bool("ci") {

gradle/plugins/code-generator/build.gradle.kts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21
2+
13
plugins {
24
`kotlin-dsl`
35
}
@@ -10,3 +12,12 @@ dependencies {
1012
implementation(libs.jackson.module.kotlin)
1113
implementation(libs.jte)
1214
}
15+
16+
java {
17+
sourceCompatibility = JavaVersion.VERSION_21
18+
targetCompatibility = JavaVersion.VERSION_21
19+
}
20+
21+
kotlin {
22+
compilerOptions.jvmTarget = JVM_21
23+
}

0 commit comments

Comments
 (0)