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

compiler/android-tests/android-tests.iml

@@ -13,9 +13,8 @@
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="backend" />
     <orderEntry type="library" name="jps-test" level="project" />
-    <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="generators" scope="TEST" />
     <orderEntry type="library" name="idea-full" level="project" />
+    <orderEntry type="module" module-name="util" />
   </component>
-</module>
-
+</module>

compiler/backend-common/backend-common.iml

@@ -7,9 +7,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="module" module-name="frontend" />
     <orderEntry type="library" name="intellij-core" level="project" />
+    <orderEntry type="module" module-name="frontend" />
+    <orderEntry type="module" module-name="util" />
   </component>
-</module>
-
+</module>

compiler/backend/backend.iml

@@ -12,9 +12,8 @@
     <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
     <orderEntry type="library" name="javax.inject" level="project" />
     <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="library" name="protobuf-java" level="project" />
     <orderEntry type="module" module-name="serialization.jvm" />
-    <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="backend-common" exported="" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>

compiler/builtins-serializer/builtins-serializer.iml

@@ -8,11 +8,10 @@
     </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" />
     <orderEntry type="module" module-name="util" />
-    <orderEntry type="library" name="intellij-core" level="project" />
   </component>
-</module>
-
+</module>

compiler/cli/cli.iml

@@ -15,9 +15,9 @@
     <orderEntry type="module" module-name="js.translator" />
     <orderEntry type="library" name="jline" level="project" />
     <orderEntry type="module" module-name="cli-common" exported="" />
-    <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="backend-common" />
     <orderEntry type="module" module-name="serialization" />
     <orderEntry type="module" module-name="serialization.jvm" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>

compiler/frontend.java/frontend.java.iml

@@ -13,7 +13,6 @@
     <orderEntry type="module" module-name="serialization" />
     <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="module" module-name="descriptor.loader.java" exported="" />
-    <orderEntry type="module" module-name="util.runtime" />
     <orderEntry type="module" module-name="util" />
   </component>
 </module>

compiler/frontend/frontend.iml

@@ -10,9 +10,8 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
     <orderEntry type="library" name="javax.inject" level="project" />
-    <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="serialization" />
     <orderEntry type="module" module-name="descriptors" exported="" />
+    <orderEntry type="module" module-name="util" />
   </component>
-</module>
-
+</module>

compiler/tests/compiler-tests.iml

@@ -7,7 +7,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="protobuf-java" level="project" />
     <orderEntry type="module" module-name="backend" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="frontend.java" />
@@ -17,9 +16,9 @@
     <orderEntry type="library" name="dx-android" level="project" />
     <orderEntry type="module" module-name="serialization" />
     <orderEntry type="module" module-name="serialization.jvm" />
-    <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="builtins-serializer" />
     <orderEntry type="module" module-name="js.frontend" />
     <orderEntry type="module" module-name="js.tests" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>

compiler/util/util.iml

@@ -10,8 +10,6 @@
     <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="util.runtime" exported="" />
     <orderEntry type="module" module-name="Kotlin" exported="" />
-    <orderEntry type="library" exported="" name="kotlin-runtime" level="project" />
     <orderEntry type="library" name="jps-model" level="project" />
   </component>
-</module>
-
+</module>

core/descriptor.loader.java/descriptor.loader.java.iml

@@ -11,6 +11,5 @@
     <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="library" name="javax.inject" level="project" />
     <orderEntry type="module" module-name="util.runtime" />
-    <orderEntry type="library" name="protobuf-java" level="project" />
   </component>
 </module>

core/serialization.jvm/serialization.jvm.iml

@@ -7,8 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="protobuf-java" level="project" />
     <orderEntry type="module" module-name="serialization" />
+    <orderEntry type="module" module-name="util.runtime" />
   </component>
-</module>
-
+</module>

core/serialization/serialization.iml

@@ -9,8 +9,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="protobuf-java" level="project" />
     <orderEntry type="library" name="trove4j" level="project" />
-    <orderEntry type="module" module-name="util.runtime" exported="" />
     <orderEntry type="module" module-name="descriptors" exported="" />
+    <orderEntry type="module" module-name="util.runtime" />
   </component>
-</module>
-
+</module>

generators/generators.iml

@@ -19,11 +19,10 @@
     <orderEntry type="module" module-name="serialization" scope="TEST" />
     <orderEntry type="module" module-name="js.tests" scope="TEST" />
     <orderEntry type="module" module-name="jps-plugin" scope="TEST" />
-    <orderEntry type="module" module-name="util" scope="TEST" />
     <orderEntry type="module" module-name="j2k" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="kotlin-runtime" level="project" />
     <orderEntry type="library" scope="TEST" name="jps-test" level="project" />
