Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build with JDK 24-ea (JVM requirements of JARs unchanged) #128

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Build with JDK 24-ea (JVM requirements of JARs unchanged) #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24fc5ed
Update Gradle wrapper to Gradle 8.14 (snapshot)
msgilligan Feb 24, 2025
1ff26cf
Build with JDK 24 (JVM requirements of JARs unchanged)
msgilligan Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/gradle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: gradle/actions/wrapper-validation@v3
- uses: gradle/actions/wrapper-validation@v4

build_gradle:
needs: validate_gradle_wrapper
Expand All @@ -18,7 +18,7 @@ jobs:
os: [ubuntu-24.04, ubuntu-24.04-arm, macOS-14]
distribution: ['temurin']
fail-fast: false
name: ${{ matrix.os }} JDK 23
name: ${{ matrix.os }} JDK 24 (via Gradle Java toolchains)
steps:
- name: Git checkout
uses: actions/checkout@v4
Expand All @@ -28,6 +28,7 @@ jobs:
distribution: ${{ matrix.distribution }}
# When installing multiple JDKs, the last JDK installed is the default and will be used to run Gradle itself
java-version: |
24-ea
23
cache: 'gradle'
- name: Install Nix
Expand All @@ -43,6 +44,7 @@ jobs:


build_nix:
if: false # Disabled until JDK 24 is in nixpkgs
runs-on: ${{ matrix.os }}
strategy:
matrix:
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
secpVersion = 0.0.1

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

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

# Auto-detection can be disabled if you have multiple JDKs of the
# same version installed and Gradle won't reliably select the version you actually want
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=8d97a97984f6cbd2b85fe4c60a743440a347544bf18818048e611f5288d46c94
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
distributionSha256Sum=a6133a67465c23dc3296163b54fbbb289118013e018bea1c064565fd0675b7ac
distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-8.14-20250222002553+0000-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Loading