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.
This commit is contained in:
@@ -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-embeddable"))
|
||||
compilerClasspath(project(":kotlin-scripting-compiler"))
|
||||
compilerClasspath(project(":kotlin-reflect"))
|
||||
compilerClasspath(kotlinStdlib())
|
||||
compilerClasspath(project(":kotlin-script-runtime"))
|
||||
|
||||
@@ -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-embeddable"))
|
||||
runtime(project(":kotlin-scripting-compiler"))
|
||||
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-embeddable"))
|
||||
testRuntime(project(":kotlin-scripting-compiler"))
|
||||
}
|
||||
|
||||
projectTest()
|
||||
|
||||
@@ -5,10 +5,10 @@ plugins {
|
||||
|
||||
dependencies {
|
||||
compile(project(":examples:scripting-jvm-simple-script"))
|
||||
compileOnly(project(":kotlin-scripting-jvm-host"))
|
||||
compileOnly(project(":kotlin-scripting-jvm-host-unshaded"))
|
||||
testRuntimeOnly(project(":kotlin-compiler-embeddable"))
|
||||
testRuntimeOnly(project(":kotlin-scripting-compiler-embeddable"))
|
||||
testRuntimeOnly(project(":kotlin-scripting-jvm-host-embeddable"))
|
||||
testRuntimeOnly(project(":kotlin-scripting-compiler"))
|
||||
testRuntimeOnly(project(":kotlin-scripting-jvm-host"))
|
||||
testRuntimeOnly(project(":kotlin-reflect"))
|
||||
testRuntimeOnly(intellijDep()) { includeJars("guava", rootProject = rootProject) }
|
||||
testCompile(commonDep("junit"))
|
||||
|
||||
@@ -5,14 +5,14 @@ plugins {
|
||||
|
||||
dependencies {
|
||||
compile(project(":examples:scripting-jvm-maven-deps"))
|
||||
compile(project(":kotlin-scripting-jvm-host"))
|
||||
compile(project(":kotlin-scripting-jvm-host-unshaded"))
|
||||
compile(kotlinStdlib())
|
||||
compileOnly(project(":kotlin-reflect-api"))
|
||||
compileOnly(project(":compiler:util"))
|
||||
|
||||
testRuntimeOnly(project(":kotlin-compiler"))
|
||||
testRuntimeOnly(project(":kotlin-reflect"))
|
||||
testRuntimeOnly(project(":kotlin-scripting-compiler"))
|
||||
testRuntimeOnly(project(":kotlin-scripting-compiler-unshaded"))
|
||||
|
||||
testCompile(commonDep("junit"))
|
||||
}
|
||||
|
||||
@@ -5,10 +5,10 @@ plugins {
|
||||
|
||||
dependencies {
|
||||
compile(project(":examples:scripting-jvm-simple-script"))
|
||||
compile(project(":kotlin-scripting-jvm-host"))
|
||||
compile(project(":kotlin-scripting-jvm-host-unshaded"))
|
||||
compile(project(":kotlin-script-util"))
|
||||
testRuntimeOnly(project(":kotlin-compiler"))
|
||||
testRuntimeOnly(project(":kotlin-scripting-compiler"))
|
||||
testRuntimeOnly(project(":kotlin-scripting-compiler-unshaded"))
|
||||
testRuntimeOnly(project(":kotlin-reflect"))
|
||||
testCompile(commonDep("junit"))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user