From 7febd846e8d7b32274a9d2ba2cb05f83179b4d88 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Sat, 3 Jun 2017 03:43:04 +0300
Subject: [PATCH] Export 'intellij-core' in module 'frontend'

Remove intellij-core from dependencies of modules which already depend
on frontend or any module that exports frontend (such as frontend.java)
---
 compiler/backend-common/backend-common.iml                    | 1 -
 compiler/backend/backend.iml                                  | 1 -
 compiler/builtins-serializer/builtins-serializer.iml          | 1 -
 compiler/cli/cli-common/cli-common.iml                        | 1 -
 compiler/cli/cli.iml                                          | 1 -
 .../conditional-preprocessor/conditional-preprocessor.iml     | 1 -
 compiler/daemon/daemon.iml                                    | 1 -
 compiler/frontend.java/frontend.java.iml                      | 1 -
 compiler/frontend.script/frontend.script.iml                  | 1 -
 compiler/frontend/frontend.iml                                | 2 +-
 .../incremental-compilation-impl.iml                          | 1 -
 compiler/javac-wrapper/javac-wrapper.iml                      | 1 -
 compiler/light-classes/light-classes.iml                      | 4 +---
 idea/ide-common/ide-common.iml                                | 1 -
 idea/idea-jps-common/idea-jps-common.iml                      | 1 -
 j2k/j2k.iml                                                   | 1 -
 js/js.ast/js.ast.iml                                          | 1 -
 js/js.frontend/js.frontend.iml                                | 1 -
 js/js.inliner/js.inliner.iml                                  | 1 -
 js/js.serializer/js.serializer.iml                            | 1 -
 js/js.tests/js.tests.iml                                      | 1 -
 js/js.translator/js.translator.iml                            | 1 -
 .../android-extensions-compiler.iml                           | 1 -
 plugins/annotation-processing/annotation-processing.iml       | 1 -
 plugins/java-model-wrappers/java-model-wrappers.iml           | 1 -
 25 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/compiler/backend-common/backend-common.iml b/compiler/backend-common/backend-common.iml
index 4390c92b7c5..0e3a740b14d 100644
--- a/compiler/backend-common/backend-common.iml
+++ b/compiler/backend-common/backend-common.iml
@@ -7,7 +7,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="util" />
   </component>
diff --git a/compiler/backend/backend.iml b/compiler/backend/backend.iml
index 35bbf202424..2934ca7b771 100644
--- a/compiler/backend/backend.iml
+++ b/compiler/backend/backend.iml
@@ -9,7 +9,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="serialization" />
     <orderEntry type="module" module-name="backend-common" exported="" />
     <orderEntry type="module" module-name="util" />
diff --git a/compiler/builtins-serializer/builtins-serializer.iml b/compiler/builtins-serializer/builtins-serializer.iml
index 66860182c93..1af900f1cbe 100644
--- a/compiler/builtins-serializer/builtins-serializer.iml
+++ b/compiler/builtins-serializer/builtins-serializer.iml
@@ -8,7 +8,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="cli" />
     <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="module" module-name="serialization" />
diff --git a/compiler/cli/cli-common/cli-common.iml b/compiler/cli/cli-common/cli-common.iml
index ff47b07bca9..546275c3c54 100644
--- a/compiler/cli/cli-common/cli-common.iml
+++ b/compiler/cli/cli-common/cli-common.iml
@@ -8,7 +8,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="util" />
-    <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
     <orderEntry type="library" name="jps" level="project" />
     <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="library" name="kotlin-reflect" level="project" />
diff --git a/compiler/cli/cli.iml b/compiler/cli/cli.iml
index 0116e9013f2..66cb898b486 100644
--- a/compiler/cli/cli.iml
+++ b/compiler/cli/cli.iml
@@ -12,7 +12,6 @@
     <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="module" module-name="plugin-api" />
     <orderEntry type="module" module-name="light-classes" />
-    <orderEntry type="library" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="js.translator" />
     <orderEntry type="library" name="jansi" level="project" />
     <orderEntry type="library" name="jline" level="project" />
diff --git a/compiler/conditional-preprocessor/conditional-preprocessor.iml b/compiler/conditional-preprocessor/conditional-preprocessor.iml
index 3dfb88e4b48..e1d23a84a21 100644
--- a/compiler/conditional-preprocessor/conditional-preprocessor.iml
+++ b/compiler/conditional-preprocessor/conditional-preprocessor.iml
@@ -8,7 +8,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="util" />
-    <orderEntry type="library" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="cli" />
     <orderEntry type="module" module-name="frontend" />
   </component>
