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

Revert renaming scripting plugin jar:

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
libraries/scripting/js-test/build.gradle.kts
+1 -1
View File
@@ -12,7 +12,7 @@ dependencies {
testCompile(project(":kotlin-scripting-js"))
testCompile(project(":compiler:plugin-api"))
testCompile(project(":kotlin-scripting-compiler-unshaded"))
testCompile(project(":kotlin-scripting-compiler"))
testCompile(project(":compiler:cli"))
testCompile(project(":compiler:backend.js"))
testCompile(project(":js:js.engines"))
libraries/scripting/jsr223-embeddable/build.gradle.kts
+1 -1
View File
@@ -16,7 +16,7 @@ dependencies {
runtime(project(":kotlin-scripting-jvm"))
runtime(project(":kotlin-scripting-jvm-host"))
runtime(project(":kotlin-compiler-embeddable"))
runtime(project(":kotlin-scripting-compiler"))
runtime(project(":kotlin-scripting-compiler-embeddable"))
}
sourceSets {
libraries/scripting/jsr223/build.gradle.kts
+1 -1
View File
@@ -13,7 +13,7 @@ dependencies {
compile(project(":kotlin-scripting-common"))
compile(project(":kotlin-scripting-jvm"))
compile(project(":kotlin-scripting-jvm-host-unshaded"))
compile(project(":kotlin-scripting-compiler-unshaded"))
compile(project(":kotlin-scripting-compiler"))
compileOnly(project(":compiler:cli-common"))
compileOnly(project(":kotlin-reflect-api"))
compileOnly(intellijCoreDep())
libraries/scripting/jvm-host-embeddable/build.gradle.kts
+1 -1
View File
@@ -11,7 +11,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 {
libraries/scripting/jvm-host-test/build.gradle.kts
+1 -1
View File
@@ -21,7 +21,7 @@ dependencies {
allTestsRuntime(intellijDep()) { includeJars("idea", "idea_rt", "log4j", "jna") }
testCompile(project(":kotlin-scripting-jvm-host-unshaded"))
testCompile(projectTests(":compiler:tests-common"))
testCompile(project(":kotlin-scripting-compiler-unshaded"))
testCompile(project(":kotlin-scripting-compiler"))
testCompile(project(":daemon-common")) // TODO: fix import (workaround for jps build)
testRuntimeOnly(project(":kotlin-compiler"))
libraries/scripting/jvm-host/build.gradle.kts
+2 -2
View File
@@ -13,12 +13,12 @@ dependencies {
compile(kotlinStdlib())
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"))
}
libraries/scripting/jvm/src/kotlin/script/experimental/jvm/util/jvmClasspathUtil.kt
+4 -4
View File
@@ -26,10 +26,10 @@ internal const val KOTLIN_JAVA_STDLIB_JAR = "kotlin-stdlib.jar"
internal const val KOTLIN_JAVA_REFLECT_JAR = "kotlin-reflect.jar"
internal const val KOTLIN_JAVA_SCRIPT_RUNTIME_JAR = "kotlin-script-runtime.jar"
internal const val TROVE4J_JAR = "trove4j.jar"
internal const val KOTLIN_SCRIPTING_COMPILER_JAR = "kotlin-scripting-compiler-unshaded.jar"
internal const val KOTLIN_SCRIPTING_COMPILER_EMBEDDABLE_JAR = "kotlin-scripting-compiler.jar"
internal const val KOTLIN_SCRIPTING_COMPILER_IMPL_JAR = "kotlin-scripting-compiler-impl-unshaded.jar"
internal const val KOTLIN_SCRIPTING_COMPILER_IMPL_EMBEDDABLE_JAR = "kotlin-scripting-compiler-impl.jar"
internal const val KOTLIN_SCRIPTING_COMPILER_JAR = "kotlin-scripting-compiler.jar"
internal const val KOTLIN_SCRIPTING_COMPILER_EMBEDDABLE_JAR = "kotlin-scripting-compiler-embeddable.jar"
internal const val KOTLIN_SCRIPTING_COMPILER_IMPL_JAR = "kotlin-scripting-compiler-impl.jar"
internal const val KOTLIN_SCRIPTING_COMPILER_IMPL_EMBEDDABLE_JAR = "kotlin-scripting-compiler-impl-embeddable.jar"
internal const val KOTLIN_SCRIPTING_COMMON_JAR = "kotlin-scripting-common.jar"
internal const val KOTLIN_SCRIPTING_JVM_JAR = "kotlin-scripting-jvm.jar"