Fix toolchain is not applied for modules with 'java' plugin.
Use common base java plugin for configuration action: 'java-base'. ^KT-46972 Fixed
This commit is contained in:
@@ -77,20 +77,24 @@ fun Project.configureJvmToolchain(
|
||||
fun Project.configureJavaOnlyToolchain(
|
||||
jdkVersion: JdkMajorVersion
|
||||
) {
|
||||
plugins.withId("java-library") {
|
||||
plugins.withId("java-base") {
|
||||
val javaExtension = extensions.getByType<JavaPluginExtension>()
|
||||
if (shouldOverrideObsoleteJdk(jdkVersion)) {
|
||||
javaExtension.toolchain.languageVersion.set(
|
||||
JavaLanguageVersion.of(jdkVersion.overrideMajorVersion!!)
|
||||
)
|
||||
javaExtension.toolchain {
|
||||
languageVersion.set(
|
||||
JavaLanguageVersion.of(jdkVersion.overrideMajorVersion!!)
|
||||
)
|
||||
}
|
||||
tasks.withType<JavaCompile>().configureEach {
|
||||
targetCompatibility = jdkVersion.targetName
|
||||
sourceCompatibility = jdkVersion.targetName
|
||||
}
|
||||
} else {
|
||||
javaExtension.toolchain.languageVersion.set(
|
||||
JavaLanguageVersion.of(jdkVersion.majorVersion)
|
||||
)
|
||||
javaExtension.toolchain {
|
||||
languageVersion.set(
|
||||
JavaLanguageVersion.of(jdkVersion.majorVersion)
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user