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
This commit is contained in:
Yahor Berdnikau
2021-06-15 16:07:08 +02:00
committed by Space
parent 1c9b013732
commit 84ec4106f7
@@ -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<DefaultToolchainSpec>().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)
)
}
}
}