Fix toolchain jdk override was not working for all modules.

Now it also considers the case when separate tasks toolchain
are configured or module only has java toolchain.

^KT-46972 Fixed
This commit is contained in:
Yahor Berdnikau
2021-07-05 21:14:43 +02:00
parent 70ca222806
commit 1bd0607b53
4 changed files with 78 additions and 18 deletions
+1 -5
View File
@@ -7,11 +7,7 @@ plugins {
// This module does not apply Kotlin plugin, so we are setting toolchain via
// java extension
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(6))
}
}
configureJavaOnlyToolchain(JdkMajorVersion.JDK_1_6)
val kotlinVersion: String by rootProject.extra