Move kotlin runtime library to end of classpath and remove duplicates with 'util' package

compiler/plugin-api/plugin-api.iml

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

compiler/tests/compiler-tests.iml

@@ -22,9 +22,9 @@
     <orderEntry type="module" module-name="js.serializer" />
     <orderEntry type="module" module-name="js.tests" />
     <orderEntry type="module" module-name="preloader" />
-    <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="android-compiler-plugin" scope="TEST" />
     <orderEntry type="module" module-name="js.serializer" />
     <orderEntry type="module" module-name="js.translator" scope="TEST" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>

idea/idea-completion/idea-completion.iml

@@ -8,19 +8,18 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
+    <orderEntry type="module" module-name="descriptors" />
     <orderEntry type="library" name="idea-full" level="project" />
     <orderEntry type="module" module-name="idea-analysis" />
-    <orderEntry type="module" module-name="descriptors" />
     <orderEntry type="module" module-name="descriptor.loader.java" />
     <orderEntry type="module" module-name="light-classes" />
     <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="idea-core" />
     <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="module" module-name="idea-test-framework" scope="TEST" />
     <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
     <orderEntry type="library" scope="RUNTIME" name="junit-plugin" level="project" />
     <orderEntry type="module" module-name="idea" scope="RUNTIME" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>

idea/idea-core/idea-core.iml

@@ -7,13 +7,12 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
+    <orderEntry type="module" module-name="descriptors" />
     <orderEntry type="library" name="idea-full" level="project" />
     <orderEntry type="module" module-name="idea-analysis" />
-    <orderEntry type="module" module-name="descriptors" />
     <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="light-classes" />
     <orderEntry type="module" module-name="frontend.java" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>

idea/idea-test-framework/idea-test-framework.iml

@@ -7,12 +7,11 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
     <orderEntry type="module" module-name="compiler-tests" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="library" name="idea-full" level="project" />
     <orderEntry type="module" module-name="idea-analysis" />
-    <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="idea-core" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>

js/js.inliner/js.inliner.iml

@@ -11,8 +11,8 @@
     <orderEntry type="module" module-name="descriptors" />
     <orderEntry type="module" module-name="js.dart-ast" />
     <orderEntry type="module" module-name="js.translator" />
-    <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="js.parser" />
     <orderEntry type="module" module-name="frontend" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>

js/js.serializer/js.serializer.iml

@@ -9,8 +9,8 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="serialization" />
-    <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="util" />
   </component>
 </module>

plugins/android-compiler-plugin/android-compiler-plugin.iml

@@ -11,7 +11,6 @@
     <orderEntry type="module" module-name="plugin-api" exported="" />
     <orderEntry type="module" module-name="frontend" exported="" />
     <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
     <orderEntry type="module" module-name="cli" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="backend" scope="PROVIDED" />

plugins/android-idea-plugin/android-idea-plugin.iml

@@ -8,7 +8,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
     <orderEntry type="module" module-name="android-compiler-plugin" exported="" />
     <orderEntry type="library" exported="" scope="PROVIDED" name="android-plugin" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="idea-full" level="project" />
@@ -17,5 +16,6 @@
     <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="library" name="kotlin-runtime" level="project" />
   </component>
 </module>

plugins/android-jps-plugin/android-jps-plugin.iml

@@ -11,7 +11,6 @@
     <orderEntry type="module" module-name="jps-plugin" scope="PROVIDED" />
     <orderEntry type="library" scope="PROVIDED" name="jps" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="android-plugin" level="project" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
     <orderEntry type="module" module-name="android-compiler-plugin" />
     <orderEntry type="module" module-name="util" scope="PROVIDED" />
     <orderEntry type="library" scope="TEST" name="jps-test" level="project" />