From a8800d4ca46d7a5f2cc345297a1e2be53800c0e5 Mon Sep 17 00:00:00 2001 From: Yang Date: Wed, 18 Sep 2024 11:33:18 +1000 Subject: [PATCH] Build and compile with Java 23. --- .github/workflows/ci.yml | 4 ++-- build.gradle.kts | 6 +++--- gradle/gradle-daemon-jvm.properties | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 520e328..ce1e12b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: '22' + java-version: '23' - uses: gradle/actions/setup-gradle@v4 with: @@ -46,7 +46,7 @@ jobs: - uses: graalvm/setup-graalvm@v1 with: distribution: 'graalvm-community' - java-version: '22' + java-version: '23' github-token: ${{ secrets.GITHUB_TOKEN }} - uses: gradle/actions/setup-gradle@v4 diff --git a/build.gradle.kts b/build.gradle.kts index 035b298..713bd1b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -32,7 +32,7 @@ graalvmNative { } binaries.configureEach { javaLauncher = javaToolchains.launcherFor { - languageVersion.set(JavaLanguageVersion.of(22)) + languageVersion.set(JavaLanguageVersion.of(23)) vendor.set(JvmVendorSpec.GRAAL_VM) } resources.autodetect() @@ -68,7 +68,7 @@ tasks.withType().configureEach { kotlin { jvmToolchain { - languageVersion.set(JavaLanguageVersion.of(22)) + languageVersion.set(JavaLanguageVersion.of(22)) // TODO update once Kotlin supports Java 23 vendor.set(JvmVendorSpec.AZUL) } compilerOptions { @@ -99,7 +99,7 @@ detekt { allRules = true } tasks.withType().configureEach { - jvmTarget = JvmTarget.JVM_21.target + jvmTarget = JvmTarget.JVM_22.target reports { html.outputLocation.set(file("build/reports/detekt/${project.name}.html")) } diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties index ef4314f..cb5c20f 100644 --- a/gradle/gradle-daemon-jvm.properties +++ b/gradle/gradle-daemon-jvm.properties @@ -1,2 +1,2 @@ #This file is generated by updateDaemonJvm -toolchainVersion=22 +toolchainVersion=23