From fb8640b3b64674f7babeb0c5e7e07b351367bc9e Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Thu, 7 May 2020 20:24:20 +0900
Subject: [PATCH] Move compilerComponents project list to the root project

---
 build.gradle.kts                              | 22 +++++++++++++++++
 .../build.gradle.kts                          |  4 ++--
 .../kotlin-dist-for-ide/build.gradle.kts      |  9 +++----
 prepare/jps-plugin/build.gradle.kts           | 24 +------------------
 4 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 084223d0f09..359ef2b54d9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -279,6 +279,28 @@ extra["compilerModules"] = arrayOf(
     ":compiler:fir:analysis-tests"
 )
 
+extra["compilerModulesForJps"] = listOf(
+    ":core:type-system",
+    ":kotlin-build-common",
+    ":kotlin-util-io",
+    ":kotlin-util-klib",
+    ":kotlin-util-klib-metadata",
+    ":compiler:cli-common",
+    ":kotlin-compiler-runner",
+    ":daemon-common",
+    ":daemon-common-new",
+    ":core:descriptors",
+    ":core:descriptors.jvm",
+    ":idea:idea-jps-common",
+    ":kotlin-preloader",
+    ":compiler:util",
+    ":compiler:config",
+    ":compiler:config.jvm",
+    ":js:js.config",
+    ":core:util.runtime",
+    ":compiler:compiler.version"
+)
+
 val coreLibProjects = listOfNotNull(
     ":kotlin-stdlib",
     ":kotlin-stdlib-common",
diff --git a/prepare/ide-plugin-dependencies/compiler-components-for-jps/build.gradle.kts b/prepare/ide-plugin-dependencies/compiler-components-for-jps/build.gradle.kts
index 261b4a3833d..e250dafeba5 100644
--- a/prepare/ide-plugin-dependencies/compiler-components-for-jps/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/compiler-components-for-jps/build.gradle.kts
@@ -1,8 +1,8 @@
 idePluginDependency {
     @Suppress("UNCHECKED_CAST")
-    val compilerComponentProjects = project(":kotlin-jps-plugin").extra["compilerComponents"] as List<String>
+    val compilerComponents = rootProject.extra["compilerModulesForJps"] as List<String>
 
     val otherProjects = listOf(":kotlin-daemon-client")
 
-    publishProjectJars(compilerComponentProjects + otherProjects)
+    publishProjectJars(compilerComponents + otherProjects)
 }
\ No newline at end of file
diff --git a/prepare/ide-plugin-dependencies/kotlin-dist-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/kotlin-dist-for-ide/build.gradle.kts
index c2546b32311..745de464113 100644
--- a/prepare/ide-plugin-dependencies/kotlin-dist-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/kotlin-dist-for-ide/build.gradle.kts
@@ -8,10 +8,11 @@ idePluginDependency {
     val jar: Jar by tasks
 
     jar.apply {
-        val distKotlincTask = project(":kotlin-compiler").tasks.getByName("distKotlinc")
-
-        dependsOn(distKotlincTask)
-        from(distKotlincTask)
+        dependsOn(":kotlin-compiler:distKotlinc")
+//        from {
+//            val distKotlincTask = project(":kotlin-compiler").tasks.getByName("distKotlinc")
+//            (distKotlincTask)
+//        }
 
     }
 
diff --git a/prepare/jps-plugin/build.gradle.kts b/prepare/jps-plugin/build.gradle.kts
index cbaf10b8c1c..ea3737a51c6 100644
--- a/prepare/jps-plugin/build.gradle.kts
+++ b/prepare/jps-plugin/build.gradle.kts
@@ -4,29 +4,7 @@ plugins {
     java
 }
 
-val compilerComponents by extra(
-    listOf(
-        ":core:type-system",
-        ":kotlin-build-common",
-        ":kotlin-util-io",
-        ":kotlin-util-klib",
-        ":kotlin-util-klib-metadata",
-        ":compiler:cli-common",
-        ":kotlin-compiler-runner",
-        ":daemon-common",
-        ":daemon-common-new",
-        ":core:descriptors",
-        ":core:descriptors.jvm",
-        ":idea:idea-jps-common",
-        ":kotlin-preloader",
-        ":compiler:util",
-        ":compiler:config",
-        ":compiler:config.jvm",
-        ":js:js.config",
-        ":core:util.runtime",
-        ":compiler:compiler.version"
-    )
-)
+val compilerComponents = rootProject.extra["compilerModulesForJps"] as List<String>
 
 val projectsToShadow = compilerComponents + listOf(":jps-plugin")