Revert renaming scripting plugin jar:

it conflicts with the compilation on daemon, so transistion should
be planned accordingly, and now it is not a good time for it.
The most important part of the renaming remains intact.

Partially reverts commit "Rename scripting libs and plugin - invert embeddable suffix"
This commit is contained in:
Ilya Chernikov
2020-05-27 13:15:50 +02:00
parent 18953c4717
commit dec8eb7899
41 changed files with 65 additions and 65 deletions
@@ -43,8 +43,8 @@ class JpsCompatiblePluginTasks(private val rootProject: Project, private val pla
":kotlin-daemon-embeddable",
":kotlin-compiler-embeddable",
":kotlin-android-extensions",
":kotlin-scripting-compiler",
":kotlin-scripting-compiler-impl",
":kotlin-scripting-compiler-embeddable",
":kotlin-scripting-compiler-impl-embeddable",
":kotlin-scripting-jvm-host"
)
+1 -1
View File
@@ -354,7 +354,7 @@ private fun getKotlinOptions(kotlinCompileTask: Any): PSourceRootKotlinOptions?
fun parseString(name: String) = compileArguments.dropWhile { it != "-$name" }.drop(1).firstOrNull()
fun isOptionForScriptingCompilerPlugin(option: String): Boolean {
return option.startsWith("-Xplugin=") && option.contains("kotlin-scripting-compiler")
return option.startsWith("-Xplugin=") && option.contains("kotlin-scripting-compiler-embeddable")
}
val extraArguments = compileArguments.filter {