From dd28d55c7dbaded328906ec2d9a566ab7ff86ed5 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Fri, 19 Oct 2018 17:33:07 +0200
Subject: [PATCH] Implement proper JDK home passing logic for scripts,
 deprecating old one

KT-27497 fixed, as well as failing tests on TC
---
 .../script/experimental/jvmhost/impl/KJvmCompilerImpl.kt    | 6 +++---
 .../kotlin/script/experimental/jvm/jvmScriptCompilation.kt  | 3 +++
 .../experimental/jvm/jvmScriptingHostConfiguration.kt       | 3 +++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/impl/KJvmCompilerImpl.kt b/libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/impl/KJvmCompilerImpl.kt
index c8ce3e2bfa2..9e0755dc9d8 100644
--- a/libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/impl/KJvmCompilerImpl.kt
+++ b/libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/impl/KJvmCompilerImpl.kt
@@ -41,7 +41,7 @@ import kotlin.script.experimental.host.getMergedScriptText
 import kotlin.script.experimental.host.getScriptingClass
 import kotlin.script.experimental.jvm.JvmDependency
 import kotlin.script.experimental.jvm.impl.BridgeDependenciesResolver
-import kotlin.script.experimental.jvm.javaHome
+import kotlin.script.experimental.jvm.jdkHome
 import kotlin.script.experimental.jvm.jvm
 import kotlin.script.experimental.jvmhost.KJvmCompilerProxy
 import kotlin.script.experimental.util.getOrError
@@ -82,8 +82,8 @@ class KJvmCompilerImpl(val hostConfiguration: ScriptingHostConfiguration) : KJvm
                 put(JVMConfigurationKeys.RETAIN_OUTPUT_IN_MEMORY, true)
 
                 var isModularJava = false
-                (updatedConfiguration.getNoDefault(ScriptCompilationConfiguration.jvm.javaHome)
-                    ?: hostConfiguration[ScriptingHostConfiguration.jvm.javaHome])?.let {
+                (updatedConfiguration.getNoDefault(ScriptCompilationConfiguration.jvm.jdkHome)
+                    ?: hostConfiguration[ScriptingHostConfiguration.jvm.jdkHome])?.let {
                     put(JVMConfigurationKeys.JDK_HOME, it)
                     isModularJava = CoreJrtFileSystem.isModularJdk(it)
                 }
diff --git a/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/jvmScriptCompilation.kt b/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/jvmScriptCompilation.kt
index d9e5f20fcc6..88195f9313e 100644
--- a/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/jvmScriptCompilation.kt
+++ b/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/jvmScriptCompilation.kt
@@ -43,8 +43,11 @@ fun JvmScriptCompilationConfigurationBuilder.dependenciesFromClassloader(
     )
 }
 
+@Deprecated("Unused")
 val JvmScriptCompilationConfigurationKeys.javaHome by PropertiesCollection.keyCopy(ScriptingHostConfiguration.jvm.javaHome)
 
+val JvmScriptCompilationConfigurationKeys.jdkHome by PropertiesCollection.keyCopy(ScriptingHostConfiguration.jvm.jdkHome)
+
 @Suppress("unused")
 val ScriptCompilationConfigurationKeys.jvm
     get() = JvmScriptCompilationConfigurationBuilder()
diff --git a/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/jvmScriptingHostConfiguration.kt b/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/jvmScriptingHostConfiguration.kt
index c63fc4b0456..1089263563b 100644
--- a/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/jvmScriptingHostConfiguration.kt
+++ b/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/jvmScriptingHostConfiguration.kt
@@ -19,8 +19,11 @@ open class JvmScriptingHostConfigurationBuilder : JvmScriptingHostConfigurationK
     companion object : JvmScriptingHostConfigurationKeys
 }
 
+@Deprecated("Unused")
 val JvmScriptingHostConfigurationKeys.javaHome by PropertiesCollection.key<File>(File(System.getProperty("java.home")))
 
+val JvmScriptingHostConfigurationKeys.jdkHome by PropertiesCollection.key<File>()
+
 @Suppress("unused")
 val ScriptingHostConfigurationKeys.jvm
     get() = JvmScriptingHostConfigurationBuilder()