From 84ec4106f75b156857877587b78420e814864ed4 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Tue, 15 Jun 2021 16:07:08 +0200 Subject: [PATCH] Don't set toolchain if it is not configured. Before even when user did not configure toolchain, default toolchain was still created, but with recent changes it does not make sense. ^KT-43095 In Progress --- .../kotlin/gradle/dsl/ToolchainDsl.kt | 21 +++++-------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/ToolchainDsl.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/ToolchainDsl.kt index fd1e2e221d6..5c016ca9f7b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/ToolchainDsl.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/ToolchainDsl.kt @@ -52,23 +52,12 @@ internal interface ToolchainSupport { .getByType(JavaPluginExtension::class.java) .toolchain - val toolchainSpec = if (!javaToolchainSpec.languageVersion.isPresent) { - // We can't reuse java toolchain and just set 'languageVersion' to it - // as build will fail when java source and/or target compatibility is set - project.objects.newInstance().apply { - languageVersion.set( - JavaLanguageVersion.of( - Jvm.current().javaVersion!!.majorVersion - ) - ) - } - } else { - javaToolchainSpec + // Only set when toolchain is configured + if (javaToolchainSpec.languageVersion.isPresent) { + it.kotlinJavaToolchain.toolchain.use( + javaToolchainService.launcherFor(javaToolchainSpec) + ) } - - it.kotlinJavaToolchain.toolchain.use( - javaToolchainService.launcherFor(toolchainSpec) - ) } } }