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