From e90cc30edbd13a343aaade357b6a626061b2afe6 Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Fri, 30 Apr 2021 19:20:42 +0900
Subject: [PATCH] Remove CLI and some of daemon-related modules from
 compiler-for-ide

These modules is not required by the plugin, and the plugin verifier
warns about unsatisfied dependencies of the modules.

CLI is needed in tests so a separate artifact is created instead.
---
 build.gradle.kts                                           | 1 +
 .../kotlin-compiler-cli-for-ide/build.gradle.kts           | 6 ++++++
 .../kotlin-compiler-for-ide/build.gradle.kts               | 7 +++----
 settings.gradle                                            | 1 +
 4 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 prepare/ide-plugin-dependencies/kotlin-compiler-cli-for-ide/build.gradle.kts

diff --git a/build.gradle.kts b/build.gradle.kts
index 3b582bf6af2..44296a157bf 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -963,6 +963,7 @@ tasks {
                 ":prepare:ide-plugin-dependencies:js-ir-runtime-for-ide",
                 ":prepare:ide-plugin-dependencies:kotlin-build-common-tests-for-ide",
                 ":prepare:ide-plugin-dependencies:kotlin-compiler-for-ide",
+                ":prepare:ide-plugin-dependencies:kotlin-compiler-cli-for-ide",
                 ":prepare:ide-plugin-dependencies:kotlin-gradle-statistics-for-ide",
                 ":prepare:ide-plugin-dependencies:kotlinx-serialization-compiler-plugin-for-ide",
                 ":prepare:ide-plugin-dependencies:noarg-compiler-plugin-for-ide",
diff --git a/prepare/ide-plugin-dependencies/kotlin-compiler-cli-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/kotlin-compiler-cli-for-ide/build.gradle.kts
new file mode 100644
index 00000000000..ef80875d92a
--- /dev/null
+++ b/prepare/ide-plugin-dependencies/kotlin-compiler-cli-for-ide/build.gradle.kts
@@ -0,0 +1,6 @@
+idePluginDependency {
+    publishProjectJars(listOf(
+        ":compiler:cli",
+        ":compiler:cli-js"
+    ))
+}
\ No newline at end of file
diff --git a/prepare/ide-plugin-dependencies/kotlin-compiler-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/kotlin-compiler-for-ide/build.gradle.kts
index 2ba95b55e40..ad54b0ad45f 100644
--- a/prepare/ide-plugin-dependencies/kotlin-compiler-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/kotlin-compiler-for-ide/build.gradle.kts
@@ -2,6 +2,8 @@ idePluginDependency {
     val compilerModules: Array<String> by rootProject.extra
 
     val excludedCompilerModules = listOf(
+        ":compiler:cli",
+        ":compiler:cli-js",
         ":compiler:javac-wrapper",
         ":compiler:backend.js",
         ":compiler:backend.wasm",
@@ -15,10 +17,7 @@ idePluginDependency {
         ":kotlin-compiler-runner",
         ":kotlin-preloader",
         ":daemon-common",
-        ":daemon-common-new",
-        ":kotlin-daemon",
-        ":kotlin-daemon-client",
-        ":kotlin-daemon-client-new"
+        ":kotlin-daemon-client"
     )
 
     publishProjectJars(
diff --git a/settings.gradle b/settings.gradle
index 8debc657b62..81dfbaa2ecc 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -362,6 +362,7 @@ include ":prepare:ide-plugin-dependencies:android-extensions-compiler-plugin-for
         ":prepare:ide-plugin-dependencies:js-ir-runtime-for-ide",
         ":prepare:ide-plugin-dependencies:kotlin-build-common-tests-for-ide",
         ":prepare:ide-plugin-dependencies:kotlin-compiler-for-ide",
+        ":prepare:ide-plugin-dependencies:kotlin-compiler-cli-for-ide",
         ":prepare:ide-plugin-dependencies:kotlin-dist-for-ide",
         ":prepare:ide-plugin-dependencies:kotlin-gradle-statistics-for-ide",
         ":prepare:ide-plugin-dependencies:kotlinx-serialization-compiler-plugin-for-ide",