Revert "Build: add temporary option to suppress jdkHome warning"
This reverts commit 1dfcec3a93.
This commit is contained in:
+1
-1
@@ -1133,7 +1133,7 @@ fun Project.configureJvmProject(javaHome: String, javaVersion: String) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
tasks.withType<KotlinCompile> {
|
tasks.withType<KotlinCompile> {
|
||||||
kotlinOptions.jdkHome = javaHome.takeUnless { kotlinBuildProperties.suppressJdkHomeWarning }
|
kotlinOptions.jdkHome = javaHome
|
||||||
kotlinOptions.jvmTarget = javaVersion
|
kotlinOptions.jvmTarget = javaVersion
|
||||||
kotlinOptions.freeCompilerArgs += "-Xjvm-default=compatibility"
|
kotlinOptions.freeCompilerArgs += "-Xjvm-default=compatibility"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,5 +20,3 @@ val KotlinBuildProperties.jarCompression: Boolean get() = getBoolean("kotlin.bui
|
|||||||
val KotlinBuildProperties.ignoreTestFailures: Boolean get() = getBoolean("ignoreTestFailures", isTeamcityBuild)
|
val KotlinBuildProperties.ignoreTestFailures: Boolean get() = getBoolean("ignoreTestFailures", isTeamcityBuild)
|
||||||
|
|
||||||
val KotlinBuildProperties.disableWerror: Boolean get() = getBoolean("kotlin.build.disable.werror", false)
|
val KotlinBuildProperties.disableWerror: Boolean get() = getBoolean("kotlin.build.disable.werror", false)
|
||||||
|
|
||||||
val KotlinBuildProperties.suppressJdkHomeWarning: Boolean get() = getBoolean("kotlin.suppress.jdkHome.warning", false)
|
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ val compileJava by tasks.getting(JavaCompile::class) {
|
|||||||
val compileKotlin by tasks.getting(KotlinCompile::class) {
|
val compileKotlin by tasks.getting(KotlinCompile::class) {
|
||||||
kotlinOptions {
|
kotlinOptions {
|
||||||
jvmTarget = "1.6"
|
jvmTarget = "1.6"
|
||||||
jdkHome = (rootProject.extra["JDK_16"] as String).takeUnless { kotlinBuildProperties.suppressJdkHomeWarning }
|
jdkHome = rootProject.extra["JDK_16"] as String
|
||||||
freeCompilerArgs += "-Xsuppress-deprecated-jvm-target-warning"
|
freeCompilerArgs += "-Xsuppress-deprecated-jvm-target-warning"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ configureSourcesJar()
|
|||||||
configureJavadocJar()
|
configureJavadocJar()
|
||||||
|
|
||||||
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
|
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
|
||||||
kotlinOptions.jdkHome = BuildPropertiesExtKt.getSuppressJdkHomeWarning(project.kotlinBuildProperties) ? null : JDK_18
|
kotlinOptions.jdkHome = JDK_18
|
||||||
kotlinOptions.jvmTarget = 1.8
|
kotlinOptions.jvmTarget = 1.8
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -67,7 +67,7 @@ artifacts {
|
|||||||
}
|
}
|
||||||
|
|
||||||
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
|
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
|
||||||
kotlinOptions.jdkHome = BuildPropertiesExtKt.getSuppressJdkHomeWarning(project.kotlinBuildProperties) ? null : JDK_17
|
kotlinOptions.jdkHome = JDK_17
|
||||||
}
|
}
|
||||||
|
|
||||||
compileKotlin {
|
compileKotlin {
|
||||||
|
|||||||
@@ -60,7 +60,7 @@ artifacts {
|
|||||||
}
|
}
|
||||||
|
|
||||||
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
|
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
|
||||||
kotlinOptions.jdkHome = BuildPropertiesExtKt.getSuppressJdkHomeWarning(project.kotlinBuildProperties) ? null : JDK_18
|
kotlinOptions.jdkHome = JDK_18
|
||||||
kotlinOptions.jvmTarget = 1.8
|
kotlinOptions.jvmTarget = 1.8
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user