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"

libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts

@@ -24,7 +24,7 @@ dependencies {
     testCompile(project(":kotlin-test:kotlin-test-junit"))
     testRuntime(project(":kotlin-reflect"))
     compilerClasspath(project(":kotlin-compiler-embeddable"))
-    compilerClasspath(project(":kotlin-scripting-compiler"))
+    compilerClasspath(project(":kotlin-scripting-compiler-embeddable"))
     compilerClasspath(project(":kotlin-reflect"))
     compilerClasspath(kotlinStdlib())
     compilerClasspath(project(":kotlin-script-runtime"))

libraries/examples/kotlin-jsr223-local-example/build.gradle.kts

@@ -16,14 +16,14 @@ dependencies {
     compile(project(":kotlin-script-runtime"))
     compile(project(":kotlin-compiler-embeddable"))
     compile(project(":kotlin-script-util"))
-    runtime(project(":kotlin-scripting-compiler"))
+    runtime(project(":kotlin-scripting-compiler-embeddable"))
     testCompile(project(":kotlin-test:kotlin-test-junit"))
     testCompile(commonDep("junit:junit"))
     testRuntime(project(":kotlin-reflect"))
     compileOnly(project(":compiler:cli-common")) // TODO: fix import (workaround for jps build)
     testCompileOnly(project(":core:util.runtime")) // TODO: fix import (workaround for jps build)
     testCompileOnly(project(":daemon-common")) // TODO: fix import (workaround for jps build)
-    testRuntime(project(":kotlin-scripting-compiler"))
+    testRuntime(project(":kotlin-scripting-compiler-embeddable"))
 }
 
 projectTest()

libraries/examples/scripting/jvm-embeddable-host/build.gradle.kts

@@ -7,7 +7,7 @@ dependencies {
     compile(project(":examples:scripting-jvm-simple-script"))
     compileOnly(project(":kotlin-scripting-jvm-host-unshaded"))
     testRuntimeOnly(project(":kotlin-compiler-embeddable"))
-    testRuntimeOnly(project(":kotlin-scripting-compiler"))
+    testRuntimeOnly(project(":kotlin-scripting-compiler-embeddable"))
     testRuntimeOnly(project(":kotlin-scripting-jvm-host"))
     testRuntimeOnly(project(":kotlin-reflect"))
     testRuntimeOnly(intellijDep()) { includeJars("guava", rootProject = rootProject) }

libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts

@@ -12,7 +12,7 @@ dependencies {
 
     testRuntimeOnly(project(":kotlin-compiler"))
     testRuntimeOnly(project(":kotlin-reflect"))
-    testRuntimeOnly(project(":kotlin-scripting-compiler-unshaded"))
+    testRuntimeOnly(project(":kotlin-scripting-compiler"))
 
     testCompile(commonDep("junit"))
 }

libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts

@@ -8,7 +8,7 @@ dependencies {
     compile(project(":kotlin-scripting-jvm-host-unshaded"))
     compile(project(":kotlin-script-util"))
     testRuntimeOnly(project(":kotlin-compiler"))
-    testRuntimeOnly(project(":kotlin-scripting-compiler-unshaded"))
+    testRuntimeOnly(project(":kotlin-scripting-compiler"))
     testRuntimeOnly(project(":kotlin-reflect"))
     testCompile(commonDep("junit"))
 }

libraries/scripting/js-test/build.gradle.kts

@@ -12,7 +12,7 @@ dependencies {
 
     testCompile(project(":kotlin-scripting-js"))
     testCompile(project(":compiler:plugin-api"))
-    testCompile(project(":kotlin-scripting-compiler-unshaded"))
+    testCompile(project(":kotlin-scripting-compiler"))
     testCompile(project(":compiler:cli"))
     testCompile(project(":compiler:backend.js"))
     testCompile(project(":js:js.engines"))

libraries/scripting/jsr223-embeddable/build.gradle.kts

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

libraries/scripting/jsr223/build.gradle.kts

@@ -13,7 +13,7 @@ dependencies {
     compile(project(":kotlin-scripting-common"))
     compile(project(":kotlin-scripting-jvm"))
     compile(project(":kotlin-scripting-jvm-host-unshaded"))
-    compile(project(":kotlin-scripting-compiler-unshaded"))
+    compile(project(":kotlin-scripting-compiler"))
     compileOnly(project(":compiler:cli-common"))
     compileOnly(project(":kotlin-reflect-api"))
     compileOnly(intellijCoreDep())

libraries/scripting/jvm-host-embeddable/build.gradle.kts

@@ -11,7 +11,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 {

libraries/scripting/jvm-host-test/build.gradle.kts

@@ -21,7 +21,7 @@ dependencies {
     allTestsRuntime(intellijDep()) { includeJars("idea", "idea_rt", "log4j", "jna") }
     testCompile(project(":kotlin-scripting-jvm-host-unshaded"))
     testCompile(projectTests(":compiler:tests-common"))
-    testCompile(project(":kotlin-scripting-compiler-unshaded"))
+    testCompile(project(":kotlin-scripting-compiler"))
     testCompile(project(":daemon-common")) // TODO: fix import (workaround for jps build)
 
     testRuntimeOnly(project(":kotlin-compiler"))

libraries/scripting/jvm-host/build.gradle.kts

@@ -13,12 +13,12 @@ dependencies {
     compile(kotlinStdlib())
     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"))
 }

libraries/scripting/jvm/src/kotlin/script/experimental/jvm/util/jvmClasspathUtil.kt

@@ -26,10 +26,10 @@ internal const val KOTLIN_JAVA_STDLIB_JAR = "kotlin-stdlib.jar"
 internal const val KOTLIN_JAVA_REFLECT_JAR = "kotlin-reflect.jar"
 internal const val KOTLIN_JAVA_SCRIPT_RUNTIME_JAR = "kotlin-script-runtime.jar"
 internal const val TROVE4J_JAR = "trove4j.jar"
-internal const val KOTLIN_SCRIPTING_COMPILER_JAR = "kotlin-scripting-compiler-unshaded.jar"
-internal const val KOTLIN_SCRIPTING_COMPILER_EMBEDDABLE_JAR = "kotlin-scripting-compiler.jar"
-internal const val KOTLIN_SCRIPTING_COMPILER_IMPL_JAR = "kotlin-scripting-compiler-impl-unshaded.jar"
-internal const val KOTLIN_SCRIPTING_COMPILER_IMPL_EMBEDDABLE_JAR = "kotlin-scripting-compiler-impl.jar"
+internal const val KOTLIN_SCRIPTING_COMPILER_JAR = "kotlin-scripting-compiler.jar"
+internal const val KOTLIN_SCRIPTING_COMPILER_EMBEDDABLE_JAR = "kotlin-scripting-compiler-embeddable.jar"
+internal const val KOTLIN_SCRIPTING_COMPILER_IMPL_JAR = "kotlin-scripting-compiler-impl.jar"
+internal const val KOTLIN_SCRIPTING_COMPILER_IMPL_EMBEDDABLE_JAR = "kotlin-scripting-compiler-impl-embeddable.jar"
 internal const val KOTLIN_SCRIPTING_COMMON_JAR = "kotlin-scripting-common.jar"
 internal const val KOTLIN_SCRIPTING_JVM_JAR = "kotlin-scripting-jvm.jar"
 

libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts

@@ -126,8 +126,8 @@ tasks.withType<Test> {
         ":kotlin-script-runtime:install",
         ":kotlin-scripting-common:install",
         ":kotlin-scripting-jvm:install",
-        ":kotlin-scripting-compiler:install",
-        ":kotlin-scripting-compiler-impl:install",
+        ":kotlin-scripting-compiler-embeddable:install",
+        ":kotlin-scripting-compiler-impl-embeddable:install",
         ":kotlin-test-js-runner:install",
         ":kotlin-source-map-loader:install"
     )

libraries/tools/kotlin-gradle-plugin/build.gradle.kts

@@ -43,7 +43,7 @@ dependencies {
     compileOnly(project(":kotlin-compiler-runner"))
     compileOnly(project(":kotlin-annotation-processing"))
     compileOnly(project(":kotlin-annotation-processing-gradle"))
-    compileOnly(project(":kotlin-scripting-compiler-unshaded"))
+    compileOnly(project(":kotlin-scripting-compiler"))
     compileOnly(project(":kotlin-gradle-statistics"))
     embedded(project(":kotlin-gradle-statistics"))
 
@@ -64,8 +64,8 @@ dependencies {
     runtime(projectRuntimeJar(":kotlin-annotation-processing-gradle"))
     runtime(projectRuntimeJar(":kotlin-android-extensions"))
     runtime(projectRuntimeJar(":kotlin-compiler-runner"))
-    runtime(projectRuntimeJar(":kotlin-scripting-compiler"))
-    runtime(projectRuntimeJar(":kotlin-scripting-compiler-impl"))
+    runtime(projectRuntimeJar(":kotlin-scripting-compiler-embeddable"))
+    runtime(projectRuntimeJar(":kotlin-scripting-compiler-impl-embeddable"))
     runtime(project(":kotlin-reflect"))
 
     jarContents(compileOnly(intellijDep()) {

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/scripting/internal/ScriptingGradleSubplugin.kt

@@ -220,7 +220,7 @@ fun Configuration.discoverScriptExtensionsFiles() =
 
 class ScriptingKotlinGradleSubplugin : KotlinGradleSubplugin<AbstractCompile> {
     companion object {
-        const val SCRIPTING_ARTIFACT_NAME = "kotlin-scripting-compiler"
+        const val SCRIPTING_ARTIFACT_NAME = "kotlin-scripting-compiler-embeddable"
 
         val SCRIPT_DEFINITIONS_OPTION = "script-definitions"
         val SCRIPT_DEFINITIONS_CLASSPATH_OPTION = "script-definitions-classpath"

libraries/tools/kotlin-main-kts-test/build.gradle.kts

@@ -10,7 +10,7 @@ dependencies {
     testCompileOnly(project(":compiler:cli"))
     testCompileOnly(project(":kotlin-scripting-jvm-host-unshaded"))
     testCompile(commonDep("junit"))
-    testCompile(projectTests(":kotlin-scripting-compiler-unshaded")) { isTransitive = false }
+    testCompile(projectTests(":kotlin-scripting-compiler")) { isTransitive = false }
 }
 
 sourceSets {

libraries/tools/kotlin-main-kts/build.gradle.kts

@@ -30,7 +30,7 @@ dependencies {
     compileOnly(project(":kotlin-scripting-jvm-host-unshaded"))
     compileOnly(project(":kotlin-scripting-dependencies"))
     runtime(project(":kotlin-compiler-embeddable"))
-    runtime(project(":kotlin-scripting-compiler"))
+    runtime(project(":kotlin-scripting-compiler-embeddable"))
     runtime(project(":kotlin-scripting-jvm-host"))
     runtime(project(":kotlin-reflect"))
     embedded(project(":kotlin-scripting-common")) { isTransitive = false }

libraries/tools/kotlin-maven-plugin/pom.xml

@@ -42,7 +42,7 @@
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-scripting-compiler-unshaded</artifactId>
+            <artifactId>kotlin-scripting-compiler</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

libraries/tools/kotlin-script-util/build.gradle.kts

@@ -13,7 +13,7 @@ dependencies {
     compile(commonDep("org.jetbrains.intellij.deps", "trove4j"))
     compileOnly(project(":compiler:cli"))
     compileOnly(project(":daemon-common"))
-    compileOnly(project(":kotlin-scripting-compiler-unshaded"))
+    compileOnly(project(":kotlin-scripting-compiler"))
     compile(projectRuntimeJar(":kotlin-daemon-client"))
     compileOnly("org.jetbrains.kotlin:jcabi-aether:1.0-dev-3")
     compileOnly("org.sonatype.aether:aether-api:1.13.1")
@@ -22,7 +22,7 @@ dependencies {
     testCompile(project(":kotlin-test:kotlin-test-junit"))
     testRuntime(project(":kotlin-reflect"))
     testCompile(commonDep("junit:junit"))
-    testCompile(project(":kotlin-scripting-compiler-unshaded"))
+    testCompile(project(":kotlin-scripting-compiler"))
     testRuntimeOnly(project(":kotlin-compiler"))
     testRuntime("org.jetbrains.kotlin:jcabi-aether:1.0-dev-3")
     testRuntime("org.sonatype.aether:aether-api:1.13.1")