From 0e86b019a9057a8aa94de79858febcfaef0961ff Mon Sep 17 00:00:00 2001 From: You Qi Date: Wed, 1 Nov 2023 17:05:40 +0800 Subject: [PATCH] Migrate to JDK 17 --- .github/workflows/pre-merge.yaml | 2 +- .github/workflows/publish-plugin.yaml | 2 +- plugin-build/unmeta/build.gradle.kts | 11 ++--------- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pre-merge.yaml b/.github/workflows/pre-merge.yaml index fd54ff5..d9a2817 100644 --- a/.github/workflows/pre-merge.yaml +++ b/.github/workflows/pre-merge.yaml @@ -27,7 +27,7 @@ jobs: uses: actions/setup-java@v3.10.0 with: distribution: 'corretto' - java-version: 11 + java-version: 17 - name: Cache Gradle Caches uses: gradle/gradle-build-action@v2 - name: Run Gradle tasks diff --git a/.github/workflows/publish-plugin.yaml b/.github/workflows/publish-plugin.yaml index c3c57a0..2d6c0f7 100644 --- a/.github/workflows/publish-plugin.yaml +++ b/.github/workflows/publish-plugin.yaml @@ -21,7 +21,7 @@ jobs: uses: actions/setup-java@v3.10.0 with: distribution: 'corretto' - java-version: 11 + java-version: 17 - name: Cache Gradle Caches uses: gradle/gradle-build-action@v2 - name: Run Gradle tasks diff --git a/plugin-build/unmeta/build.gradle.kts b/plugin-build/unmeta/build.gradle.kts index 17ebfa5..e2ff726 100644 --- a/plugin-build/unmeta/build.gradle.kts +++ b/plugin-build/unmeta/build.gradle.kts @@ -1,5 +1,3 @@ -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile - plugins { signing kotlin("jvm") @@ -18,13 +16,8 @@ dependencies { } java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - -tasks.withType { - kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() + toolchain { + languageVersion.set(JavaLanguageVersion.of(17)) } }