From 2ed027219cb2816b0126ab4d9953cd7fd08e4b58 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Fri, 2 Jun 2017 21:02:49 +0300
Subject: [PATCH] Remove dependency of module 'frontend' on 'plugin-api'

This breaks the circular dependency between them
---
 compiler/cli/cli.iml                                           | 1 +
 compiler/frontend/frontend.iml                                 | 1 -
 idea/idea.iml                                                  | 1 +
 plugins/allopen/allopen-cli/allopen-cli.iml                    | 1 +
 plugins/allopen/allopen-ide/allopen-ide.iml                    | 1 +
 plugins/annotation-processing/annotation-processing.iml        | 1 +
 plugins/kapt3/kapt3.iml                                        | 1 +
 plugins/noarg/noarg-cli/noarg-cli.iml                          | 1 +
 plugins/noarg/noarg-ide/noarg-ide.iml                          | 1 +
 .../sam-with-receiver-cli/sam-with-receiver-cli.iml            | 1 +
 .../source-sections-compiler/source-sections-compiler.iml      | 3 ++-
 11 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/compiler/cli/cli.iml b/compiler/cli/cli.iml
index 0dd3db7abef..0116e9013f2 100644
--- a/compiler/cli/cli.iml
+++ b/compiler/cli/cli.iml
@@ -10,6 +10,7 @@
     <orderEntry type="module" module-name="backend" />
     <orderEntry type="module" module-name="frontend" />
     <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" />
diff --git a/compiler/frontend/frontend.iml b/compiler/frontend/frontend.iml
index ec58b90098b..b08dc9d4a31 100644
--- a/compiler/frontend/frontend.iml
+++ b/compiler/frontend/frontend.iml
@@ -12,7 +12,6 @@
     <orderEntry type="module" module-name="descriptors" exported="" />
     <orderEntry type="module" module-name="deserialization" exported="" />
     <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="plugin-api" exported="" />
     <orderEntry type="module" module-name="container" exported="" />
     <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
     <orderEntry type="module" module-name="resolution" exported="" />
diff --git a/idea/idea.iml b/idea/idea.iml
index 2512b76b225..c4ea1c6ef1d 100644
--- a/idea/idea.iml
+++ b/idea/idea.iml
@@ -20,6 +20,7 @@
     <orderEntry type="module" module-name="backend" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="frontend.java" />
+    <orderEntry type="module" module-name="plugin-api" />
     <orderEntry type="module" module-name="light-classes" />
     <orderEntry type="module" module-name="cli-common" />
     <orderEntry type="library" name="idea-full" level="project" />
diff --git a/plugins/allopen/allopen-cli/allopen-cli.iml b/plugins/allopen/allopen-cli/allopen-cli.iml
index 65a63b9379f..1b4ce6be947 100644
--- a/plugins/allopen/allopen-cli/allopen-cli.iml
+++ b/plugins/allopen/allopen-cli/allopen-cli.iml
@@ -9,5 +9,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-runtime" level="project" />
     <orderEntry type="module" module-name="frontend" />
+    <orderEntry type="module" module-name="plugin-api" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/allopen/allopen-ide/allopen-ide.iml b/plugins/allopen/allopen-ide/allopen-ide.iml
index 41c5789c7c0..7ad157ddde3 100644
--- a/plugins/allopen/allopen-ide/allopen-ide.iml
+++ b/plugins/allopen/allopen-ide/allopen-ide.iml
@@ -9,6 +9,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-runtime" level="project" />
     <orderEntry type="module" module-name="frontend" />
+    <orderEntry type="module" module-name="plugin-api" />
     <orderEntry type="module" module-name="allopen-cli" />
     <orderEntry type="library" name="idea-full" level="project" />
     <orderEntry type="library" name="gradle-and-groovy-plugin" level="project" />
