From ecae29aa3c9b6b8ef08740426cb632d1ba109513 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Tue, 27 Jan 2015 22:35:13 +0300
Subject: [PATCH] Reorder and optimize dependencies between modules and
 libraries

- drop 'kotlin-runtime' and other dependencies which are exported by
  other modules ('util' and 'util.runtime' in case of 'kotlin-runtime')
- make all Kotlin modules from the compiler depend on 'util' for clarity
- put 'util' and 'util.runtime' to the bottom of the list everywhere: when
  kotlin-runtime gets reflection, classes from core/ should have higher
  priority than their previous versions from kotlin-runtime.jar

Original commit: 5903b8c4a7861087d2ad4982fc6b72b996a107ca
---
 jps/jps-plugin/bare-plugin/bare-plugin.iml | 7 +++----
 jps/jps-plugin/jps-plugin.iml              | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/jps/jps-plugin/bare-plugin/bare-plugin.iml b/jps/jps-plugin/bare-plugin/bare-plugin.iml
index 80ba7107224..feff85211d8 100644
--- a/jps/jps-plugin/bare-plugin/bare-plugin.iml
+++ b/jps/jps-plugin/bare-plugin/bare-plugin.iml
@@ -7,9 +7,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
-    <orderEntry type="module" module-name="jps-plugin" />
     <orderEntry type="library" name="idea-full" level="project" />
+    <orderEntry type="module" module-name="jps-plugin" />
+    <orderEntry type="library" name="kotlin-runtime" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml
index a4e8a5a1756..6878e4f6683 100644
--- a/jps/jps-plugin/jps-plugin.iml
+++ b/jps/jps-plugin/jps-plugin.iml
@@ -10,16 +10,16 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="ide-compiler-runner" />
     <orderEntry type="module" module-name="cli-common" />
-    <orderEntry type="module" module-name="util" />
     <orderEntry type="library" name="jps" level="project" />
     <orderEntry type="library" scope="TEST" name="jps-test" level="project" />
     <orderEntry type="library" scope="TEST" name="idea-full" level="project" />
     <orderEntry type="module" module-name="backend" scope="TEST" />
     <orderEntry type="module" module-name="descriptors" />
     <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="module" module-name="serialization" />
+    <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
     <orderEntry type="library" name="asm" level="project" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>
\ No newline at end of file