From 7af8a3d4552425937b3fb155aef2feb9370f289f Mon Sep 17 00:00:00 2001
From: Andrew Kozlov <andrew.kozlov@jetbrains.com>
Date: Wed, 5 Jun 2024 21:31:07 +0200
Subject: [PATCH] [kotlin] KTIJ-28619, KTIJ-28628 excess dependencies

GitOrigin-RevId: 7f24d11a7d1f43d1e3ed2ea6c892b15f0ebb3bca
---
 .../compiler-plugins/kapt/kotlin.compiler-plugins.kapt.iml     | 3 ---
 .../kotlin.compiler-plugins.kotlinx-serialization.gradle.iml   | 1 -
 .../lombok/gradle/kotlin.compiler-plugins.lombok.gradle.iml    | 1 -
 .../noarg/common/kotlin.compiler-plugins.noarg.common.iml      | 1 -
 .../common/kotlin.compiler-plugins.parcelize.common.iml        | 2 --
 .../kotlin.compiler-plugins.sam-with-receiver.gradle.iml       | 1 -
 .../highlighting-shared/kotlin.highlighting.shared.iml         | 1 -
 plugins/kotlin/jsr223/kotlin.jsr223.iml                        | 2 +-
 plugins/kotlin/maven/kotlin.maven.iml                          | 1 -
 plugins/kotlin/migration/kotlin.migration.iml                  | 1 -
 plugins/kotlin/native/kotlin.native.iml                        | 1 -
 plugins/kotlin/plugin-updater/kotlin.plugin-updater.iml        | 1 -
 plugins/kotlin/plugin/k2/kotlin.plugin.k2.iml                  | 1 +
 plugins/kotlin/scripting-plugin/kotlin.scripting-plugin.iml    | 1 +
 14 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/plugins/kotlin/compiler-plugins/kapt/kotlin.compiler-plugins.kapt.iml b/plugins/kotlin/compiler-plugins/kapt/kotlin.compiler-plugins.kapt.iml
index d477542d84d4..5e303b16c136 100644
--- a/plugins/kotlin/compiler-plugins/kapt/kotlin.compiler-plugins.kapt.iml
+++ b/plugins/kotlin/compiler-plugins/kapt/kotlin.compiler-plugins.kapt.iml
@@ -10,11 +10,8 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
-    <orderEntry type="library" name="kotlinc.kotlin-compiler-fe10" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-jps-common" level="project" />
     <orderEntry type="module" module-name="kotlin.base.facet" />
-    <orderEntry type="module" module-name="kotlin.core" />
-    <orderEntry type="module" module-name="kotlin.idea" />
     <orderEntry type="module" module-name="kotlin.gradle.gradle-java" />
     <orderEntry type="module" module-name="kotlin.gradle.gradle-tooling.impl" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
diff --git a/plugins/kotlin/compiler-plugins/kotlinx-serialization/gradle/kotlin.compiler-plugins.kotlinx-serialization.gradle.iml b/plugins/kotlin/compiler-plugins/kotlinx-serialization/gradle/kotlin.compiler-plugins.kotlinx-serialization.gradle.iml
index c57227cac92e..5705507bf61a 100644
--- a/plugins/kotlin/compiler-plugins/kotlinx-serialization/gradle/kotlin.compiler-plugins.kotlinx-serialization.gradle.iml
+++ b/plugins/kotlin/compiler-plugins/kotlinx-serialization/gradle/kotlin.compiler-plugins.kotlinx-serialization.gradle.iml
@@ -10,7 +10,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="kotlin.base.facet" />
-    <orderEntry type="module" module-name="kotlin.core" />
     <orderEntry type="module" module-name="kotlin.gradle.gradle-java" />
     <orderEntry type="module" module-name="kotlin.compiler-plugins.kotlinx-serialization.common" />
     <orderEntry type="module" module-name="intellij.gradle.common" />
diff --git a/plugins/kotlin/compiler-plugins/lombok/gradle/kotlin.compiler-plugins.lombok.gradle.iml b/plugins/kotlin/compiler-plugins/lombok/gradle/kotlin.compiler-plugins.lombok.gradle.iml
index bb5fe47eddc8..72b5c852c41b 100644
--- a/plugins/kotlin/compiler-plugins/lombok/gradle/kotlin.compiler-plugins.lombok.gradle.iml
+++ b/plugins/kotlin/compiler-plugins/lombok/gradle/kotlin.compiler-plugins.lombok.gradle.iml
@@ -10,7 +10,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
-    <orderEntry type="library" name="kotlinc.kotlin-compiler-fe10" level="project" />
     <orderEntry type="library" name="kotlinc.lombok-compiler-plugin" level="project" />
     <orderEntry type="module" module-name="kotlin.base.plugin" />
     <orderEntry type="module" module-name="kotlin.compiler-plugins.compiler-plugin-support.common" />
