From dec8eb789974d30e32a4e5bfa294e2c5971b38e9 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Wed, 27 May 2020 13:15:50 +0200 Subject: [PATCH] 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" --- build.gradle.kts | 8 ++++---- compiler/build.gradle.kts | 2 +- compiler/tests-common/build.gradle.kts | 4 ++-- compiler/tests-java8/build.gradle.kts | 2 +- .../util/src/org/jetbrains/kotlin/utils/PathUtil.kt | 4 ++-- idea/build.gradle.kts | 2 +- idea/idea-core/build.gradle.kts | 2 +- idea/idea-fir/build.gradle.kts | 2 +- idea/scripting-support/build.gradle.kts | 4 ++-- .../build.gradle.kts | 2 +- .../kotlin-jsr223-local-example/build.gradle.kts | 4 ++-- .../scripting/jvm-embeddable-host/build.gradle.kts | 2 +- .../scripting/jvm-maven-deps/host/build.gradle.kts | 2 +- .../jvm-simple-script/host/build.gradle.kts | 2 +- libraries/scripting/js-test/build.gradle.kts | 2 +- .../scripting/jsr223-embeddable/build.gradle.kts | 2 +- libraries/scripting/jsr223/build.gradle.kts | 2 +- .../scripting/jvm-host-embeddable/build.gradle.kts | 2 +- libraries/scripting/jvm-host-test/build.gradle.kts | 2 +- libraries/scripting/jvm-host/build.gradle.kts | 4 ++-- .../script/experimental/jvm/util/jvmClasspathUtil.kt | 8 ++++---- .../build.gradle.kts | 4 ++-- .../tools/kotlin-gradle-plugin/build.gradle.kts | 6 +++--- .../scripting/internal/ScriptingGradleSubplugin.kt | 2 +- .../tools/kotlin-main-kts-test/build.gradle.kts | 2 +- libraries/tools/kotlin-main-kts/build.gradle.kts | 2 +- libraries/tools/kotlin-maven-plugin/pom.xml | 2 +- libraries/tools/kotlin-script-util/build.gradle.kts | 4 ++-- .../pill-importer/src/JpsCompatiblePluginTasks.kt | 4 ++-- plugins/pill/pill-importer/src/parser.kt | 2 +- .../scripting-compiler-embeddable/build.gradle.kts | 4 ++-- .../build.gradle.kts | 2 +- .../scripting/scripting-compiler/build.gradle.kts | 2 +- .../build.gradle.kts | 2 +- .../scripting-ide-services-test/build.gradle.kts | 2 +- .../scripting-ide-services/build.gradle.kts | 4 ++-- .../plugin/ScriptingGradleProjectImportHandler.kt | 2 +- prepare/compiler-client-embeddable/build.gradle.kts | 2 +- prepare/compiler/build.gradle.kts | 4 ++-- prepare/idea-plugin/build.gradle.kts | 2 +- settings.gradle | 12 ++++++------ 41 files changed, 65 insertions(+), 65 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 5e3162c0345..05a8f0ee80d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -482,7 +482,7 @@ allprojects { } configurations.findByName("kotlinCompilerPluginClasspath") - ?.exclude("org.jetbrains.kotlin", "kotlin-scripting-compiler") + ?.exclude("org.jetbrains.kotlin", "kotlin-scripting-compiler-embeddable") } apply(from = "$rootDir/gradle/cacheRedirector.gradle.kts") @@ -620,7 +620,7 @@ tasks { register("scriptingTest") { dependsOn("dist") dependsOn(":kotlin-script-util:test") - dependsOn(":kotlin-scripting-compiler:test") + dependsOn(":kotlin-scripting-compiler-embeddable:test") dependsOn(":kotlin-scripting-common:test") dependsOn(":kotlin-scripting-jvm:test") dependsOn(":kotlin-scripting-jvm-host-test:test") @@ -793,8 +793,8 @@ tasks { ":kotlin-script-util:publish", ":kotlin-scripting-common:publish", ":kotlin-scripting-jvm:publish", - ":kotlin-scripting-compiler:publish", - ":kotlin-scripting-compiler-impl:publish", + ":kotlin-scripting-compiler-embeddable:publish", + ":kotlin-scripting-compiler-impl-embeddable:publish", ":kotlin-android-extensions-runtime:publish", ":kotlin-stdlib:publish", ":kotlin-stdlib-jdk7:publish", diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts index 8c9c9355cbb..ba115e786e8 100644 --- a/compiler/build.gradle.kts +++ b/compiler/build.gradle.kts @@ -50,7 +50,7 @@ dependencies { testCompile(projectTests(":generators:test-generator")) testCompile(project(":compiler:ir.ir2cfg")) testCompile(project(":compiler:ir.tree")) // used for deepCopyWithSymbols call that is removed by proguard from the compiler TODO: make it more straightforward - testCompile(project(":kotlin-scripting-compiler-unshaded")) + testCompile(project(":kotlin-scripting-compiler")) testCompile(project(":kotlin-script-util")) testCompileOnly(project(":kotlin-reflect-api")) otherCompilerModules.forEach { diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts index 31dd83f0d83..36dd23be2c5 100644 --- a/compiler/tests-common/build.gradle.kts +++ b/compiler/tests-common/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } dependencies { - testCompile(project(":kotlin-scripting-compiler-unshaded")) + testCompile(project(":kotlin-scripting-compiler")) testCompile(project(":core:descriptors")) testCompile(project(":core:descriptors.jvm")) testCompile(project(":core:deserialization")) @@ -42,7 +42,7 @@ dependencies { testCompileOnly(project(":plugins:android-extensions-compiler")) testCompile(project(":kotlin-test:kotlin-test-jvm")) testCompile(projectTests(":compiler:tests-common-jvm6")) - testCompile(project(":kotlin-scripting-compiler-impl-unshaded")) + testCompile(project(":kotlin-scripting-compiler-impl")) testCompile(commonDep("junit:junit")) testCompile(androidDxJar()) { isTransitive = false } testCompile(commonDep("com.android.tools:r8")) diff --git a/compiler/tests-java8/build.gradle.kts b/compiler/tests-java8/build.gradle.kts index 9423e70bf3f..9af9d409746 100644 --- a/compiler/tests-java8/build.gradle.kts +++ b/compiler/tests-java8/build.gradle.kts @@ -6,7 +6,7 @@ plugins { } dependencies { - testCompile(project(":kotlin-scripting-compiler-unshaded")) + testCompile(project(":kotlin-scripting-compiler")) testCompile(projectTests(":compiler:tests-common")) testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } testCompile(projectTests(":generators:test-generator")) diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.kt b/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.kt index e229885a816..4bdae5d0340 100644 --- a/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.kt +++ b/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.kt @@ -70,11 +70,11 @@ object PathUtil { const val KOTLIN_SCRIPTING_JS_JAR = "$KOTLIN_SCRIPTING_JS_NAME.jar" const val KOTLIN_DAEMON_NAME = "kotlin-daemon" const val KOTLIN_DAEMON_JAR = "$KOTLIN_SCRIPTING_JVM_NAME.jar" - const val KOTLIN_SCRIPTING_COMPILER_PLUGIN_NAME = "kotlin-scripting-compiler-unshaded" + const val KOTLIN_SCRIPTING_COMPILER_PLUGIN_NAME = "kotlin-scripting-compiler" const val KOTLIN_SCRIPTING_COMPILER_PLUGIN_JAR = "$KOTLIN_SCRIPTING_COMPILER_PLUGIN_NAME.jar" const val KOTLINX_COROUTINES_CORE_NAME = "kotlinx-coroutines-core" const val KOTLINX_COROUTINES_CORE_JAR = "$KOTLINX_COROUTINES_CORE_NAME.jar" - const val KOTLIN_SCRIPTING_COMPILER_IMPL_NAME = "kotlin-scripting-compiler-impl-unshaded" + const val KOTLIN_SCRIPTING_COMPILER_IMPL_NAME = "kotlin-scripting-compiler-impl" const val KOTLIN_SCRIPTING_COMPILER_IMPL_JAR = "$KOTLIN_SCRIPTING_COMPILER_IMPL_NAME.jar" const val JS_ENGINES_NAME = "js.engines" const val JS_ENGINES_JAR = "$JS_ENGINES_NAME.jar" diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts index bebb7a0fd52..72c32049adf 100644 --- a/idea/build.gradle.kts +++ b/idea/build.gradle.kts @@ -136,7 +136,7 @@ dependencies { testRuntime(project(":kotlin-noarg-compiler-plugin")) testRuntime(project(":plugins:annotation-based-compiler-plugins-ide-support")) { isTransitive = false } testRuntime(project(":kotlin-scripting-idea")) { isTransitive = false } - testRuntime(project(":kotlin-scripting-compiler-impl-unshaded")) + testRuntime(project(":kotlin-scripting-compiler-impl")) testRuntime(project(":sam-with-receiver-ide-plugin")) { isTransitive = false } testRuntime(project(":kotlinx-serialization-compiler-plugin")) testRuntime(project(":kotlinx-serialization-ide-plugin")) { isTransitive = false } diff --git a/idea/idea-core/build.gradle.kts b/idea/idea-core/build.gradle.kts index 4e2850ab572..4ce1268fdb8 100644 --- a/idea/idea-core/build.gradle.kts +++ b/idea/idea-core/build.gradle.kts @@ -18,7 +18,7 @@ dependencies { compile(project(":idea:idea-jps-common")) compile(project(":kotlin-util-klib-metadata")) compile(project(":plugins:android-extensions-compiler")) - compile(project(":kotlin-scripting-compiler-impl-unshaded")) + compile(project(":kotlin-scripting-compiler-impl")) compile(project(":compiler:fir:raw-fir:psi2fir")) compile(project(":compiler:fir:fir2ir")) compile(project(":compiler:fir:resolve")) diff --git a/idea/idea-fir/build.gradle.kts b/idea/idea-fir/build.gradle.kts index 6ad7fc90494..9bb8fc4d97f 100644 --- a/idea/idea-fir/build.gradle.kts +++ b/idea/idea-fir/build.gradle.kts @@ -42,7 +42,7 @@ dependencies { testRuntime(project(":kotlin-noarg-compiler-plugin")) testRuntime(project(":plugins:annotation-based-compiler-plugins-ide-support")) { isTransitive = false } testRuntime(project(":kotlin-scripting-idea")) { isTransitive = false } - testRuntime(project(":kotlin-scripting-compiler-impl-unshaded")) + testRuntime(project(":kotlin-scripting-compiler-impl")) testRuntime(project(":sam-with-receiver-ide-plugin")) { isTransitive = false } testRuntime(project(":kotlinx-serialization-compiler-plugin")) testRuntime(project(":kotlinx-serialization-ide-plugin")) { isTransitive = false } diff --git a/idea/scripting-support/build.gradle.kts b/idea/scripting-support/build.gradle.kts index 6b232b33069..8ea0e1daebb 100644 --- a/idea/scripting-support/build.gradle.kts +++ b/idea/scripting-support/build.gradle.kts @@ -21,8 +21,8 @@ dependencies { testRuntime(project(":kotlin-noarg-compiler-plugin")) testRuntime(project(":plugins:annotation-based-compiler-plugins-ide-support")) { isTransitive = false } testRuntime(project(":kotlin-scripting-idea")) { isTransitive = false } - testRuntime(project(":kotlin-scripting-compiler-unshaded")) - testRuntime(project(":kotlin-scripting-compiler-impl-unshaded")) + testRuntime(project(":kotlin-scripting-compiler")) + testRuntime(project(":kotlin-scripting-compiler-impl")) testRuntime(project(":sam-with-receiver-ide-plugin")) { isTransitive = false } testRuntime(project(":kotlinx-serialization-compiler-plugin")) testRuntime(project(":kotlinx-serialization-ide-plugin")) { isTransitive = false } diff --git a/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts b/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts index 2b99409465e..5b5926a1a25 100644 --- a/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts +++ b/libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts @@ -24,7 +24,7 @@ dependencies { testCompile(project(":kotlin-test:kotlin-test-junit")) testRuntime(project(":kotlin-reflect")) compilerClasspath(project(":kotlin-compiler-embeddable")) - compilerClasspath(project(":kotlin-scripting-compiler")) + compilerClasspath(project(":kotlin-scripting-compiler-embeddable")) compilerClasspath(project(":kotlin-reflect")) compilerClasspath(kotlinStdlib()) compilerClasspath(project(":kotlin-script-runtime")) diff --git a/libraries/examples/kotlin-jsr223-local-example/build.gradle.kts b/libraries/examples/kotlin-jsr223-local-example/build.gradle.kts index 6fcad8b7192..3e49cfde6fe 100644 --- a/libraries/examples/kotlin-jsr223-local-example/build.gradle.kts +++ b/libraries/examples/kotlin-jsr223-local-example/build.gradle.kts @@ -16,14 +16,14 @@ dependencies { compile(project(":kotlin-script-runtime")) compile(project(":kotlin-compiler-embeddable")) compile(project(":kotlin-script-util")) - runtime(project(":kotlin-scripting-compiler")) + runtime(project(":kotlin-scripting-compiler-embeddable")) testCompile(project(":kotlin-test:kotlin-test-junit")) testCompile(commonDep("junit:junit")) testRuntime(project(":kotlin-reflect")) compileOnly(project(":compiler:cli-common")) // TODO: fix import (workaround for jps build) testCompileOnly(project(":core:util.runtime")) // TODO: fix import (workaround for jps build) testCompileOnly(project(":daemon-common")) // TODO: fix import (workaround for jps build) - testRuntime(project(":kotlin-scripting-compiler")) + testRuntime(project(":kotlin-scripting-compiler-embeddable")) } projectTest() diff --git a/libraries/examples/scripting/jvm-embeddable-host/build.gradle.kts b/libraries/examples/scripting/jvm-embeddable-host/build.gradle.kts index 280e2f8d3c8..26ff8ee3446 100644 --- a/libraries/examples/scripting/jvm-embeddable-host/build.gradle.kts +++ b/libraries/examples/scripting/jvm-embeddable-host/build.gradle.kts @@ -7,7 +7,7 @@ dependencies { compile(project(":examples:scripting-jvm-simple-script")) compileOnly(project(":kotlin-scripting-jvm-host-unshaded")) testRuntimeOnly(project(":kotlin-compiler-embeddable")) - testRuntimeOnly(project(":kotlin-scripting-compiler")) + testRuntimeOnly(project(":kotlin-scripting-compiler-embeddable")) testRuntimeOnly(project(":kotlin-scripting-jvm-host")) testRuntimeOnly(project(":kotlin-reflect")) testRuntimeOnly(intellijDep()) { includeJars("guava", rootProject = rootProject) } diff --git a/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts b/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts index b60c74f6129..003d329e8ed 100644 --- a/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts +++ b/libraries/examples/scripting/jvm-maven-deps/host/build.gradle.kts @@ -12,7 +12,7 @@ dependencies { testRuntimeOnly(project(":kotlin-compiler")) testRuntimeOnly(project(":kotlin-reflect")) - testRuntimeOnly(project(":kotlin-scripting-compiler-unshaded")) + testRuntimeOnly(project(":kotlin-scripting-compiler")) testCompile(commonDep("junit")) } diff --git a/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts b/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts index ea717428af1..6e59c5e0f38 100644 --- a/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts +++ b/libraries/examples/scripting/jvm-simple-script/host/build.gradle.kts @@ -8,7 +8,7 @@ dependencies { compile(project(":kotlin-scripting-jvm-host-unshaded")) compile(project(":kotlin-script-util")) testRuntimeOnly(project(":kotlin-compiler")) - testRuntimeOnly(project(":kotlin-scripting-compiler-unshaded")) + testRuntimeOnly(project(":kotlin-scripting-compiler")) testRuntimeOnly(project(":kotlin-reflect")) testCompile(commonDep("junit")) } diff --git a/libraries/scripting/js-test/build.gradle.kts b/libraries/scripting/js-test/build.gradle.kts index 720cfd6f7ef..9788cccf700 100644 --- a/libraries/scripting/js-test/build.gradle.kts +++ b/libraries/scripting/js-test/build.gradle.kts @@ -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")) diff --git a/libraries/scripting/jsr223-embeddable/build.gradle.kts b/libraries/scripting/jsr223-embeddable/build.gradle.kts index 3827a3433c3..c3b4f1ce08d 100644 --- a/libraries/scripting/jsr223-embeddable/build.gradle.kts +++ b/libraries/scripting/jsr223-embeddable/build.gradle.kts @@ -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 { diff --git a/libraries/scripting/jsr223/build.gradle.kts b/libraries/scripting/jsr223/build.gradle.kts index dc5bf2175e9..118dbeec865 100644 --- a/libraries/scripting/jsr223/build.gradle.kts +++ b/libraries/scripting/jsr223/build.gradle.kts @@ -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()) diff --git a/libraries/scripting/jvm-host-embeddable/build.gradle.kts b/libraries/scripting/jvm-host-embeddable/build.gradle.kts index f9d32a92b77..dbf920a4cbf 100644 --- a/libraries/scripting/jvm-host-embeddable/build.gradle.kts +++ b/libraries/scripting/jvm-host-embeddable/build.gradle.kts @@ -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 { diff --git a/libraries/scripting/jvm-host-test/build.gradle.kts b/libraries/scripting/jvm-host-test/build.gradle.kts index 201e95fb669..ebcd7acd31c 100644 --- a/libraries/scripting/jvm-host-test/build.gradle.kts +++ b/libraries/scripting/jvm-host-test/build.gradle.kts @@ -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")) diff --git a/libraries/scripting/jvm-host/build.gradle.kts b/libraries/scripting/jvm-host/build.gradle.kts index 15965b590a1..1003ac5aa60 100644 --- a/libraries/scripting/jvm-host/build.gradle.kts +++ b/libraries/scripting/jvm-host/build.gradle.kts @@ -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")) } diff --git a/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/util/jvmClasspathUtil.kt b/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/util/jvmClasspathUtil.kt index 17b81a13b9e..25c49129c84 100644 --- a/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/util/jvmClasspathUtil.kt +++ b/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/util/jvmClasspathUtil.kt @@ -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" diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts index 2d69a429dda..f7030e6d4c2 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts @@ -126,8 +126,8 @@ tasks.withType { ":kotlin-script-runtime:install", ":kotlin-scripting-common:install", ":kotlin-scripting-jvm:install", - ":kotlin-scripting-compiler:install", - ":kotlin-scripting-compiler-impl:install", + ":kotlin-scripting-compiler-embeddable:install", + ":kotlin-scripting-compiler-impl-embeddable:install", ":kotlin-test-js-runner:install", ":kotlin-source-map-loader:install" ) diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts index 5568ea3e58d..fa3307ebb40 100644 --- a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts @@ -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-unshaded")) + compileOnly(project(":kotlin-scripting-compiler")) 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")) - runtime(projectRuntimeJar(":kotlin-scripting-compiler-impl")) + runtime(projectRuntimeJar(":kotlin-scripting-compiler-embeddable")) + runtime(projectRuntimeJar(":kotlin-scripting-compiler-impl-embeddable")) runtime(project(":kotlin-reflect")) jarContents(compileOnly(intellijDep()) { diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/scripting/internal/ScriptingGradleSubplugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/scripting/internal/ScriptingGradleSubplugin.kt index 560132f0922..86a33c88eb0 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/scripting/internal/ScriptingGradleSubplugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/scripting/internal/ScriptingGradleSubplugin.kt @@ -220,7 +220,7 @@ fun Configuration.discoverScriptExtensionsFiles() = class ScriptingKotlinGradleSubplugin : KotlinGradleSubplugin { companion object { - const val SCRIPTING_ARTIFACT_NAME = "kotlin-scripting-compiler" + const val SCRIPTING_ARTIFACT_NAME = "kotlin-scripting-compiler-embeddable" val SCRIPT_DEFINITIONS_OPTION = "script-definitions" val SCRIPT_DEFINITIONS_CLASSPATH_OPTION = "script-definitions-classpath" diff --git a/libraries/tools/kotlin-main-kts-test/build.gradle.kts b/libraries/tools/kotlin-main-kts-test/build.gradle.kts index 6c5763841a3..a1223fdf060 100644 --- a/libraries/tools/kotlin-main-kts-test/build.gradle.kts +++ b/libraries/tools/kotlin-main-kts-test/build.gradle.kts @@ -10,7 +10,7 @@ dependencies { testCompileOnly(project(":compiler:cli")) testCompileOnly(project(":kotlin-scripting-jvm-host-unshaded")) testCompile(commonDep("junit")) - testCompile(projectTests(":kotlin-scripting-compiler-unshaded")) { isTransitive = false } + testCompile(projectTests(":kotlin-scripting-compiler")) { isTransitive = false } } sourceSets { diff --git a/libraries/tools/kotlin-main-kts/build.gradle.kts b/libraries/tools/kotlin-main-kts/build.gradle.kts index 367de0214b1..5973b91d3b1 100644 --- a/libraries/tools/kotlin-main-kts/build.gradle.kts +++ b/libraries/tools/kotlin-main-kts/build.gradle.kts @@ -30,7 +30,7 @@ dependencies { compileOnly(project(":kotlin-scripting-jvm-host-unshaded")) compileOnly(project(":kotlin-scripting-dependencies")) runtime(project(":kotlin-compiler-embeddable")) - runtime(project(":kotlin-scripting-compiler")) + runtime(project(":kotlin-scripting-compiler-embeddable")) runtime(project(":kotlin-scripting-jvm-host")) runtime(project(":kotlin-reflect")) embedded(project(":kotlin-scripting-common")) { isTransitive = false } diff --git a/libraries/tools/kotlin-maven-plugin/pom.xml b/libraries/tools/kotlin-maven-plugin/pom.xml index 9d594909c0b..299ecf4d3a7 100644 --- a/libraries/tools/kotlin-maven-plugin/pom.xml +++ b/libraries/tools/kotlin-maven-plugin/pom.xml @@ -42,7 +42,7 @@ org.jetbrains.kotlin - kotlin-scripting-compiler-unshaded + kotlin-scripting-compiler ${project.version} diff --git a/libraries/tools/kotlin-script-util/build.gradle.kts b/libraries/tools/kotlin-script-util/build.gradle.kts index 131ad92465b..a0b9c52858a 100644 --- a/libraries/tools/kotlin-script-util/build.gradle.kts +++ b/libraries/tools/kotlin-script-util/build.gradle.kts @@ -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-unshaded")) + compileOnly(project(":kotlin-scripting-compiler")) 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-unshaded")) + testCompile(project(":kotlin-scripting-compiler")) testRuntimeOnly(project(":kotlin-compiler")) testRuntime("org.jetbrains.kotlin:jcabi-aether:1.0-dev-3") testRuntime("org.sonatype.aether:aether-api:1.13.1") diff --git a/plugins/pill/pill-importer/src/JpsCompatiblePluginTasks.kt b/plugins/pill/pill-importer/src/JpsCompatiblePluginTasks.kt index 049c13d4a7b..db4a1963905 100644 --- a/plugins/pill/pill-importer/src/JpsCompatiblePluginTasks.kt +++ b/plugins/pill/pill-importer/src/JpsCompatiblePluginTasks.kt @@ -43,8 +43,8 @@ class JpsCompatiblePluginTasks(private val rootProject: Project, private val pla ":kotlin-daemon-embeddable", ":kotlin-compiler-embeddable", ":kotlin-android-extensions", - ":kotlin-scripting-compiler", - ":kotlin-scripting-compiler-impl", + ":kotlin-scripting-compiler-embeddable", + ":kotlin-scripting-compiler-impl-embeddable", ":kotlin-scripting-jvm-host" ) diff --git a/plugins/pill/pill-importer/src/parser.kt b/plugins/pill/pill-importer/src/parser.kt index 1eb83cb30f8..e2802b1d0d0 100644 --- a/plugins/pill/pill-importer/src/parser.kt +++ b/plugins/pill/pill-importer/src/parser.kt @@ -354,7 +354,7 @@ private fun getKotlinOptions(kotlinCompileTask: Any): PSourceRootKotlinOptions? fun parseString(name: String) = compileArguments.dropWhile { it != "-$name" }.drop(1).firstOrNull() fun isOptionForScriptingCompilerPlugin(option: String): Boolean { - return option.startsWith("-Xplugin=") && option.contains("kotlin-scripting-compiler") + return option.startsWith("-Xplugin=") && option.contains("kotlin-scripting-compiler-embeddable") } val extraArguments = compileArguments.filter { diff --git a/plugins/scripting/scripting-compiler-embeddable/build.gradle.kts b/plugins/scripting/scripting-compiler-embeddable/build.gradle.kts index 82319768543..7a439389614 100644 --- a/plugins/scripting/scripting-compiler-embeddable/build.gradle.kts +++ b/plugins/scripting/scripting-compiler-embeddable/build.gradle.kts @@ -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()) } diff --git a/plugins/scripting/scripting-compiler-impl-embeddable/build.gradle.kts b/plugins/scripting/scripting-compiler-impl-embeddable/build.gradle.kts index f0f68f13869..4a564c34027 100644 --- a/plugins/scripting/scripting-compiler-impl-embeddable/build.gradle.kts +++ b/plugins/scripting/scripting-compiler-impl-embeddable/build.gradle.kts @@ -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()) diff --git a/plugins/scripting/scripting-compiler/build.gradle.kts b/plugins/scripting/scripting-compiler/build.gradle.kts index 327059e74dd..34fbab96f6d 100644 --- a/plugins/scripting/scripting-compiler/build.gradle.kts +++ b/plugins/scripting/scripting-compiler/build.gradle.kts @@ -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") } diff --git a/plugins/scripting/scripting-ide-services-embeddable/build.gradle.kts b/plugins/scripting/scripting-ide-services-embeddable/build.gradle.kts index c3ef452fb93..9bd7ac9dd00 100644 --- a/plugins/scripting/scripting-ide-services-embeddable/build.gradle.kts +++ b/plugins/scripting/scripting-ide-services-embeddable/build.gradle.kts @@ -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 { diff --git a/plugins/scripting/scripting-ide-services-test/build.gradle.kts b/plugins/scripting/scripting-ide-services-test/build.gradle.kts index 9b6a32f5410..5d846be2cec 100644 --- a/plugins/scripting/scripting-ide-services-test/build.gradle.kts +++ b/plugins/scripting/scripting-ide-services-test/build.gradle.kts @@ -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")) diff --git a/plugins/scripting/scripting-ide-services/build.gradle.kts b/plugins/scripting/scripting-ide-services/build.gradle.kts index 1f6d11de767..312519a5a6a 100644 --- a/plugins/scripting/scripting-ide-services/build.gradle.kts +++ b/plugins/scripting/scripting-ide-services/build.gradle.kts @@ -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")) } diff --git a/plugins/scripting/scripting-idea/src/org/jetbrains/kotlin/scripting/idea/plugin/ScriptingGradleProjectImportHandler.kt b/plugins/scripting/scripting-idea/src/org/jetbrains/kotlin/scripting/idea/plugin/ScriptingGradleProjectImportHandler.kt index a702b18d9e0..a091a3276e1 100644 --- a/plugins/scripting/scripting-idea/src/org/jetbrains/kotlin/scripting/idea/plugin/ScriptingGradleProjectImportHandler.kt +++ b/plugins/scripting/scripting-idea/src/org/jetbrains/kotlin/scripting/idea/plugin/ScriptingGradleProjectImportHandler.kt @@ -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( diff --git a/prepare/compiler-client-embeddable/build.gradle.kts b/prepare/compiler-client-embeddable/build.gradle.kts index 3c87f65cac8..f0ec0b7c825 100644 --- a/prepare/compiler-client-embeddable/build.gradle.kts +++ b/prepare/compiler-client-embeddable/build.gradle.kts @@ -22,7 +22,7 @@ dependencies { testCompile(project(":kotlin-test:kotlin-test-jvm")) testCompile(project(":kotlin-test:kotlin-test-junit")) testCompilerClasspath(project(":kotlin-compiler")) - testCompilerClasspath(project(":kotlin-scripting-compiler-unshaded")) + testCompilerClasspath(project(":kotlin-scripting-compiler")) testCompilerClasspath(project(":kotlin-daemon")) testCompilationClasspath(kotlinStdlib()) testCompilationClasspath(project(":kotlin-script-runtime")) diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts index 1a42ae9ec3b..15b2a506fd3 100644 --- a/prepare/compiler/build.gradle.kts +++ b/prepare/compiler/build.gradle.kts @@ -93,8 +93,8 @@ val distLibraryProjects = listOfNotNull( ":kotlin-runner", ":kotlin-script-runtime", ":kotlin-scripting-common", - ":kotlin-scripting-compiler-unshaded", - ":kotlin-scripting-compiler-impl-unshaded", + ":kotlin-scripting-compiler", + ":kotlin-scripting-compiler-impl", ":kotlin-scripting-jvm", ":kotlin-scripting-js", ":js:js.engines", diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts index 3cabe8f5f5c..0b7e2df0b1c 100644 --- a/prepare/idea-plugin/build.gradle.kts +++ b/prepare/idea-plugin/build.gradle.kts @@ -115,7 +115,7 @@ val libraryProjects = listOf( ":kotlin-script-runtime", ":kotlin-script-util", ":kotlin-scripting-common", - ":kotlin-scripting-compiler-impl-unshaded", + ":kotlin-scripting-compiler-impl", ":kotlin-scripting-intellij", ":kotlin-scripting-jvm", ":kotlin-util-io", diff --git a/settings.gradle b/settings.gradle index a4d81d91c93..03918b1f15b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -266,10 +266,10 @@ include ":kotlin-build-common", ":kotlin-scripting-jvm-host-test", ":kotlin-scripting-jvm-host", ":kotlin-scripting-intellij", - ":kotlin-scripting-compiler-unshaded", ":kotlin-scripting-compiler", - ":kotlin-scripting-compiler-impl-unshaded", + ":kotlin-scripting-compiler-embeddable", ":kotlin-scripting-compiler-impl", + ":kotlin-scripting-compiler-impl-embeddable", ":kotlin-scripting-ide-services-unshaded", ":kotlin-scripting-ide-services-test", ":kotlin-scripting-ide-services", @@ -502,10 +502,10 @@ project(':kotlin-scripting-jsr223-unshaded').projectDir = "$rootDir/libraries/sc project(':kotlin-scripting-jsr223-test').projectDir = "$rootDir/libraries/scripting/jsr223-test" as File project(':kotlin-scripting-jsr223').projectDir = "$rootDir/libraries/scripting/jsr223-embeddable" as File project(':kotlin-scripting-intellij').projectDir = "$rootDir/libraries/scripting/intellij" as File -project(':kotlin-scripting-compiler-unshaded').projectDir = "$rootDir/plugins/scripting/scripting-compiler" as File -project(':kotlin-scripting-compiler').projectDir = "$rootDir/plugins/scripting/scripting-compiler-embeddable" as File -project(':kotlin-scripting-compiler-impl-unshaded').projectDir = "$rootDir/plugins/scripting/scripting-compiler-impl" as File -project(':kotlin-scripting-compiler-impl').projectDir = "$rootDir/plugins/scripting/scripting-compiler-impl-embeddable" as File +project(':kotlin-scripting-compiler').projectDir = "$rootDir/plugins/scripting/scripting-compiler" as File +project(':kotlin-scripting-compiler-embeddable').projectDir = "$rootDir/plugins/scripting/scripting-compiler-embeddable" as File +project(':kotlin-scripting-compiler-impl').projectDir = "$rootDir/plugins/scripting/scripting-compiler-impl" as File +project(':kotlin-scripting-compiler-impl-embeddable').projectDir = "$rootDir/plugins/scripting/scripting-compiler-impl-embeddable" as File project(':kotlin-scripting-ide-services-unshaded').projectDir = "$rootDir/plugins/scripting/scripting-ide-services" as File project(':kotlin-scripting-ide-services-test').projectDir = "$rootDir/plugins/scripting/scripting-ide-services-test" as File project(':kotlin-scripting-ide-services').projectDir = "$rootDir/plugins/scripting/scripting-ide-services-embeddable" as File