From bdd001d04c5ecd11d1623c52e0c9c573e72a47ed Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Wed, 4 Apr 2018 12:31:21 +0200 Subject: [PATCH] [minor] drop explicit stdlib detection logic in script compiler ...as it is mainly redundant and in the current for somewhat incorrect --- .../experimental/jvmhost/impl/KJVMCompilerImpl.kt | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/impl/KJVMCompilerImpl.kt b/libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/impl/KJVMCompilerImpl.kt index 98295f54378..0cff6a00fca 100644 --- a/libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/impl/KJVMCompilerImpl.kt +++ b/libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/impl/KJVMCompilerImpl.kt @@ -111,16 +111,10 @@ class KJVMCompilerImpl : KJVMCompilerProxy { isModularJava = CoreJrtFileSystem.isModularJdk(it) } - var explicitStdlib = false additionalConfiguration.getOrNull(ScriptCompileConfigurationProperties.dependencies)?.let { addJvmClasspathRoots( it.flatMap { - (it as JvmDependency).classpath.also { - // TODO: use some constants for jar names, consider stricter checking (maybeVersionedJar) - if (!explicitStdlib) { - explicitStdlib = it.any { it.name.startsWith("kotlin-stdlib") } - } - } + (it as JvmDependency).classpath } ) } @@ -133,10 +127,7 @@ class KJVMCompilerImpl : KJVMCompilerProxy { } } // TODO: implement logic similar to compiler's -no-stdlib (and -no-reflect?) - if (!explicitStdlib) { - addRoot("kotlin.stdlib", KotlinJars.stdlib) -// addRoot("kotlin.script.runtime", KotlinJars.scriptRuntime) - } + addRoot("kotlin.stdlib", KotlinJars.stdlib) put(CommonConfigurationKeys.MODULE_NAME, "kotlin-script") // TODO" take meaningful and valid name from somewhere languageVersionSettings = LanguageVersionSettingsImpl(