diff --git a/plugins/kotlin/compiler-plugins/noarg/common/kotlin.compiler-plugins.noarg.common.iml b/plugins/kotlin/compiler-plugins/noarg/common/kotlin.compiler-plugins.noarg.common.iml
index dad37f51ae9d..9ab32a4e81f5 100644
--- a/plugins/kotlin/compiler-plugins/noarg/common/kotlin.compiler-plugins.noarg.common.iml
+++ b/plugins/kotlin/compiler-plugins/noarg/common/kotlin.compiler-plugins.noarg.common.iml
@@ -11,7 +11,6 @@
     <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler-fe10" level="project" />
     <orderEntry type="library" name="kotlinc.noarg-compiler-plugin" level="project" />
-    <orderEntry type="module" module-name="kotlin.core" />
     <orderEntry type="module" module-name="kotlin.compiler-plugins.compiler-plugin-support.common" />
     <orderEntry type="module" module-name="intellij.platform.core.impl" />
     <orderEntry type="module" module-name="intellij.java.psi.impl" />
diff --git a/plugins/kotlin/compiler-plugins/parcelize/common/kotlin.compiler-plugins.parcelize.common.iml b/plugins/kotlin/compiler-plugins/parcelize/common/kotlin.compiler-plugins.parcelize.common.iml
index 08e6ec73c44e..7bc18a82e2bc 100644
--- a/plugins/kotlin/compiler-plugins/parcelize/common/kotlin.compiler-plugins.parcelize.common.iml
+++ b/plugins/kotlin/compiler-plugins/parcelize/common/kotlin.compiler-plugins.parcelize.common.iml
@@ -35,8 +35,6 @@
     <orderEntry type="module" module-name="kotlin.base.analysis" />
     <orderEntry type="module" module-name="kotlin.base.code-insight" />
     <orderEntry type="module" module-name="kotlin.code-insight.api" />
-    <orderEntry type="module" module-name="kotlin.core" />
-    <orderEntry type="module" module-name="kotlin.idea" />
     <orderEntry type="module" module-name="intellij.platform.editor" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="kotlin.base.compiler-configuration" />
diff --git a/plugins/kotlin/compiler-plugins/sam-with-receiver/gradle/kotlin.compiler-plugins.sam-with-receiver.gradle.iml b/plugins/kotlin/compiler-plugins/sam-with-receiver/gradle/kotlin.compiler-plugins.sam-with-receiver.gradle.iml
index 5bda46cfaa6c..bf7911a68526 100644
--- a/plugins/kotlin/compiler-plugins/sam-with-receiver/gradle/kotlin.compiler-plugins.sam-with-receiver.gradle.iml
+++ b/plugins/kotlin/compiler-plugins/sam-with-receiver/gradle/kotlin.compiler-plugins.sam-with-receiver.gradle.iml
@@ -10,7 +10,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
-    <orderEntry type="library" name="kotlinc.kotlin-compiler-fe10" level="project" />
     <orderEntry type="library" name="kotlinc.sam-with-receiver-compiler-plugin" level="project" />
     <orderEntry type="module" module-name="kotlin.base.plugin" />
     <orderEntry type="module" module-name="kotlin.gradle.gradle-tooling.impl" />
diff --git a/plugins/kotlin/highlighting/highlighting-shared/kotlin.highlighting.shared.iml b/plugins/kotlin/highlighting/highlighting-shared/kotlin.highlighting.shared.iml
index 4a58e59943a0..7b321f0ce548 100644
--- a/plugins/kotlin/highlighting/highlighting-shared/kotlin.highlighting.shared.iml
+++ b/plugins/kotlin/highlighting/highlighting-shared/kotlin.highlighting.shared.iml
@@ -26,7 +26,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
-    <orderEntry type="library" name="kotlinc.kotlin-compiler-fe10" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-scripting-common" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-scripting-compiler-impl" level="project" />
     <orderEntry type="module" module-name="kotlin.base.frontend-agnostic" />
