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"

plugins/pill/pill-importer/src/JpsCompatiblePluginTasks.kt

@@ -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"
         )
 

plugins/pill/pill-importer/src/parser.kt

@@ -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 {

plugins/scripting/scripting-compiler-embeddable/build.gradle.kts

@@ -6,8 +6,8 @@ description = "Kotlin Scripting Compiler Plugin for embeddable compiler"
 
 val packedJars by configurations.creating
 dependencies {
-    packedJars(project(":kotlin-scripting-compiler-unshaded")) { isTransitive = false }
-    runtime(project(":kotlin-scripting-compiler-impl"))
+    packedJars(project(":kotlin-scripting-compiler")) { isTransitive = false }
+    runtime(project(":kotlin-scripting-compiler-impl-embeddable"))
     runtime(kotlinStdlib())
 }
 

plugins/scripting/scripting-compiler-impl-embeddable/build.gradle.kts

@@ -6,7 +6,7 @@ description = "Kotlin Compiler Infrastructure for Scripting for embeddable compi
 
 val packedJars by configurations.creating
 dependencies {
-    packedJars(project(":kotlin-scripting-compiler-impl-unshaded")) { isTransitive = false }
+    packedJars(project(":kotlin-scripting-compiler-impl")) { isTransitive = false }
     runtime(project(":kotlin-scripting-common"))
     runtime(project(":kotlin-scripting-jvm"))
     runtime(kotlinStdlib())

plugins/scripting/scripting-compiler/build.gradle.kts

@@ -18,7 +18,7 @@ dependencies {
     compile(project(":kotlin-scripting-js"))
     compile(project(":kotlin-util-klib"))
     compile(project(":kotlin-scripting-jvm"))
-    compile(project(":kotlin-scripting-compiler-impl-unshaded"))
+    compile(project(":kotlin-scripting-compiler-impl"))
     compile(kotlinStdlib())
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
 

plugins/scripting/scripting-ide-services-embeddable/build.gradle.kts

@@ -10,7 +10,7 @@ dependencies {
     runtime(project(":kotlin-scripting-common"))
     runtime(project(":kotlin-scripting-jvm"))
     runtime(project(":kotlin-compiler-embeddable"))
-    runtime(project(":kotlin-scripting-compiler"))
+    runtime(project(":kotlin-scripting-compiler-embeddable"))
 }
 
 sourceSets {

plugins/scripting/scripting-ide-services-test/build.gradle.kts

@@ -15,7 +15,7 @@ val embeddableTestRuntime by configurations.creating {
 dependencies {
     allTestsRuntime(commonDep("junit"))
     testCompile(project(":kotlin-scripting-ide-services-unshaded"))
-    testCompile(project(":kotlin-scripting-compiler-unshaded"))
+    testCompile(project(":kotlin-scripting-compiler"))
     testCompile(project(":compiler:cli-common"))
 
     testRuntimeOnly(project(":kotlin-compiler"))

plugins/scripting/scripting-ide-services/build.gradle.kts

@@ -16,12 +16,12 @@ dependencies {
     compileOnly(project(":idea:ide-common"))
     compile(project(":kotlin-scripting-common"))
     compile(project(":kotlin-scripting-jvm"))
-    compileOnly(project(":kotlin-scripting-compiler-unshaded"))
+    compileOnly(project(":kotlin-scripting-compiler"))
     compileOnly(project(":compiler:cli"))
     compileOnly(project(":kotlin-reflect-api"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     publishedRuntime(project(":kotlin-compiler"))
-    publishedRuntime(project(":kotlin-scripting-compiler-unshaded"))
+    publishedRuntime(project(":kotlin-scripting-compiler"))
     publishedRuntime(project(":kotlin-reflect"))
     publishedRuntime(commonDep("org.jetbrains.intellij.deps", "trove4j"))
 }

plugins/scripting/scripting-idea/src/org/jetbrains/kotlin/scripting/idea/plugin/ScriptingGradleProjectImportHandler.kt

@@ -18,7 +18,7 @@ class ScriptingGradleProjectImportHandler : GradleProjectImportHandler {
     val gradlePluginJars = listOf(
         "scripting-gradle", // obsolete artifact name, only for compatibility with 1.2.5x, where it was introduced (and immediately dropped afterwards)
         "scripting-compiler",
-        "scripting-compiler-unshaded"
+        "scripting-compiler-embeddable"
     )
 
     override fun importBySourceSet(