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