Rename scripting libs and plugin - invert embeddable suffix

now regular, unshaded libs, are named with suffix `-unshaded`, while
former `-embeddable` ones named without any suffix. This will encoursge
use of the shaded libs by default, avoiding conflicts with 3-party
libs packed into the `kotlin-compiler`.
Note, that only the "frontline" libs are renamed to avoid switching
problems, the ones that not normally used directly are left as is,
including the `kotlin-compiler` itself.

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"))
+    testCompile(project(":kotlin-scripting-compiler-unshaded"))
     testCompile(project(":compiler:cli"))
     testCompile(project(":compiler:backend.js"))
     testCompile(project(":js:js.engines"))

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

@@ -9,14 +9,14 @@ plugins { java }
 val packedJars by configurations.creating
 
 dependencies {
-    packedJars(project(":kotlin-scripting-jsr223")) { isTransitive = false }
+    packedJars(project(":kotlin-scripting-jsr223-unshaded")) { isTransitive = false }
     runtime(project(":kotlin-script-runtime"))
     runtime(kotlinStdlib())
     runtime(project(":kotlin-scripting-common"))
     runtime(project(":kotlin-scripting-jvm"))
-    runtime(project(":kotlin-scripting-jvm-host-embeddable"))
+    runtime(project(":kotlin-scripting-jvm-host"))
     runtime(project(":kotlin-compiler-embeddable"))
-    runtime(project(":kotlin-scripting-compiler-embeddable"))
+    runtime(project(":kotlin-scripting-compiler"))
 }
 
 sourceSets {

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

@@ -9,16 +9,16 @@ val embeddableTestRuntime by configurations.creating
 
 dependencies {
     testCompile(commonDep("junit"))
-    testCompileOnly(project(":kotlin-scripting-jvm-host"))
+    testCompileOnly(project(":kotlin-scripting-jvm-host-unshaded"))
     testCompileOnly(project(":compiler:cli"))
     testCompileOnly(project(":core:util.runtime"))
     
-    testRuntimeOnly(project(":kotlin-scripting-jsr223"))
+    testRuntimeOnly(project(":kotlin-scripting-jsr223-unshaded"))
     testRuntimeOnly(project(":kotlin-compiler"))
     testRuntimeOnly(project(":kotlin-reflect"))
     
     embeddableTestRuntime(commonDep("junit"))
-    embeddableTestRuntime(project(":kotlin-scripting-jsr223-embeddable"))
+    embeddableTestRuntime(project(":kotlin-scripting-jsr223"))
     embeddableTestRuntime(testSourceSet.output)
 }
 

libraries/scripting/jsr223/build.gradle.kts

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

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

@@ -5,13 +5,13 @@ description = "Kotlin Scripting JVM host (for using with embeddable compiler)"
 plugins { java }
 
 dependencies {
-    embedded(project(":kotlin-scripting-jvm-host")) { isTransitive = false }
+    embedded(project(":kotlin-scripting-jvm-host-unshaded")) { isTransitive = false }
     runtime(project(":kotlin-script-runtime"))
     runtime(kotlinStdlib())
     runtime(project(":kotlin-scripting-common"))
     runtime(project(":kotlin-scripting-jvm"))
     runtime(project(":kotlin-compiler-embeddable"))
-    runtime(project(":kotlin-scripting-compiler-embeddable"))
+    runtime(project(":kotlin-scripting-compiler"))
 }
 
 sourceSets {

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

@@ -19,16 +19,16 @@ dependencies {
         allTestsRuntime(intellijDep()) { includeJars("openapi") }
     }
     allTestsRuntime(intellijDep()) { includeJars("idea", "idea_rt", "log4j", "jna") }
-    testCompile(project(":kotlin-scripting-jvm-host"))
+    testCompile(project(":kotlin-scripting-jvm-host-unshaded"))
     testCompile(projectTests(":compiler:tests-common"))
-    testCompile(project(":kotlin-scripting-compiler"))
+    testCompile(project(":kotlin-scripting-compiler-unshaded"))
     testCompile(project(":daemon-common")) // TODO: fix import (workaround for jps build)
 
     testRuntimeOnly(project(":kotlin-compiler"))
     testRuntimeOnly(project(":kotlin-reflect"))
     testRuntimeOnly(commonDep("org.jetbrains.intellij.deps", "trove4j"))
     
-    embeddableTestRuntime(project(":kotlin-scripting-jvm-host-embeddable"))
+    embeddableTestRuntime(project(":kotlin-scripting-jvm-host"))
     embeddableTestRuntime(project(":kotlin-test:kotlin-test-jvm"))
     embeddableTestRuntime(project(":kotlin-test:kotlin-test-junit"))
     embeddableTestRuntime(projectTests(":compiler:tests-common")) { isTransitive = false }

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"))
+    compileOnly(project(":kotlin-scripting-compiler-unshaded"))
     compileOnly(project(":compiler:cli"))
     compileOnly(project(":kotlin-reflect-api"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     publishedRuntime(project(":kotlin-compiler"))
-    publishedRuntime(project(":kotlin-scripting-compiler"))
+    publishedRuntime(project(":kotlin-scripting-compiler-unshaded"))
     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.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_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_COMMON_JAR = "kotlin-scripting-common.jar"
 internal const val KOTLIN_SCRIPTING_JVM_JAR = "kotlin-scripting-jvm.jar"