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

[minor] drop explicit stdlib detection logic in script compiler

Browse Source 
...as it is mainly redundant and in the current for somewhat incorrect
This commit is contained in:
Ilya Chernikov
2018-04-04 12:31:21 +02:00
parent 73d2580435
commit bdd001d04c
1 changed files with 2 additions and 11 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
+2 -11
View File
@@ -111,16 +111,10 @@ class KJVMCompilerImpl : KJVMCompilerProxy {
isModularJava = CoreJrtFileSystem.isModularJdk(it) isModularJava = CoreJrtFileSystem.isModularJdk(it)
} }
var explicitStdlib = false
additionalConfiguration.getOrNull(ScriptCompileConfigurationProperties.dependencies)?.let { additionalConfiguration.getOrNull(ScriptCompileConfigurationProperties.dependencies)?.let {
addJvmClasspathRoots( addJvmClasspathRoots(
it.flatMap { it.flatMap {
(it as JvmDependency).classpath.also { (it as JvmDependency).classpath
// TODO: use some constants for jar names, consider stricter checking (maybeVersionedJar)
if (!explicitStdlib) {
explicitStdlib = it.any { it.name.startsWith("kotlin-stdlib") }
}
}
} }
) )
} }
@@ -133,10 +127,7 @@ class KJVMCompilerImpl : KJVMCompilerProxy {
} }
} }
// TODO: implement logic similar to compiler's -no-stdlib (and -no-reflect?) // TODO: implement logic similar to compiler's -no-stdlib (and -no-reflect?)
if (!explicitStdlib) { addRoot("kotlin.stdlib", KotlinJars.stdlib)
addRoot("kotlin.stdlib", KotlinJars.stdlib)
// addRoot("kotlin.script.runtime", KotlinJars.scriptRuntime)
}
put(CommonConfigurationKeys.MODULE_NAME, "kotlin-script") // TODO" take meaningful and valid name from somewhere put(CommonConfigurationKeys.MODULE_NAME, "kotlin-script") // TODO" take meaningful and valid name from somewhere
languageVersionSettings = LanguageVersionSettingsImpl( languageVersionSettings = LanguageVersionSettingsImpl(