diff --git a/compiler/daemon/daemon.iml b/compiler/daemon/daemon.iml
index 021cc32fca4..f11e4dd0815 100644
--- a/compiler/daemon/daemon.iml
+++ b/compiler/daemon/daemon.iml
@@ -10,7 +10,6 @@
     <orderEntry type="module" module-name="cli" />
     <orderEntry type="module" module-name="daemon-common" />
     <orderEntry type="module" module-name="util" />
-    <orderEntry type="library" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="incremental-compilation-impl" />
     <orderEntry type="module" module-name="build-common" />
diff --git a/compiler/frontend.java/frontend.java.iml b/compiler/frontend.java/frontend.java.iml
index 38bd69fc475..17a0c5c825e 100644
--- a/compiler/frontend.java/frontend.java.iml
+++ b/compiler/frontend.java/frontend.java.iml
@@ -8,7 +8,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="frontend" exported="" />
-    <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="descriptor.loader.java" exported="" />
     <orderEntry type="module" module-name="util" />
   </component>
diff --git a/compiler/frontend.script/frontend.script.iml b/compiler/frontend.script/frontend.script.iml
index 2ab5a4ba725..cced36e0e4e 100644
--- a/compiler/frontend.script/frontend.script.iml
+++ b/compiler/frontend.script/frontend.script.iml
@@ -8,7 +8,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-runtime" level="project" />
-    <orderEntry type="library" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="library" name="kotlin-reflect" level="project" />
diff --git a/compiler/frontend/frontend.iml b/compiler/frontend/frontend.iml
index b08dc9d4a31..4764656de55 100644
--- a/compiler/frontend/frontend.iml
+++ b/compiler/frontend/frontend.iml
@@ -8,7 +8,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
+    <orderEntry type="library" exported="" scope="PROVIDED" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="descriptors" exported="" />
     <orderEntry type="module" module-name="deserialization" exported="" />
     <orderEntry type="module" module-name="util" />
diff --git a/compiler/incremental-compilation-impl/incremental-compilation-impl.iml b/compiler/incremental-compilation-impl/incremental-compilation-impl.iml
index 82211801d79..b197f9e7c8d 100644
--- a/compiler/incremental-compilation-impl/incremental-compilation-impl.iml
+++ b/compiler/incremental-compilation-impl/incremental-compilation-impl.iml
@@ -9,7 +9,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="intellij-core" level="project" />
     <orderEntry type="library" name="kotlin-runtime" level="project" />
     <orderEntry type="module" module-name="build-common" />
     <orderEntry type="module" module-name="cli" />
diff --git a/compiler/javac-wrapper/javac-wrapper.iml b/compiler/javac-wrapper/javac-wrapper.iml
index dd234f68e73..a8c91b4dfdd 100644
--- a/compiler/javac-wrapper/javac-wrapper.iml
+++ b/compiler/javac-wrapper/javac-wrapper.iml
@@ -19,7 +19,6 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="library" name="intellij-core" level="project" />
     <orderEntry type="library" name="javax.inject" level="project" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="frontend.java" />
diff --git a/compiler/light-classes/light-classes.iml b/compiler/light-classes/light-classes.iml
index f1dc5576fff..87965c60696 100644
--- a/compiler/light-classes/light-classes.iml
+++ b/compiler/light-classes/light-classes.iml
@@ -10,8 +10,6 @@
     <orderEntry type="module" module-name="backend" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="util" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/idea/ide-common/ide-common.iml b/idea/ide-common/ide-common.iml
index 765094d3d4d..df607cb5f8c 100644
--- a/idea/ide-common/ide-common.iml
+++ b/idea/ide-common/ide-common.iml
@@ -18,7 +18,6 @@
       </library>
     </orderEntry>
     <orderEntry type="library" name="guava" level="project" />
-    <orderEntry type="library" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="js.frontend" />
diff --git a/idea/idea-jps-common/idea-jps-common.iml b/idea/idea-jps-common/idea-jps-common.iml
index 8f2dd089f68..7225646ab21 100644
--- a/idea/idea-jps-common/idea-jps-common.iml
+++ b/idea/idea-jps-common/idea-jps-common.iml
@@ -9,7 +9,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-runtime" level="project" />
     <orderEntry type="library" name="kotlin-reflect" level="project" />
