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

Improve automatic scripting plugin picking logic

Browse Source
This commit is contained in:
Ilya Chernikov
2018-06-28 09:13:25 +02:00
parent 4812fcf1ad
commit e17c36cf12
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt
+1 -1
View File
@@ -223,7 +223,7 @@ class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {
if (!arguments.disableDefaultScriptingPlugin) { if (!arguments.disableDefaultScriptingPlugin) {
val explicitOrLoadedScriptingPlugin = 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 { try {
PluginCliParser::class.java.classLoader.loadClass("org.jetbrains.kotlin.extensions.ScriptingCompilerConfigurationExtension") PluginCliParser::class.java.classLoader.loadClass("org.jetbrains.kotlin.extensions.ScriptingCompilerConfigurationExtension")
true true
compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.kt
+2 -1
View File
@@ -60,7 +60,8 @@ object PathUtil {
const val KOTLIN_SCRIPTING_COMMON_JAR = "kotlin-scripting-common.jar" const val KOTLIN_SCRIPTING_COMMON_JAR = "kotlin-scripting-common.jar"
const val KOTLIN_SCRIPTING_JVM_JAR = "kotlin-scripting-jvm.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_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_NAME = "kotlin-test"
const val KOTLIN_TEST_JAR = "$KOTLIN_TEST_NAME.jar" const val KOTLIN_TEST_JAR = "$KOTLIN_TEST_NAME.jar"