From 08d831934a9caa84245946ea3812aac3bd3ec812 Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <yahor.berdnikau@jetbrains.com>
Date: Mon, 28 Jun 2021 10:06:18 +0200
Subject: [PATCH] Revert "Build: add temporary option to suppress jdkHome
 warning"

This reverts commit 1dfcec3a93b686fac58b660cb539f2f287cf6f24.
---
 build.gradle.kts                               | 2 +-
 buildSrc/src/main/kotlin/BuildPropertiesExt.kt | 2 --
 core/descriptors.runtime/build.gradle.kts      | 2 +-
 libraries/kotlin.test/junit5/build.gradle      | 2 +-
 libraries/stdlib/jdk7/build.gradle             | 2 +-
 libraries/stdlib/jdk8/build.gradle             | 2 +-
 6 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index d63c3b83b40..f0782b5db8d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -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"
     }
diff --git a/buildSrc/src/main/kotlin/BuildPropertiesExt.kt b/buildSrc/src/main/kotlin/BuildPropertiesExt.kt
index 9ad2cec1588..3adb3ddfff8 100644
--- a/buildSrc/src/main/kotlin/BuildPropertiesExt.kt
+++ b/buildSrc/src/main/kotlin/BuildPropertiesExt.kt
@@ -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)
diff --git a/core/descriptors.runtime/build.gradle.kts b/core/descriptors.runtime/build.gradle.kts
index 34f30a3909b..9e880a49b38 100644
--- a/core/descriptors.runtime/build.gradle.kts
+++ b/core/descriptors.runtime/build.gradle.kts
@@ -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"
     }
 }
diff --git a/libraries/kotlin.test/junit5/build.gradle b/libraries/kotlin.test/junit5/build.gradle
index ef5a2eab4ff..48d180522c4 100644
--- a/libraries/kotlin.test/junit5/build.gradle
+++ b/libraries/kotlin.test/junit5/build.gradle
@@ -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
 }
 
diff --git a/libraries/stdlib/jdk7/build.gradle b/libraries/stdlib/jdk7/build.gradle
index 0b7d2536a45..a7774d0ed55 100644
--- a/libraries/stdlib/jdk7/build.gradle
+++ b/libraries/stdlib/jdk7/build.gradle
@@ -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 {
diff --git a/libraries/stdlib/jdk8/build.gradle b/libraries/stdlib/jdk8/build.gradle
index e85976937eb..0d8f659fe60 100644
--- a/libraries/stdlib/jdk8/build.gradle
+++ b/libraries/stdlib/jdk8/build.gradle
@@ -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
 }