diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt index efdcdbaadb0..126adfbd707 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt @@ -223,7 +223,7 @@ class K2JVMCompiler : CLICompiler() { if (!arguments.disableDefaultScriptingPlugin) { val explicitOrLoadedScriptingPlugin = - pluginClasspaths.any { File(it).name == PathUtil.KOTLIN_SCRIPTING_COMPILER_PLUGIN_JAR } || + pluginClasspaths.any { File(it).name.startsWith(PathUtil.KOTLIN_SCRIPTING_COMPILER_PLUGIN_NAME) } || try { PluginCliParser::class.java.classLoader.loadClass("org.jetbrains.kotlin.extensions.ScriptingCompilerConfigurationExtension") true diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.kt b/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.kt index 33dd61f3193..0575a7ce061 100644 --- a/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.kt +++ b/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.kt @@ -60,7 +60,8 @@ object PathUtil { const val KOTLIN_SCRIPTING_COMMON_JAR = "kotlin-scripting-common.jar" const val KOTLIN_SCRIPTING_JVM_JAR = "kotlin-scripting-jvm.jar" const val KOTLIN_SCRIPTING_MISC_JAR = "kotlin-scripting-misc.jar" - const val KOTLIN_SCRIPTING_COMPILER_PLUGIN_JAR = "kotlin-scripting-compiler.jar" + const val KOTLIN_SCRIPTING_COMPILER_PLUGIN_NAME = "kotlin-scripting-compiler" + const val KOTLIN_SCRIPTING_COMPILER_PLUGIN_JAR = "$KOTLIN_SCRIPTING_COMPILER_PLUGIN_NAME.jar" const val KOTLIN_TEST_NAME = "kotlin-test" const val KOTLIN_TEST_JAR = "$KOTLIN_TEST_NAME.jar"