Attach JPS plugin modules to the project model

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",

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)
     }

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"))
 }

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()))
 }

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",