Build: add temporary option to suppress jdkHome warning

This commit is contained in:
Alexander Udalov
2021-05-27 16:28:23 +02:00
parent aaffd73feb
commit 1dfcec3a93
6 changed files with 7 additions and 5 deletions
+1 -1
View File
@@ -1135,7 +1135,7 @@ fun Project.configureJvmProject(javaHome: String, javaVersion: String) {
} }
tasks.withType<KotlinCompile> { tasks.withType<KotlinCompile> {
kotlinOptions.jdkHome = javaHome kotlinOptions.jdkHome = javaHome.takeUnless { kotlinBuildProperties.suppressJdkHomeWarning }
kotlinOptions.jvmTarget = javaVersion kotlinOptions.jvmTarget = javaVersion
kotlinOptions.freeCompilerArgs += "-Xjvm-default=compatibility" kotlinOptions.freeCompilerArgs += "-Xjvm-default=compatibility"
} }
@@ -20,3 +20,5 @@ 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)
+1 -1
View File
@@ -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 jdkHome = (rootProject.extra["JDK_16"] as String).takeUnless { kotlinBuildProperties.suppressJdkHomeWarning }
freeCompilerArgs += "-Xsuppress-deprecated-jvm-target-warning" freeCompilerArgs += "-Xsuppress-deprecated-jvm-target-warning"
} }
} }
+1 -1
View File
@@ -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 = JDK_18 kotlinOptions.jdkHome = BuildPropertiesExtKt.getSuppressJdkHomeWarning(project.kotlinBuildProperties) ? null : JDK_18
kotlinOptions.jvmTarget = 1.8 kotlinOptions.jvmTarget = 1.8
} }
+1 -1
View File
@@ -67,7 +67,7 @@ artifacts {
} }
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) { tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
kotlinOptions.jdkHome = JDK_17 kotlinOptions.jdkHome = BuildPropertiesExtKt.getSuppressJdkHomeWarning(project.kotlinBuildProperties) ? null : JDK_17
} }
compileKotlin { compileKotlin {
+1 -1
View File
@@ -60,7 +60,7 @@ artifacts {
} }
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) { tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
kotlinOptions.jdkHome = JDK_18 kotlinOptions.jdkHome = BuildPropertiesExtKt.getSuppressJdkHomeWarning(project.kotlinBuildProperties) ? null : JDK_18
kotlinOptions.jvmTarget = 1.8 kotlinOptions.jvmTarget = 1.8
} }