From d7b9f38d19cadf66afa18fff1b30cd51c405e616 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Tue, 8 Aug 2017 18:06:01 +0300
Subject: [PATCH] build scripts: remove dependency on Kotlin library

Build scripts dynamically add Kotlin compiler JARs into classpath so if a build scripts module depends on KotlinJavaRuntime library it may end up with Kotlin JARs from two different version of Kotlin in classpath and compilation may fail (IDEA-177205). To fix the problem Kotlin files were extracted into a separate 'images-build-scripts' module and KotlinJavaRuntime library was removed from dependencies of build script modules. This won't be needed when we change build scripts to start compilation in a separate process.
---
 .idea/modules.xml                              |  1 +
 community-main.iml                             |  1 +
 .../icons/images-build-scripts.iml             | 18 ++++++++++++++++++
 .../build-scripts/platform-build-scripts.iml   |  3 ---
 4 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 platform/build-scripts/icons/images-build-scripts.iml

diff --git a/.idea/modules.xml b/.idea/modules.xml
index 7d75daf3b055..f0b982ae9579 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -119,6 +119,7 @@
       <module fileurl="file://$PROJECT_DIR$/java/idea-ui/idea-ui.iml" filepath="$PROJECT_DIR$/java/idea-ui/idea-ui.iml" group="java" />
       <module fileurl="file://$PROJECT_DIR$/java/idea-ui/idea-ui-tests.iml" filepath="$PROJECT_DIR$/java/idea-ui/idea-ui-tests.iml"/>
       <module fileurl="file://$PROJECT_DIR$/images/images.iml" filepath="$PROJECT_DIR$/images/images.iml" group="platform" />
+      <module fileurl="file://$PROJECT_DIR$/platform/build-scripts/icons/images-build-scripts.iml" filepath="$PROJECT_DIR$/platform/build-scripts/icons/images-build-scripts.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/platform/indexing-api/indexing-api.iml" filepath="$PROJECT_DIR$/platform/indexing-api/indexing-api.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/platform/indexing-impl/indexing-impl.iml" filepath="$PROJECT_DIR$/platform/indexing-impl/indexing-impl.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/android/tools-base/instant-run/instant-run-annotations/instant-run-annotations.iml" filepath="$PROJECT_DIR$/android/tools-base/instant-run/instant-run-annotations/instant-run-annotations.iml" group="android/sdktools/instant-run" />
diff --git a/community-main.iml b/community-main.iml
index c7114369d60e..f3fdf6e1e7d0 100644
--- a/community-main.iml
+++ b/community-main.iml
@@ -122,6 +122,7 @@
     <orderEntry type="module" module-name="terminal" />
     <orderEntry type="module" module-name="javac-ref-scanner-8" scope="RUNTIME" />
     <orderEntry type="module" module-name="platform-build-scripts" scope="TEST" />
+    <orderEntry type="module" module-name="images-build-scripts" scope="TEST" />
     <orderEntry type="module" module-name="android-plugin" />
     <orderEntry type="module" module-name="stats-collector" />
     <orderEntry type="module" module-name="jetCheck" scope="TEST" />
diff --git a/platform/build-scripts/icons/images-build-scripts.iml b/platform/build-scripts/icons/images-build-scripts.iml
new file mode 100644
index 000000000000..d8855041fe1b
--- /dev/null
+++ b/platform/build-scripts/icons/images-build-scripts.iml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="jps-model-api" />
+    <orderEntry type="module" module-name="jps-model-impl" />
+    <orderEntry type="module" module-name="jps-model-serialization" />
+    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
+    <orderEntry type="module" module-name="util" />
+    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/platform/build-scripts/platform-build-scripts.iml b/platform/build-scripts/platform-build-scripts.iml
index 58d178acfe45..27b570b7b563 100644
--- a/platform/build-scripts/platform-build-scripts.iml
+++ b/platform/build-scripts/platform-build-scripts.iml
@@ -4,8 +4,6 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/groovy" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/icons/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/icons/tests" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
@@ -36,7 +34,6 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
   </component>
 </module>
\ No newline at end of file