From 047272e56f383d47d4e207d678a95bd7ccad46c5 Mon Sep 17 00:00:00 2001
From: Nikita Bobko <nikita.bobko@jetbrains.com>
Date: Wed, 22 Dec 2021 16:12:28 +0100
Subject: [PATCH] Attach JPS plugin modules to the project model

---
 build.gradle.kts                                             | 2 +-
 jps/jps-plugin/build.gradle.kts                              | 5 +----
 .../kotlin-jps-common-for-ide/build.gradle.kts               | 2 +-
 .../kotlin-jps-plugin-classpath/build.gradle.kts             | 2 +-
 settings.gradle                                              | 3 +++
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 4bf19e7646b..ea4ea03592b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -261,7 +261,7 @@ extra["compilerModulesForJps"] = listOf(
     ":compiler:frontend.java",
     ":core:metadata",
     ":core:metadata.jvm",
-    ":idea:idea-jps-common",
+    ":jps:jps-common",
     ":kotlin-preloader",
     ":compiler:util",
     ":compiler:config",
diff --git a/jps/jps-plugin/build.gradle.kts b/jps/jps-plugin/build.gradle.kts
index ff06a6201c4..4bea7e8dbb9 100644
--- a/jps/jps-plugin/build.gradle.kts
+++ b/jps/jps-plugin/build.gradle.kts
@@ -17,10 +17,7 @@ dependencies {
     compile(project(":compiler:frontend.java"))
     compile(project(":js:js.frontend"))
     compile(projectRuntimeJar(":kotlin-preloader"))
-    compile(project(":idea:idea-jps-common"))
-    Platform[193].orLower {
-        compileOnly(intellijDep()) { includeJars("openapi", rootProject = rootProject) }
-    }
+    compile(project(":jps:jps-common"))
     compileOnly(intellijDep()) {
         includeJars("jdom", "trove4j", "jps-model", "platform-api", "util", "asm-all", rootProject = rootProject)
     }
diff --git a/prepare/ide-plugin-dependencies/kotlin-jps-common-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/kotlin-jps-common-for-ide/build.gradle.kts
index a4a818f9c6c..ce9dde4fd17 100644
--- a/prepare/ide-plugin-dependencies/kotlin-jps-common-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/kotlin-jps-common-for-ide/build.gradle.kts
@@ -1,3 +1,3 @@
 idePluginDependency {
-    publishProjectJars(listOf(":idea:idea-jps-common"))
+    publishProjectJars(listOf(":jps:jps-common"))
 }
diff --git a/prepare/ide-plugin-dependencies/kotlin-jps-plugin-classpath/build.gradle.kts b/prepare/ide-plugin-dependencies/kotlin-jps-plugin-classpath/build.gradle.kts
index 184c53e8862..0bae8996764 100644
--- a/prepare/ide-plugin-dependencies/kotlin-jps-plugin-classpath/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/kotlin-jps-plugin-classpath/build.gradle.kts
@@ -2,7 +2,7 @@ idePluginDependency {
     @Suppress("UNCHECKED_CAST")
     val compilerComponents = rootProject.extra["compilerModulesForJps"] as List<String>
 
-    val otherProjects = listOf(":kotlin-daemon-client", ":jps-plugin", ":idea:idea-jps-common", ":kotlin-reflect")
+    val otherProjects = listOf(":kotlin-daemon-client", ":jps:jps-plugin", ":jps:jps-common", ":kotlin-reflect")
 
     publishProjectJars(compilerComponents + otherProjects, libraryDependencies = listOf(protobufFull()))
 }
diff --git a/settings.gradle b/settings.gradle
index f17501cdab9..91865fcaf0e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -486,6 +486,9 @@ if (attachedIntellijVersion == "212") { // Latest available platform in scope of
     intellij "jvm-run-configurations/kotlin.jvm-run-configurations.iml"
 }
 
+include ":jps:jps-common",
+        ":jps:jps-plugin"
+
 include ":generators:analysis-api-generator",
         ":analysis",
         ":analysis:low-level-api-fir",