Skip to content

Commit c4b5941

Browse files
committed
Build with JDK 24 (JVM requirements of JARs unchanged)
* GHA gradle.yml ** Install both JDK 23 (to launch Gradle) and 24 (to compile Java) ** disable build_nix (until Nix supports JDK 24) * gradle.properties ** Require JDK 24
1 parent 24fc5ed commit c4b5941

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

.github/workflows/gradle.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- uses: actions/checkout@v4
11-
- uses: gradle/actions/wrapper-validation@v3
11+
- uses: gradle/actions/wrapper-validation@v4
1212

1313
build_gradle:
1414
needs: validate_gradle_wrapper
@@ -18,7 +18,7 @@ jobs:
1818
os: [ubuntu-24.04, ubuntu-24.04-arm, macOS-14]
1919
distribution: ['temurin']
2020
fail-fast: false
21-
name: ${{ matrix.os }} JDK 23
21+
name: ${{ matrix.os }} JDK 24 (via Gradle Java toolchains)
2222
steps:
2323
- name: Git checkout
2424
uses: actions/checkout@v4
@@ -28,6 +28,7 @@ jobs:
2828
distribution: ${{ matrix.distribution }}
2929
# When installing multiple JDKs, the last JDK installed is the default and will be used to run Gradle itself
3030
java-version: |
31+
24
3132
23
3233
cache: 'gradle'
3334
- name: Install Nix
@@ -43,6 +44,7 @@ jobs:
4344

4445

4546
build_nix:
47+
if: false # Disabled until JDK 24 is in nixpkgs
4648
runs-on: ${{ matrix.os }}
4749
strategy:
4850
matrix:

gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
secpVersion = 0.0.1
22

33
# Major (whole number) version of JDK to use for javac, jlink, jpackage, etc.
4-
javaToolchainVersion = 23
4+
javaToolchainVersion = 24
55
# Vendor for javaToolChain. (Should be indicator string from Gradle's KnownJvmVendor enum or empty string)
66
# Official builds use 'Eclipse Adoptium'
77
#javaToolchainVendor = Eclipse Adoptium
88
javaToolchainVendor =
99

1010
# Where to look for JDKs (via environment variables)
11-
org.gradle.java.installations.fromEnv = JAVA_HOME, JDK23
11+
org.gradle.java.installations.fromEnv = JAVA_HOME, JDK24
1212

1313
# Auto-detection can be disabled if you have multiple JDKs of the
1414
# same version installed and Gradle won't reliably select the version you actually want

0 commit comments

Comments
 (0)