Ensure default toolchain is also set to java only modules.
^KT-46972 Fixed
This commit is contained in:
committed by
TeamCityServer
parent
a8e28e4b69
commit
de22a467a1
@@ -43,6 +43,9 @@ fun Project.shouldOverrideObsoleteJdk(
|
|||||||
fun Project.configureJvmToolchain(
|
fun Project.configureJvmToolchain(
|
||||||
jdkVersion: JdkMajorVersion
|
jdkVersion: JdkMajorVersion
|
||||||
) {
|
) {
|
||||||
|
// Ensure java only modules also set default toolchain
|
||||||
|
configureJavaOnlyToolchain(jdkVersion)
|
||||||
|
|
||||||
plugins.withId("org.jetbrains.kotlin.jvm") {
|
plugins.withId("org.jetbrains.kotlin.jvm") {
|
||||||
val kotlinExtension = extensions.getByType<KotlinTopLevelExtension>()
|
val kotlinExtension = extensions.getByType<KotlinTopLevelExtension>()
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ plugins {
|
|||||||
java
|
java
|
||||||
}
|
}
|
||||||
|
|
||||||
val JDK_18: String by rootProject.extra
|
|
||||||
|
|
||||||
val fatJarContents by configurations.creating {
|
val fatJarContents by configurations.creating {
|
||||||
isCanBeResolved = true
|
isCanBeResolved = true
|
||||||
|
|||||||
Reference in New Issue
Block a user