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/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
+2 -2
View File
@@ -126,8 +126,8 @@ tasks.withType<Test> {
":kotlin-script-runtime:install",
":kotlin-scripting-common:install",
":kotlin-scripting-jvm:install",
":kotlin-scripting-compiler-embeddable:install",
":kotlin-scripting-compiler-impl-embeddable:install",
":kotlin-scripting-compiler:install",
":kotlin-scripting-compiler-impl:install",
":kotlin-test-js-runner:install",
":kotlin-source-map-loader:install"
)
libraries/tools/kotlin-gradle-plugin/build.gradle.kts
+3 -3
View File
@@ -43,7 +43,7 @@ dependencies {
compileOnly(project(":kotlin-compiler-runner"))
compileOnly(project(":kotlin-annotation-processing"))
compileOnly(project(":kotlin-annotation-processing-gradle"))
compileOnly(project(":kotlin-scripting-compiler"))
compileOnly(project(":kotlin-scripting-compiler-unshaded"))
compileOnly(project(":kotlin-gradle-statistics"))
embedded(project(":kotlin-gradle-statistics"))
@@ -64,8 +64,8 @@ dependencies {
runtime(projectRuntimeJar(":kotlin-annotation-processing-gradle"))
runtime(projectRuntimeJar(":kotlin-android-extensions"))
runtime(projectRuntimeJar(":kotlin-compiler-runner"))
runtime(projectRuntimeJar(":kotlin-scripting-compiler-embeddable"))
runtime(projectRuntimeJar(":kotlin-scripting-compiler-impl-embeddable"))
runtime(projectRuntimeJar(":kotlin-scripting-compiler"))
runtime(projectRuntimeJar(":kotlin-scripting-compiler-impl"))
runtime(project(":kotlin-reflect"))
jarContents(compileOnly(intellijDep()) {
libraries/tools/kotlin-main-kts-test/build.gradle.kts
+2 -2
View File
@@ -8,9 +8,9 @@ plugins {
dependencies {
testCompile(project(":kotlin-main-kts"))
testCompileOnly(project(":compiler:cli"))
testCompileOnly(project(":kotlin-scripting-jvm-host"))
testCompileOnly(project(":kotlin-scripting-jvm-host-unshaded"))
testCompile(commonDep("junit"))
testCompile(projectTests(":kotlin-scripting-compiler")) { isTransitive = false }
testCompile(projectTests(":kotlin-scripting-compiler-unshaded")) { isTransitive = false }
}
sourceSets {
libraries/tools/kotlin-main-kts/build.gradle.kts
+4 -4
View File
@@ -27,15 +27,15 @@ val embedded by configurations
dependencies {
compileOnly("org.apache.ivy:ivy:2.5.0")
compileOnly(project(":compiler:cli-common"))
compileOnly(project(":kotlin-scripting-jvm-host"))
compileOnly(project(":kotlin-scripting-jvm-host-unshaded"))
compileOnly(project(":kotlin-scripting-dependencies"))
runtime(project(":kotlin-compiler-embeddable"))
runtime(project(":kotlin-scripting-compiler-embeddable"))
runtime(project(":kotlin-scripting-jvm-host-embeddable"))
runtime(project(":kotlin-scripting-compiler"))
runtime(project(":kotlin-scripting-jvm-host"))
runtime(project(":kotlin-reflect"))
embedded(project(":kotlin-scripting-common")) { isTransitive = false }
embedded(project(":kotlin-scripting-jvm")) { isTransitive = false }
embedded(project(":kotlin-scripting-jvm-host")) { isTransitive = false }
embedded(project(":kotlin-scripting-jvm-host-unshaded")) { isTransitive = false }
embedded(project(":kotlin-scripting-dependencies")) { isTransitive = false }
embedded("org.apache.ivy:ivy:2.5.0")
embedded(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
libraries/tools/kotlin-maven-plugin/pom.xml
+1 -1
View File
@@ -42,7 +42,7 @@
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-scripting-compiler</artifactId>
<artifactId>kotlin-scripting-compiler-unshaded</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
libraries/tools/kotlin-script-util/build.gradle.kts
+2 -2
View File
@@ -13,7 +13,7 @@ dependencies {
compile(commonDep("org.jetbrains.intellij.deps", "trove4j"))
compileOnly(project(":compiler:cli"))
compileOnly(project(":daemon-common"))
compileOnly(project(":kotlin-scripting-compiler"))
compileOnly(project(":kotlin-scripting-compiler-unshaded"))
compile(projectRuntimeJar(":kotlin-daemon-client"))
compileOnly("org.jetbrains.kotlin:jcabi-aether:1.0-dev-3")
compileOnly("org.sonatype.aether:aether-api:1.13.1")
@@ -22,7 +22,7 @@ dependencies {
testCompile(project(":kotlin-test:kotlin-test-junit"))
testRuntime(project(":kotlin-reflect"))
testCompile(commonDep("junit:junit"))
testCompile(project(":kotlin-scripting-compiler"))
testCompile(project(":kotlin-scripting-compiler-unshaded"))
testRuntimeOnly(project(":kotlin-compiler"))
testRuntime("org.jetbrains.kotlin:jcabi-aether:1.0-dev-3")
testRuntime("org.sonatype.aether:aether-api:1.13.1")