From 5d4dff7948a0f72aeb70759d71b440089227c66c Mon Sep 17 00:00:00 2001 From: Denny Sheirer Date: Fri, 20 Sep 2024 09:33:36 -0400 Subject: [PATCH] #1985 Update to JDK 23 (#1987) Co-authored-by: Dennis Sheirer --- .github/workflows/gradle.yml | 4 ++-- .github/workflows/nightly.yml | 4 ++-- .idea/misc.xml | 2 +- build.gradle | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 1e351def..199c5b57 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -22,10 +22,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up JDK 22 + - name: Set up JDK 23 uses: actions/setup-java@v3 with: - java-version: '22' + java-version: '23' distribution: 'liberica' java-package: 'jdk+fx' - name: Build with Gradle diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 21044b7a..79cda0dc 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -15,10 +15,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up JDK 22 + - name: Set up JDK 23 uses: actions/setup-java@v3 with: - java-version: '22' + java-version: '23' distribution: 'liberica' java-package: 'jdk+fx' diff --git a/.idea/misc.xml b/.idea/misc.xml index f0f78df6..f0a5057c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 4f2b727f..4d53338c 100644 --- a/build.gradle +++ b/build.gradle @@ -58,10 +58,10 @@ repositories { //Version is defined in gradle.properties so that we can CLI override it for nightly builds. version = project.findProperty('projectVersion') -//Java 22 is required for this version of the Project Panama preview/incubator feature +//Java 23 is required for this version of the Project Panama preview/incubator feature java { toolchain { - languageVersion = JavaLanguageVersion.of(22) + languageVersion = JavaLanguageVersion.of(23) } } @@ -126,7 +126,7 @@ dependencies { def os = org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.currentOperatingSystem /** - * This is needed for the JDK22 vector API ... until it moves out of incubation or preview + * This is needed for the JDK23 vector API ... until it moves out of incubation or preview */ tasks.withType(JavaCompile) { options.compilerArgs.add("--enable-preview") //Project Panama Vector API is still in incubator @@ -207,7 +207,7 @@ String jdk_windows_x86_64 = jdk_base + 'windows-x64/jdk-22.0.2-full' /** * Download URLs to download the JDK as part of the gradle build packaging process */ -def jdk_download_base = "https://download.bell-sw.com/java/22.0.2+11/bellsoft-jdk22.0.2+11-" +def jdk_download_base = "https://download.bell-sw.com/java/23+38/bellsoft-jdk23+38-" def jdk_download_suffix = "-full.tar.gz" def jdk_download_linux_aarch64 = jdk_download_base + "linux-aarch64" + jdk_download_suffix def jdk_download_linux_x86_64 = jdk_download_base + "linux-amd64" + jdk_download_suffix