Revert "Build: add temporary option to suppress jdkHome warning"

This reverts commit 1dfcec3a93.
This commit is contained in:
Yahor Berdnikau
2021-06-28 10:06:18 +02:00
committed by Space
parent 5b5dddc2d1
commit 08d831934a
6 changed files with 5 additions and 7 deletions
+1 -1
View File
@@ -1133,7 +1133,7 @@ fun Project.configureJvmProject(javaHome: String, javaVersion: String) {
}
tasks.withType<KotlinCompile> {
kotlinOptions.jdkHome = javaHome.takeUnless { kotlinBuildProperties.suppressJdkHomeWarning }
kotlinOptions.jdkHome = javaHome
kotlinOptions.jvmTarget = javaVersion
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.disableWerror: Boolean get() = getBoolean("kotlin.build.disable.werror", false)
val KotlinBuildProperties.suppressJdkHomeWarning: Boolean get() = getBoolean("kotlin.suppress.jdkHome.warning", false)
+1 -1
View File
@@ -31,7 +31,7 @@ val compileJava by tasks.getting(JavaCompile::class) {
val compileKotlin by tasks.getting(KotlinCompile::class) {
kotlinOptions {
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"
}
}
+1 -1
View File
@@ -35,7 +35,7 @@ configureSourcesJar()
configureJavadocJar()
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
}
+1 -1
View File
@@ -67,7 +67,7 @@ artifacts {
}
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
kotlinOptions.jdkHome = BuildPropertiesExtKt.getSuppressJdkHomeWarning(project.kotlinBuildProperties) ? null : JDK_17
kotlinOptions.jdkHome = JDK_17
}
compileKotlin {
+1 -1
View File
@@ -60,7 +60,7 @@ artifacts {
}
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
}