azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename scripting libs and plugin - invert embeddable suffix

Browse Source 
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:
Ilya Chernikov
2020-05-24 20:59:38 +02:00
parent f39165bb58
commit 2509dfb287
38 changed files with 91 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/scripting/scripting-compiler-embeddable/build.gradle.kts
+2 -2
View File
@@ -6,8 +6,8 @@ description = "Kotlin Scripting Compiler Plugin for embeddable compiler"
val packedJars by configurations.creating
dependencies {
packedJars(project(":kotlin-scripting-compiler")) { isTransitive = false }
runtime(project(":kotlin-scripting-compiler-impl-embeddable"))
packedJars(project(":kotlin-scripting-compiler-unshaded")) { isTransitive = false }
runtime(project(":kotlin-scripting-compiler-impl"))
runtime(kotlinStdlib())
}
plugins/scripting/scripting-compiler-impl-embeddable/build.gradle.kts
+1 -1
View File
@@ -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")) { isTransitive = false }
packedJars(project(":kotlin-scripting-compiler-impl-unshaded")) { isTransitive = false }
runtime(project(":kotlin-scripting-common"))
runtime(project(":kotlin-scripting-jvm"))
runtime(kotlinStdlib())
plugins/scripting/scripting-compiler/build.gradle.kts
+1 -1
View File
@@ -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"))
compile(project(":kotlin-scripting-compiler-impl-unshaded"))
compile(kotlinStdlib())
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
plugins/scripting/scripting-ide-services-embeddable/build.gradle.kts
+2 -2
View File
@@ -3,14 +3,14 @@ description = "Kotlin Scripting Compiler extension providing code completion and
plugins { java }
dependencies {
embedded(project(":kotlin-scripting-ide-services")) { isTransitive = false }
embedded(project(":kotlin-scripting-ide-services-unshaded")) { isTransitive = false }
embedded(project(":idea:ide-common")) { 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 {
plugins/scripting/scripting-ide-services-test/build.gradle.kts
+3 -3
View File
@@ -14,15 +14,15 @@ val embeddableTestRuntime by configurations.creating {
dependencies {
allTestsRuntime(commonDep("junit"))
testCompile(project(":kotlin-scripting-ide-services"))
testCompile(project(":kotlin-scripting-compiler"))
testCompile(project(":kotlin-scripting-ide-services-unshaded"))
testCompile(project(":kotlin-scripting-compiler-unshaded"))
testCompile(project(":compiler:cli-common"))
testRuntimeOnly(project(":kotlin-compiler"))
testRuntimeOnly(commonDep("org.jetbrains.intellij.deps", "trove4j"))
testRuntimeOnly(project(":idea:ide-common")) { isTransitive = false }
embeddableTestRuntime(project(":kotlin-scripting-ide-services-embeddable"))
embeddableTestRuntime(project(":kotlin-scripting-ide-services"))
embeddableTestRuntime(project(":kotlin-compiler-embeddable"))
embeddableTestRuntime(testSourceSet.output)
}
plugins/scripting/scripting-ide-services/build.gradle.kts
+2 -2
View File
@@ -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"))
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"))
}