-    <orderEntry type="library" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="cli-common" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="frontend.java" />
diff --git a/j2k/j2k.iml b/j2k/j2k.iml
index 647d89ed2c6..70f450b89e4 100644
--- a/j2k/j2k.iml
+++ b/j2k/j2k.iml
@@ -8,7 +8,6 @@
     </content>
     <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="module" module-name="light-classes" />
diff --git a/js/js.ast/js.ast.iml b/js/js.ast/js.ast.iml
index 349c1d55c07..0e3a740b14d 100644
--- a/js/js.ast/js.ast.iml
+++ b/js/js.ast/js.ast.iml
@@ -7,7 +7,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="util" />
   </component>
diff --git a/js/js.frontend/js.frontend.iml b/js/js.frontend/js.frontend.iml
index 6a43a35cbcc..cd29f87729d 100644
--- a/js/js.frontend/js.frontend.iml
+++ b/js/js.frontend/js.frontend.iml
@@ -7,7 +7,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="js.ast" exported="" />
     <orderEntry type="module" module-name="js.parser" exported="" />
diff --git a/js/js.inliner/js.inliner.iml b/js/js.inliner/js.inliner.iml
index 06dfaed88a0..b98d0f89245 100644
--- a/js/js.inliner/js.inliner.iml
+++ b/js/js.inliner/js.inliner.iml
@@ -7,7 +7,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="descriptors" />
     <orderEntry type="module" module-name="js.ast" />
     <orderEntry type="module" module-name="js.translator" />
diff --git a/js/js.serializer/js.serializer.iml b/js/js.serializer/js.serializer.iml
index b2ca8d58c5a..a3dbbdf0b55 100644
--- a/js/js.serializer/js.serializer.iml
+++ b/js/js.serializer/js.serializer.iml
@@ -8,7 +8,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="library" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="js.ast" />
diff --git a/js/js.tests/js.tests.iml b/js/js.tests/js.tests.iml
index 30433c5086e..7ec8d7e656a 100644
--- a/js/js.tests/js.tests.iml
+++ b/js/js.tests/js.tests.iml
@@ -11,7 +11,6 @@
     <orderEntry type="module" module-name="tests-common" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="cli" />
-    <orderEntry type="library" name="intellij-core" level="project" />
     <orderEntry type="library" name="idea-full" level="project" />
     <orderEntry type="module" module-name="backend-common" scope="TEST" />
     <orderEntry type="module" module-name="util" />
diff --git a/js/js.translator/js.translator.iml b/js/js.translator/js.translator.iml
index 2b0290301cf..e522b8393b3 100644
--- a/js/js.translator/js.translator.iml
+++ b/js/js.translator/js.translator.iml
@@ -8,7 +8,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="backend-common" />
     <orderEntry type="module" module-name="js.ast" exported="" />
     <orderEntry type="module" module-name="js.frontend" exported="" />
diff --git a/plugins/android-extensions/android-extensions-compiler/android-extensions-compiler.iml b/plugins/android-extensions/android-extensions-compiler/android-extensions-compiler.iml
index 318bfdaf25d..70f7dd7cc64 100644
--- a/plugins/android-extensions/android-extensions-compiler/android-extensions-compiler.iml
+++ b/plugins/android-extensions/android-extensions-compiler/android-extensions-compiler.iml
@@ -12,7 +12,6 @@
     <orderEntry type="module" module-name="frontend" exported="" />
     <orderEntry type="module" module-name="frontend.java" exported="" />
     <orderEntry type="module" module-name="util" />
-    <orderEntry type="library" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="backend" scope="PROVIDED" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/annotation-processing/annotation-processing.iml b/plugins/annotation-processing/annotation-processing.iml
index e09f130acc4..e351929b013 100644
--- a/plugins/annotation-processing/annotation-processing.iml
+++ b/plugins/annotation-processing/annotation-processing.iml
@@ -9,7 +9,6 @@
     <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="java-model-wrappers" />
-    <orderEntry type="library" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="plugin-api" />
     <orderEntry type="module" module-name="frontend.java" />
diff --git a/plugins/java-model-wrappers/java-model-wrappers.iml b/plugins/java-model-wrappers/java-model-wrappers.iml
index bd0c3feaf10..f9dca123209 100755
--- a/plugins/java-model-wrappers/java-model-wrappers.iml
+++ b/plugins/java-model-wrappers/java-model-wrappers.iml
@@ -7,7 +7,6 @@
     </content>
     <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="light-classes" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="annotation-processing" />