From f2078bb79aeffbf829c797d56dd049042c9bfc1e Mon Sep 17 00:00:00 2001 From: Goooler Date: Tue, 27 Aug 2024 09:15:02 +0800 Subject: [PATCH] Revert "Get rid of toolchain" This reverts commit a9dd66a6 --- .../kotlin/me.champeau.plugin-configuration.gradle.kts | 7 ++++--- settings.gradle.kts | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build-logic/src/main/kotlin/me.champeau.plugin-configuration.gradle.kts b/build-logic/src/main/kotlin/me.champeau.plugin-configuration.gradle.kts index 02a84120..a28a94f6 100644 --- a/build-logic/src/main/kotlin/me.champeau.plugin-configuration.gradle.kts +++ b/build-logic/src/main/kotlin/me.champeau.plugin-configuration.gradle.kts @@ -14,7 +14,7 @@ * limitations under the License. */ import java.text.SimpleDateFormat -import java.util.Date +import java.util.* plugins { `java-gradle-plugin` @@ -62,8 +62,9 @@ tasks.jar { } java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + toolchain { + languageVersion = JavaLanguageVersion.of(8) + } withSourcesJar() withJavadocJar() } diff --git a/settings.gradle.kts b/settings.gradle.kts index 2967188b..1d7441ae 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -24,6 +24,7 @@ pluginManagement { plugins { id("com.gradle.develocity") version "3.18" + id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" } develocity {