diff --git a/plugins/kotlin/jsr223/kotlin.jsr223.iml b/plugins/kotlin/jsr223/kotlin.jsr223.iml
index f2c3e755e424..40b9e0cfb230 100644
--- a/plugins/kotlin/jsr223/kotlin.jsr223.iml
+++ b/plugins/kotlin/jsr223/kotlin.jsr223.iml
@@ -8,9 +8,9 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
-    <orderEntry type="library" name="kotlinc.kotlin-compiler-fe10" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-script-runtime" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-scripting-jvm" level="project" />
+    <orderEntry type="module" module-name="kotlin.base.frontend-agnostic" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/kotlin/maven/kotlin.maven.iml b/plugins/kotlin/maven/kotlin.maven.iml
index a2414e50eef9..c33692686638 100644
--- a/plugins/kotlin/maven/kotlin.maven.iml
+++ b/plugins/kotlin/maven/kotlin.maven.iml
@@ -10,7 +10,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
-    <orderEntry type="library" name="kotlinc.kotlin-compiler-fe10" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-jps-common" level="project" />
     <orderEntry type="library" name="gson" level="project" />
     <orderEntry type="module" module-name="kotlin.base.frontend-agnostic" />
diff --git a/plugins/kotlin/migration/kotlin.migration.iml b/plugins/kotlin/migration/kotlin.migration.iml
index c6e164ace9ce..25169e3d7071 100644
--- a/plugins/kotlin/migration/kotlin.migration.iml
+++ b/plugins/kotlin/migration/kotlin.migration.iml
@@ -10,7 +10,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
-    <orderEntry type="library" name="kotlinc.kotlin-compiler-fe10" level="project" />
     <orderEntry type="module" module-name="kotlin.base.frontend-agnostic" />
     <orderEntry type="module" module-name="kotlin.base.util" />
     <orderEntry type="module" module-name="kotlin.base.plugin" />
diff --git a/plugins/kotlin/native/kotlin.native.iml b/plugins/kotlin/native/kotlin.native.iml
index 50c20893cd7e..1adb7563be76 100644
--- a/plugins/kotlin/native/kotlin.native.iml
+++ b/plugins/kotlin/native/kotlin.native.iml
@@ -11,7 +11,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
-    <orderEntry type="library" name="kotlinc.kotlin-compiler-fe10" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-jps-common" level="project" />
     <orderEntry type="module" module-name="kotlin.base.frontend-agnostic" />
     <orderEntry type="module" module-name="kotlin.base.util" />
diff --git a/plugins/kotlin/plugin-updater/kotlin.plugin-updater.iml b/plugins/kotlin/plugin-updater/kotlin.plugin-updater.iml
index 0d78c9544b3a..fda2d0406e2f 100644
--- a/plugins/kotlin/plugin-updater/kotlin.plugin-updater.iml
+++ b/plugins/kotlin/plugin-updater/kotlin.plugin-updater.iml
@@ -10,7 +10,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />
-    <orderEntry type="library" name="kotlinc.kotlin-compiler-fe10" level="project" />
     <orderEntry type="library" name="jaxb-api" level="project" />
     <orderEntry type="library" name="gson" level="project" />
     <orderEntry type="module" module-name="kotlin.base.frontend-agnostic" />
diff --git a/plugins/kotlin/plugin/k2/kotlin.plugin.k2.iml b/plugins/kotlin/plugin/k2/kotlin.plugin.k2.iml
index 811d348ba007..a0f0efdcd125 100644
--- a/plugins/kotlin/plugin/k2/kotlin.plugin.k2.iml
+++ b/plugins/kotlin/plugin/k2/kotlin.plugin.k2.iml
@@ -114,6 +114,7 @@
     <orderEntry type="module" module-name="kotlin.formatter.minimal" />
     <orderEntry type="module" module-name="kotlin.ide" />
     <orderEntry type="module" module-name="kotlin.code-insight.fixes.k2" scope="RUNTIME" />
+    <orderEntry type="module" module-name="kotlin.jsr223" scope="RUNTIME" />
     <orderEntry type="module" module-name="kotlin.performanceExtendedPlugin" scope="RUNTIME" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/kotlin/scripting-plugin/kotlin.scripting-plugin.iml b/plugins/kotlin/scripting-plugin/kotlin.scripting-plugin.iml
index 90deda670b49..9b0897dac8aa 100644
--- a/plugins/kotlin/scripting-plugin/kotlin.scripting-plugin.iml
+++ b/plugins/kotlin/scripting-plugin/kotlin.scripting-plugin.iml
@@ -9,6 +9,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
+    <orderEntry type="module" module-name="kotlin.base.frontend-agnostic" />
     <orderEntry type="module" module-name="kotlin.jsr223" />
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="library" name="kotlinc.kotlin-compiler-common" level="project" />