Skip to content

Commit 8f504d8

Browse files
committedMar 23, 2025
GHA gradle.yml: Build with JDK 24
secp-jdk is still built with JDK 23 by default. JVM requirements of JARs is also unchanged. This commit just updates the GitHub Actions gradle build to use JDK 24. The GitHub Actions Nix build continues to use JDK 23. GHA gradle.yml: * Install both JDK 23 (to launch Gradle) and 24 (to compile Java) * Override default and build with `-PjavaToolchainVersion=24` gradle.properties: * Add a `JDK24` environment variable as a place to search for JDKs Builds will by default be with JDK23 (because of an unchanged property in gradle.properties), but it can be overridden with: `./gradlew -PjavaToolchainVersion=24 build`
1 parent af45d7d commit 8f504d8

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed
 

‎.github/workflows/gradle.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -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
@@ -37,9 +38,9 @@ jobs:
3738
- name: Install secp256k1 with Nix
3839
run: nix profile install nixpkgs#secp256k1
3940
- name: Build with Gradle
40-
run: ./gradlew build
41+
run: ./gradlew -PjavaToolchainVersion=24 build
4142
- name: Run Java & Kotlin Examples
42-
run: ./gradlew run runEcdsa
43+
run: ./gradlew -PjavaToolchainVersion=24 run runEcdsa
4344

4445

4546
build_nix:

‎gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ javaToolchainVersion = 23
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, JDK23, 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)