-    <orderEntry type="module" module-name="js.dart-ast" />
-    <orderEntry type="module" module-name="js.frontend" />
+    <orderEntry type="module" module-name="js.dart-ast" scope="TEST" />
+    <orderEntry type="module" module-name="js.frontend" scope="TEST" />
+    <orderEntry type="module" module-name="util" scope="TEST" />
   </component>
 </module>

ide-compiler-runner/ide-compiler-runner.iml

@@ -9,8 +9,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="idea-full" level="project" />
     <orderEntry type="module" module-name="cli-common" />
-    <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="preloader" exported="" />
+    <orderEntry type="module" module-name="util" />
   </component>
-</module>
-
+</module>

idea/ide-common/ide-common.iml

@@ -18,8 +18,8 @@
       </library>
     </orderEntry>
     <orderEntry type="library" name="guava" level="project" />
-    <orderEntry type="module" module-name="util" />
     <orderEntry type="library" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="frontend.java" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>

idea/idea-analysis/idea-analysis.iml

@@ -13,7 +13,6 @@
     <orderEntry type="module" module-name="light-classes" />
     <orderEntry type="library" scope="PROVIDED" name="properties" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="java-i18n" level="project" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="gradle-and-groovy-plugin" level="project" />
     <orderEntry type="module" module-name="serialization" />
     <orderEntry type="module" module-name="serialization.jvm" />
@@ -29,9 +28,9 @@
       </library>
     </orderEntry>
     <orderEntry type="library" name="guava" level="project" />
-    <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="js.frontend" />
     <orderEntry type="library" name="trove4j" level="project" />
     <orderEntry type="module" module-name="ide-common" exported="" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>

idea/idea.iml

@@ -34,16 +34,15 @@
     <orderEntry type="module" module-name="cli-common" />
     <orderEntry type="library" scope="PROVIDED" name="properties" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="java-i18n" level="project" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="gradle-and-groovy-plugin" level="project" />
     <orderEntry type="module" module-name="serialization" />
     <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="library" scope="PROVIDED" name="maven" level="project" />
-    <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="eval4j" />
     <orderEntry type="module" module-name="idea-analysis" exported="" />
     <orderEntry type="module" module-name="kotlin-android-plugin" />
     <orderEntry type="module" module-name="js.frontend" />
     <orderEntry type="library" scope="PROVIDED" name="coverage-plugin" level="project" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>

idea/kotlin-android-plugin/kotlin-android-plugin.iml

@@ -8,9 +8,8 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="android-plugin" level="project" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
     <orderEntry type="library" name="idea-full" level="project" />
     <orderEntry type="module" module-name="frontend" />
+    <orderEntry type="module" module-name="util" />
   </component>
-</module>
-
+</module>

j2k/j2k.iml

@@ -8,12 +8,12 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="util" />
     <orderEntry type="library" name="idea-full" level="project" />
+    <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="module" module-name="light-classes" />
     <orderEntry type="module" module-name="idea" scope="TEST" />
     <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>

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>

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>

js/js.dart-ast/js.dart-ast.iml

@@ -8,8 +8,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
     <orderEntry type="module" module-name="descriptors" />
+    <orderEntry type="module" module-name="util" />
   </component>
-</module>
-
+</module>

js/js.frontend/js.frontend.iml

@@ -7,10 +7,9 @@
     </content>
     <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="util" />
+    <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="js.dart-ast" exported="" />
+    <orderEntry type="module" module-name="util" />
   </component>
-</module>
-
+</module>

js/js.inliner/js.inliner.iml

@@ -8,10 +8,9 @@
     <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.dart-ast" />
     <orderEntry type="module" module-name="js.translator" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
-    <orderEntry type="module" module-name="descriptors" />
+    <orderEntry type="module" module-name="util" />
   </component>
-</module>
-
+</module>

js/js.parser/js.parser.iml

@@ -7,8 +7,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="js.dart-ast" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
     <orderEntry type="library" name="intellij-core" level="project" />
+    <orderEntry type="module" module-name="js.dart-ast" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>

js/js.tests/js.tests.iml

@@ -14,8 +14,7 @@
     <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="util" />
     <orderEntry type="module" module-name="backend-common" scope="TEST" />
+    <orderEntry type="module" module-name="util" />
   </component>
-</module>
-
+</module>

js/js.translator/js.translator.iml

@@ -9,11 +9,11 @@
     <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="util" />
     <orderEntry type="module" module-name="backend-common" />
     <orderEntry type="module" module-name="js.dart-ast" exported="" />
     <orderEntry type="module" module-name="js.frontend" exported="" />
     <orderEntry type="module" module-name="js.inliner" exported="" />
     <orderEntry type="module" module-name="js.parser" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>