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/src/kotlin/script/experimental/jvm/jvmScriptCompilation.kt
+3
View File
@@ -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()
libraries/scripting/jvm/src/kotlin/script/experimental/jvm/jvmScriptingHostConfiguration.kt
+3
View File
@@ -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()