From 24d088242c062391fd80c8298123073daa76038f Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Tue, 21 Sep 2021 15:45:20 +0200 Subject: [PATCH] Use JVM toolchain for buildSrc module. Before this change buildSrc module was compiled with current user JDK. For example on CI it is JDK 1.8. But when the user is using JDK different from 1.8, buildSrc compilation misses remote build cache. This may lead to full project recomplilation on the user side. --- buildSrc/build.gradle.kts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index df045ad653f..8f6af311d7a 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -91,6 +91,12 @@ repositories { } } +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(8)) + } +} + val generateCompilerVersion by tasks.registering(VersionGenerator::class) { kotlinNativeVersionInResources=true defaultVersionFileLocation() @@ -189,11 +195,6 @@ samWithReceiver { fun Project.`samWithReceiver`(configure: org.jetbrains.kotlin.samWithReceiver.gradle.SamWithReceiverExtension.() -> Unit): Unit = extensions.configure("samWithReceiver", configure) -java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - tasks.withType().configureEach { kotlinOptions.allWarningsAsErrors = true kotlinOptions.freeCompilerArgs += listOf(