From a5ec7f85865bd6e8120aab3a780f8f846b05900c Mon Sep 17 00:00:00 2001 From: Yang Date: Wed, 18 Sep 2024 11:50:58 +1000 Subject: [PATCH] Build and compile with Java 23. --- .github/workflows/ci.yml | 6 +++--- .github/workflows/deploy-website.yml | 2 +- build-logic/build.gradle.kts | 2 +- .../cache4k/buildlogic/convention/ConventionPlugin.kt | 2 +- gradle/gradle-daemon-jvm.properties | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e9679f0..2197dca 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 - name: Assemble run: ./gradlew assemble @@ -40,7 +40,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: '22' + java-version: '23' - uses: gradle/actions/setup-gradle@v4 - name: Check run: ./gradlew check && ./gradlew -p build-logic detekt @@ -59,7 +59,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: '22' + java-version: '23' - uses: gradle/actions/setup-gradle@v4 - name: Publish snapshot run: ./gradlew publishToMavenCentral diff --git a/.github/workflows/deploy-website.yml b/.github/workflows/deploy-website.yml index c1aad7d..b393fa0 100644 --- a/.github/workflows/deploy-website.yml +++ b/.github/workflows/deploy-website.yml @@ -23,7 +23,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: '22' + java-version: '23' - uses: gradle/actions/setup-gradle@v4 - uses: actions/setup-python@v4 with: diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts index fdbc4f4..af1a3b0 100644 --- a/build-logic/build.gradle.kts +++ b/build-logic/build.gradle.kts @@ -9,7 +9,7 @@ plugins { kotlin { jvmToolchain { - languageVersion.set(JavaLanguageVersion.of(22)) + languageVersion.set(JavaLanguageVersion.of(23)) vendor.set(JvmVendorSpec.AZUL) } } diff --git a/build-logic/src/main/kotlin/io/github/reactivecircus/cache4k/buildlogic/convention/ConventionPlugin.kt b/build-logic/src/main/kotlin/io/github/reactivecircus/cache4k/buildlogic/convention/ConventionPlugin.kt index e25580e..5207813 100644 --- a/build-logic/src/main/kotlin/io/github/reactivecircus/cache4k/buildlogic/convention/ConventionPlugin.kt +++ b/build-logic/src/main/kotlin/io/github/reactivecircus/cache4k/buildlogic/convention/ConventionPlugin.kt @@ -124,7 +124,7 @@ private fun KotlinMultiplatformExtension.configureTargets(project: Project) { } } jvmToolchain { - languageVersion.set(JavaLanguageVersion.of(22)) + languageVersion.set(JavaLanguageVersion.of(23)) vendor.set(JvmVendorSpec.AZUL) } project.tasks.withType().configureEach { 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