Cleanup JVM toolchain implementation

Remove support for <Gradle 6.7 and fix extension method to accept
'JavaToolchainSpec' instead of 'Any'.

^KT-47924 Fixed
This commit is contained in:
Yahor Berdnikau
2022-02-10 16:40:31 +01:00
committed by Space
parent 016143328a
commit ff3a08de6e
8 changed files with 30 additions and 78 deletions
+2
View File
@@ -51,12 +51,14 @@ fun Project.configureJvmToolchain(
if (shouldOverrideObsoleteJdk(jdkVersion)) {
kotlinExtension.jvmToolchain {
@Suppress("USELESS_CAST") // Remove after boostrap update
(this as JavaToolchainSpec).languageVersion
.set(JavaLanguageVersion.of(jdkVersion.overrideMajorVersion!!))
}
updateJvmTarget(jdkVersion.targetName)
} else {
kotlinExtension.jvmToolchain {
@Suppress("USELESS_CAST") // Remove after boostrap update
(this as JavaToolchainSpec).languageVersion
.set(JavaLanguageVersion.of(jdkVersion.majorVersion))
}