From 05c3e7e81d0d19c1edfee16d8ef2830a01fc841b Mon Sep 17 00:00:00 2001
From: Zalim Bashorov <Zalim.Bashorov@jetbrains.com>
Date: Thu, 13 Apr 2017 15:55:30 +0300
Subject: [PATCH] Don't export kotlin-reflect form util module and add it
 explicitly where it's required.

Also, remove kotlin-reflect form container module.

Main goal is get rid of kotlin-reflect.jar from modules what required for minimal compiler.jar which can compile Kotlin only to JS to make it smaller.
---
 build-common/build-common.iml                    | 1 +
 compiler/cli/cli-common/cli-common.iml           | 1 +
 compiler/container/container.iml                 | 1 -
 compiler/daemon/daemon-client/daemon-client.iml  | 1 +
 compiler/frontend/frontend.iml                   | 1 +
 compiler/tests/compiler-tests.iml                | 1 +
 compiler/util/util.iml                           | 2 +-
 generators/generators.iml                        | 1 +
 idea/idea-android/idea-android.iml               | 1 +
 idea/idea-test-framework/idea-test-framework.iml | 1 +
 jps-plugin/jps-tests/jps-tests.iml               | 1 +
 11 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/build-common/build-common.iml b/build-common/build-common.iml
index ccbb7b1aa3e..1e267bfca8d 100644
--- a/build-common/build-common.iml
+++ b/build-common/build-common.iml
@@ -14,5 +14,6 @@
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="tests-common" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="idea-full" level="project" />
+    <orderEntry type="library" name="kotlin-reflect" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/compiler/cli/cli-common/cli-common.iml b/compiler/cli/cli-common/cli-common.iml
index bafec7375bb..a1c5121d684 100644
--- a/compiler/cli/cli-common/cli-common.iml
+++ b/compiler/cli/cli-common/cli-common.iml
@@ -11,5 +11,6 @@
     <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
     <orderEntry type="library" name="jps" level="project" />
     <orderEntry type="module" module-name="frontend.java" />
+    <orderEntry type="library" name="kotlin-reflect" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/compiler/container/container.iml b/compiler/container/container.iml
index 27d4bcddea0..a3cf4067c6c 100644
--- a/compiler/container/container.iml
+++ b/compiler/container/container.iml
@@ -10,7 +10,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-runtime" level="project" />
-    <orderEntry type="library" name="kotlin-reflect" level="project" />
     <orderEntry type="library" name="intellij-core" level="project" />
     <orderEntry type="library" scope="TEST" name="junit-4.12" level="project" />
     <orderEntry type="library" exported="" name="javax.inject" level="project" />
diff --git a/compiler/daemon/daemon-client/daemon-client.iml b/compiler/daemon/daemon-client/daemon-client.iml
index 8bf6dd7157f..f381935778f 100644
--- a/compiler/daemon/daemon-client/daemon-client.iml
+++ b/compiler/daemon/daemon-client/daemon-client.iml
@@ -12,5 +12,6 @@
     <orderEntry type="library" scope="PROVIDED" name="native-platform-uberjar" level="project" />
     <orderEntry type="module" module-name="cli-common" scope="PROVIDED" />
     <orderEntry type="module" module-name="descriptors" scope="PROVIDED" />
+    <orderEntry type="library" name="kotlin-reflect" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/compiler/frontend/frontend.iml b/compiler/frontend/frontend.iml
index 80953adda4f..38bac040012 100644
--- a/compiler/frontend/frontend.iml
+++ b/compiler/frontend/frontend.iml
@@ -18,5 +18,6 @@
     <orderEntry type="library" exported="" name="kotlin-script-runtime" level="project" />
     <orderEntry type="module" module-name="script.runtime" />
     <orderEntry type="library" name="javaslang" level="project" />
+    <orderEntry type="library" name="kotlin-reflect" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/compiler/tests/compiler-tests.iml b/compiler/tests/compiler-tests.iml
index 503171ef57c..035255ef407 100644
--- a/compiler/tests/compiler-tests.iml
+++ b/compiler/tests/compiler-tests.iml
@@ -36,5 +36,6 @@
     <orderEntry type="module" module-name="ir.ir2cfg" scope="TEST" />
     <orderEntry type="library" name="idea-full" level="project" />
     <orderEntry type="library" name="javaslang" level="project" />
+    <orderEntry type="library" name="kotlin-reflect" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/compiler/util/util.iml b/compiler/util/util.iml
index b45f2fc33fb..f9656a0d7ae 100644
--- a/compiler/util/util.iml
+++ b/compiler/util/util.iml
@@ -9,7 +9,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="util.runtime" exported="" />
-    <orderEntry type="library" exported="" name="kotlin-reflect" level="project" />
+    <orderEntry type="library" name="kotlin-reflect" level="project" />
     <orderEntry type="module" module-name="Kotlin" exported="" />
     <orderEntry type="library" name="jps-model" level="project" />
     <orderEntry type="module" module-name="descriptors" />
diff --git a/generators/generators.iml b/generators/generators.iml
index 29771fc715e..b3b4c6ff84b 100644
--- a/generators/generators.iml
+++ b/generators/generators.iml
@@ -41,5 +41,6 @@
     <orderEntry type="module" module-name="idea-maven" scope="TEST" />
     <orderEntry type="module" module-name="uast-kotlin" scope="TEST" />
     <orderEntry type="module" module-name="kapt3" scope="TEST" />
+    <orderEntry type="library" name="kotlin-reflect" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/idea/idea-android/idea-android.iml b/idea/idea-android/idea-android.iml
index fac324c777e..021e5defa29 100644
--- a/idea/idea-android/idea-android.iml
+++ b/idea/idea-android/idea-android.iml
@@ -22,5 +22,6 @@
     <orderEntry type="module" module-name="idea-core" />
     <orderEntry type="module" module-name="lint-idea" scope="TEST" />
     <orderEntry type="library" name="uast-java" level="project" />
+    <orderEntry type="library" name="kotlin-reflect" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/idea/idea-test-framework/idea-test-framework.iml b/idea/idea-test-framework/idea-test-framework.iml
index a6ee8f3f27c..68bbe513d78 100644
--- a/idea/idea-test-framework/idea-test-framework.iml
+++ b/idea/idea-test-framework/idea-test-framework.iml
@@ -15,5 +15,6 @@
     <orderEntry type="module" module-name="util" />
     <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
     <orderEntry type="module" module-name="idea" scope="TEST" />
+    <orderEntry type="library" name="kotlin-reflect" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/jps-plugin/jps-tests/jps-tests.iml b/jps-plugin/jps-tests/jps-tests.iml
index 6100f2af4f5..1772d1a64c3 100644
--- a/jps-plugin/jps-tests/jps-tests.iml
+++ b/jps-plugin/jps-tests/jps-tests.iml
@@ -18,5 +18,6 @@
     <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="incremental-compilation-impl" scope="TEST" />
+    <orderEntry type="library" name="kotlin-reflect" level="project" />
   </component>
 </module>
\ No newline at end of file