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:
@@ -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))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user