diff --git a/plugins/annotation-processing/annotation-processing.iml b/plugins/annotation-processing/annotation-processing.iml
index e4248153040..e09f130acc4 100644
--- a/plugins/annotation-processing/annotation-processing.iml
+++ b/plugins/annotation-processing/annotation-processing.iml
@@ -11,6 +11,7 @@
     <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" />
     <orderEntry type="module" module-name="light-classes" />
     <orderEntry type="module" module-name="util" />
diff --git a/plugins/kapt3/kapt3.iml b/plugins/kapt3/kapt3.iml
index 08584ed92ed..0bb5890cf39 100644
--- a/plugins/kapt3/kapt3.iml
+++ b/plugins/kapt3/kapt3.iml
@@ -9,6 +9,7 @@
     <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="frontend" />
+    <orderEntry type="module" module-name="plugin-api" />
     <orderEntry type="module" module-name="backend" />
     <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="library" name="kotlin-runtime" level="project" />
diff --git a/plugins/noarg/noarg-cli/noarg-cli.iml b/plugins/noarg/noarg-cli/noarg-cli.iml
index 4e3bbad80a6..5cf7403a117 100644
--- a/plugins/noarg/noarg-cli/noarg-cli.iml
+++ b/plugins/noarg/noarg-cli/noarg-cli.iml
@@ -9,6 +9,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-runtime" level="project" />
     <orderEntry type="module" module-name="frontend" />
+    <orderEntry type="module" module-name="plugin-api" />
     <orderEntry type="module" module-name="backend" />
     <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="module" module-name="util" />
diff --git a/plugins/noarg/noarg-ide/noarg-ide.iml b/plugins/noarg/noarg-ide/noarg-ide.iml
index 3bae23383a3..6b81ded642a 100644
--- a/plugins/noarg/noarg-ide/noarg-ide.iml
+++ b/plugins/noarg/noarg-ide/noarg-ide.iml
@@ -9,6 +9,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-runtime" level="project" />
     <orderEntry type="module" module-name="frontend" />
+    <orderEntry type="module" module-name="plugin-api" />
     <orderEntry type="module" module-name="backend" />
     <orderEntry type="module" module-name="noarg-cli" />
     <orderEntry type="library" scope="PROVIDED" name="idea-full" level="project" />
diff --git a/plugins/sam-with-receiver/sam-with-receiver-cli/sam-with-receiver-cli.iml b/plugins/sam-with-receiver/sam-with-receiver-cli/sam-with-receiver-cli.iml
index 2fd48c4a163..b0a3fb30186 100644
--- a/plugins/sam-with-receiver/sam-with-receiver-cli/sam-with-receiver-cli.iml
+++ b/plugins/sam-with-receiver/sam-with-receiver-cli/sam-with-receiver-cli.iml
@@ -10,5 +10,6 @@
     <orderEntry type="library" name="kotlin-runtime" level="project" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="frontend.java" />
+    <orderEntry type="module" module-name="plugin-api" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/source-sections/source-sections-compiler/source-sections-compiler.iml b/plugins/source-sections/source-sections-compiler/source-sections-compiler.iml
index eac84a8ad03..f354ccf4329 100644
--- a/plugins/source-sections/source-sections-compiler/source-sections-compiler.iml
+++ b/plugins/source-sections/source-sections-compiler/source-sections-compiler.iml
@@ -11,6 +11,8 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-runtime" level="project" />
     <orderEntry type="module" module-name="frontend" />
+    <orderEntry type="module" module-name="frontend.script" />
+    <orderEntry type="module" module-name="plugin-api" />
     <orderEntry type="module" module-name="tests-common" scope="TEST" />
     <orderEntry type="module" module-name="cli" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="junit-4.12" level="project" />
@@ -19,6 +21,5 @@
     <orderEntry type="module" module-name="util" scope="TEST" />
     <orderEntry type="module" module-name="daemon-client" scope="TEST" />
     <orderEntry type="module" module-name="daemon-common" scope="TEST" />
-    <orderEntry type="module" module-name="frontend.script" />
   </component>
 </module>
\ No newline at end of file