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
libraries/scripting/jvm-host-test/build.gradle.kts
+3 -3
View File
@@ -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 }