From c5280185860225240b199df86e8768248e4ed7d8 Mon Sep 17 00:00:00 2001 From: Yang Date: Wed, 18 Sep 2024 12:26:18 +1000 Subject: [PATCH] Build and compile with Java 23. --- .github/workflows/android.yml | 10 +++++----- build-logic/build.gradle.kts | 2 +- .../kstreamlined/buildlogic/detektBuildLogic.kt | 2 +- .../kstreamlined/buildlogic/kotlinBuildLogic.kt | 2 +- gradle/gradle-daemon-jvm.properties | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 8154742c..c9b836a6 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -39,7 +39,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: '22' + java-version: '23' - name: Decrypt secrets run: | @@ -82,7 +82,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: '22' + java-version: '23' - uses: gradle/actions/setup-gradle@v4 with: @@ -102,7 +102,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: '22' + java-version: '23' - uses: gradle/actions/setup-gradle@v4 with: @@ -129,7 +129,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: '22' + java-version: '23' - name: Download build artifacts uses: actions/download-artifact@v4 @@ -172,7 +172,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: '22' + java-version: '23' - name: Download build artifacts uses: actions/download-artifact@v4 diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts index ebf905e4..347d3864 100644 --- a/build-logic/build.gradle.kts +++ b/build-logic/build.gradle.kts @@ -16,7 +16,7 @@ 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/kstreamlined/buildlogic/detektBuildLogic.kt b/build-logic/src/main/kotlin/io/github/reactivecircus/kstreamlined/buildlogic/detektBuildLogic.kt index 30448398..292858de 100644 --- a/build-logic/src/main/kotlin/io/github/reactivecircus/kstreamlined/buildlogic/detektBuildLogic.kt +++ b/build-logic/src/main/kotlin/io/github/reactivecircus/kstreamlined/buildlogic/detektBuildLogic.kt @@ -29,7 +29,7 @@ internal fun Project.configureDetekt() { parallel = true } tasks.withType().configureEach { - jvmTarget = JvmTarget.JVM_21.target + jvmTarget = JvmTarget.JVM_22.target reports { xml.required.set(false) txt.required.set(false) diff --git a/build-logic/src/main/kotlin/io/github/reactivecircus/kstreamlined/buildlogic/kotlinBuildLogic.kt b/build-logic/src/main/kotlin/io/github/reactivecircus/kstreamlined/buildlogic/kotlinBuildLogic.kt index 3360410d..9788570e 100644 --- a/build-logic/src/main/kotlin/io/github/reactivecircus/kstreamlined/buildlogic/kotlinBuildLogic.kt +++ b/build-logic/src/main/kotlin/io/github/reactivecircus/kstreamlined/buildlogic/kotlinBuildLogic.kt @@ -17,7 +17,7 @@ internal fun KotlinProjectExtension.configureKotlin( enableExplicitApi: Boolean = true, ) { jvmToolchain { - languageVersion.set(JavaLanguageVersion.of(22)) + languageVersion.set(JavaLanguageVersion.of(23)) vendor.set(JvmVendorSpec.AZUL) } target.tasks.withType().configureEach { diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties index ef4314f5..cb5c20fc 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