Fix compilation of kotlin-maven-plugin and kotlin-script-util

This commit is contained in:
Alexander Udalov
2017-04-28 16:27:37 +03:00
parent 87db245dd8
commit 5bd3716637
3 changed files with 4 additions and 5 deletions
@@ -68,7 +68,7 @@ class KotlinJsr223JvmLocalScriptEngine(
}
private fun makeCompilerConfiguration() = CompilerConfiguration().apply {
addJvmClasspathRoots(PathUtil.getJdkClassesRoots())
addJvmClasspathRoots(PathUtil.getJdkClassesRootsFromCurrentJre())
addJvmClasspathRoots(templateClasspath)
put(CommonConfigurationKeys.MODULE_NAME, "kotlin-script")
languageVersionSettings = LanguageVersionSettingsImpl(LanguageVersion.LATEST_STABLE, ApiVersion.LATEST_STABLE).apply {
@@ -131,7 +131,7 @@ done
val rootDisposable = Disposer.newDisposable()
try {
val configuration = CompilerConfiguration().apply {
addJvmClasspathRoots(PathUtil.getJdkClassesRoots())
addJvmClasspathRoots(PathUtil.getJdkClassesRootsFromCurrentJre())
contextClasspath(KOTLIN_JAVA_RUNTIME_JAR, Thread.currentThread().contextClassLoader)?.let {
addJvmClasspathRoots(it)
}