From d2de74226ed58d97e037fd2d917b026ef3ee62d3 Mon Sep 17 00:00:00 2001
From: Natalia Ukhorskaya <natalia.ukhorskaya@jetbrains.com>
Date: Fri, 11 Mar 2016 16:25:55 +0300
Subject: [PATCH] Refactoring: rearrange dependencies in android modules

---
 .../kotlin-android-plugin.iml                     | 15 ++++++++-------
 .../android-extensions-idea.iml                   |  6 +++---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/idea/kotlin-android-plugin/kotlin-android-plugin.iml b/idea/kotlin-android-plugin/kotlin-android-plugin.iml
index b2c079fe125..0e8e567209c 100644
--- a/idea/kotlin-android-plugin/kotlin-android-plugin.iml
+++ b/idea/kotlin-android-plugin/kotlin-android-plugin.iml
@@ -8,14 +8,15 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="android-plugin" level="project" />
-    <orderEntry type="library" name="idea-full" level="project" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="idea-analysis" />
-    <orderEntry type="module" module-name="idea" />
-    <orderEntry type="module" module-name="frontend.java" />
+    <orderEntry type="library" exported="" name="android-plugin" level="project" />
     <orderEntry type="library" name="gradle-and-groovy-plugin" level="project" />
+    <orderEntry type="library" name="idea-full" level="project" />
+    <orderEntry type="module" module-name="idea" />
+    <orderEntry type="module" module-name="ide-common" />
+    <orderEntry type="module" module-name="idea-analysis" />
+    <orderEntry type="module" module-name="util" />
+    <orderEntry type="module" module-name="frontend" />
+    <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/android-extensions/android-extensions-idea/android-extensions-idea.iml b/plugins/android-extensions/android-extensions-idea/android-extensions-idea.iml
index fcdcbad5918..fe59d4b795f 100644
--- a/plugins/android-extensions/android-extensions-idea/android-extensions-idea.iml
+++ b/plugins/android-extensions/android-extensions-idea/android-extensions-idea.iml
@@ -9,15 +9,15 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="android-extensions-compiler" exported="" />
-    <orderEntry type="library" exported="" scope="PROVIDED" name="android-plugin" level="project" />
+    <orderEntry type="module" module-name="kotlin-android-plugin" />
     <orderEntry type="library" scope="PROVIDED" name="idea-full" level="project" />
     <orderEntry type="module" module-name="idea" scope="PROVIDED" />
     <orderEntry type="module" module-name="idea-core" scope="PROVIDED" />
+    <orderEntry type="module" module-name="light-classes" />
+    <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
     <orderEntry type="module" module-name="cli" scope="TEST" />
-    <orderEntry type="module" module-name="light-classes" />
     <orderEntry type="module" module-name="idea-completion" scope="TEST" />
-    <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="idea-test-framework" scope="TEST" />
     <orderEntry type="module" module-name="frontend.java" scope="TEST" />
     <orderEntry type="module" module-name="idea-live-templates" scope="TEST" />