Migrate repo to use JVM toolchains Gradle feature.

^KT-46972 Fixed
This commit is contained in:
Yahor Berdnikau
2021-06-29 15:42:02 +02:00
committed by Space
parent 08d831934a
commit 7789054547
67 changed files with 424 additions and 723 deletions
+1 -1
View File
@@ -3,7 +3,7 @@ plugins {
id("jps-compatible")
}
jvmTarget = "1.6"
project.updateJvmTarget("1.6")
dependencies {
compile(kotlinStdlib())
@@ -3,7 +3,7 @@ plugins {
id("jps-compatible")
}
jvmTarget = "1.6"
project.updateJvmTarget("1.6")
configurations.implementation {
/**
@@ -3,7 +3,7 @@ plugins {
id("jps-compatible")
}
jvmTarget = "1.6"
project.updateJvmTarget("1.6")
dependencies {
compile(kotlinStdlib())
@@ -4,8 +4,6 @@ plugins {
id("jps-compatible")
}
jvmTarget = "1.8"
dependencies {
compile(project(":kotlin-script-runtime"))
compile(kotlinStdlib())
+1 -7
View File
@@ -3,9 +3,7 @@ plugins {
id("jps-compatible")
}
val JDK_16: String by project
jvmTarget = "1.6"
javaHome = JDK_16
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
dependencies {
compile(project(":kotlin-script-runtime"))
@@ -26,10 +24,6 @@ tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
)
}
tasks.withType<Test> {
executable = "$JDK_16/bin/java"
}
publish()
runtimeJar()