Improve automatic scripting plugin picking logic

2018-06-28 09:13:25 +02:00
parent 4812fcf1ad
commit e17c36cf12
2 changed files with 3 additions and 2 deletions
@@ -223,7 +223,7 @@ class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {

        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