azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement proper JDK home passing logic for scripts, deprecating old one

Browse Source 
KT-27497 fixed, as well as failing tests on TC
This commit is contained in:
Ilya Chernikov
2018-10-19 17:33:07 +02:00
parent 9ccaef2f6b
commit dd28d55c7d
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/impl/KJvmCompilerImpl.kt
+3 -3
View File
@@ -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)
}