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

Fix execution of simple .kts scripts on Java 9

Browse Source
This commit is contained in:
Alexander Udalov
2017-07-10 21:18:06 +03:00
parent bc2c958a2e
commit aa53fa7e15
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt
+9 -3
View File
@@ -331,9 +331,15 @@ object KotlinToJVMBytecodeCompiler {
val state = analyzeAndGenerate(environment) ?: return null val state = analyzeAndGenerate(environment) ?: return null
try { try {
val classLoader = GeneratedClassLoader(state.factory, parentClassLoader ?: URLClassLoader( val urls = environment.configuration.getList(JVMConfigurationKeys.CONTENT_ROOTS).mapNotNull { root ->
environment.configuration.jvmClasspathRoots.map { it.toURI().toURL() }.toTypedArray(), null when (root) {
)) is JvmModulePathRoot -> root.file // TODO: only add required modules
is JvmClasspathRoot -> root.file
else -> null
}
}.map { it.toURI().toURL() }
val classLoader = GeneratedClassLoader(state.factory, parentClassLoader ?: URLClassLoader(urls.toTypedArray(), null))
val script = environment.getSourceFiles()[0].script ?: error("Script must be parsed") val script = environment.getSourceFiles()[0].script ?: error("Script must be parsed")
return classLoader.loadClass(script.fqName.asString()) return classLoader.loadClass(script.fqName.asString())