From 6255efa7f77059d8c5471e6fb025b250ea900287 Mon Sep 17 00:00:00 2001 From: Andrei Klunnyi Date: Fri, 28 Apr 2023 14:20:22 +0200 Subject: [PATCH] [KT-58817] Publish K2 script compiler artifact With this commit kotlin script compiler (as a plugin) becomes available for IDE. --- build.gradle.kts | 1 + prepare/compiler/build.gradle.kts | 3 ++- .../scripting-compiler-plugin-for-ide/build.gradle.kts | 9 +++++++++ settings.gradle | 3 +++ 4 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 prepare/ide-plugin-dependencies/scripting-compiler-plugin-for-ide/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts index c3dd164d108..aa3a40e0ba9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -275,6 +275,7 @@ extra["kotlinJpsPluginMavenDependenciesNonTransitiveLibs"] = listOf( extra["compilerArtifactsForIde"] = listOfNotNull( ":prepare:ide-plugin-dependencies:android-extensions-compiler-plugin-for-ide", ":prepare:ide-plugin-dependencies:allopen-compiler-plugin-for-ide", + ":prepare:ide-plugin-dependencies:scripting-compiler-plugin-for-ide", ":prepare:ide-plugin-dependencies:incremental-compilation-impl-tests-for-ide", ":prepare:ide-plugin-dependencies:js-ir-runtime-for-ide", ":prepare:ide-plugin-dependencies:kotlin-build-common-tests-for-ide", diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts index 60ed7ec3f10..6c0b05f374e 100644 --- a/prepare/compiler/build.gradle.kts +++ b/prepare/compiler/build.gradle.kts @@ -126,7 +126,8 @@ val distCompilerPluginProjects = listOf( ":kotlin-sam-with-receiver-compiler-plugin", ":kotlinx-serialization-compiler-plugin", ":kotlin-lombok-compiler-plugin", - ":kotlin-assignment-compiler-plugin" + ":kotlin-assignment-compiler-plugin", + ":kotlin-scripting-compiler" ) val distCompilerPluginProjectsCompat = listOf( ":kotlinx-serialization-compiler-plugin", diff --git a/prepare/ide-plugin-dependencies/scripting-compiler-plugin-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/scripting-compiler-plugin-for-ide/build.gradle.kts new file mode 100644 index 00000000000..8bc1ef26908 --- /dev/null +++ b/prepare/ide-plugin-dependencies/scripting-compiler-plugin-for-ide/build.gradle.kts @@ -0,0 +1,9 @@ +plugins { + kotlin("jvm") +} + +publishJarsForIde( + listOf( + ":kotlin-scripting-compiler" + ) +) \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 2493857e50b..f49e6e27a32 100644 --- a/settings.gradle +++ b/settings.gradle @@ -335,6 +335,7 @@ include ":kotlinx-serialization-compiler-plugin", if (!buildProperties.inJpsBuildIdeaSync) { include ":prepare:ide-plugin-dependencies:android-extensions-compiler-plugin-for-ide", ":prepare:ide-plugin-dependencies:allopen-compiler-plugin-for-ide", + ":prepare:ide-plugin-dependencies:scripting-compiler-plugin-for-ide", ":prepare:ide-plugin-dependencies:allopen-compiler-plugin-tests-for-ide", ":prepare:ide-plugin-dependencies:incremental-compilation-impl-tests-for-ide", ":prepare:ide-plugin-dependencies:js-ir-runtime-for-ide", @@ -803,6 +804,8 @@ project(':kotlin-scripting-ide-services-unshaded').projectDir = "$rootDir/plugin 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 project(':kotlin-scripting-ide-common').projectDir = "$rootDir/plugins/scripting/scripting-ide-common" as File +project(':kotlin-scripting-compiler').projectDir = "$rootDir/plugins/scripting/scripting-compiler" as File +project(':kotlin-scripting-compiler-impl').projectDir = "$rootDir/plugins/scripting/scripting-compiler-impl" as File // Uncomment to use locally built protobuf-relocated // includeBuild("dependencies/protobuf")