From 74cd449d868ddd2487d8c0b51477d112056e365a Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Thu, 15 Oct 2015 18:44:38 +0300
Subject: [PATCH] Fix runtime copying for IDEA run configuration

- 'overwrite' is false by default, so now it's set to true explicitly
- copy the runtime to all other plugins as well because runtimes from those
  plugins sometimes appear before the Kotlin one
---
 .idea/artifacts/KotlinAndroidExtensions.xml | 8 ++++++--
 idea-runner/runner.xml                      | 5 +++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.idea/artifacts/KotlinAndroidExtensions.xml b/.idea/artifacts/KotlinAndroidExtensions.xml
index d9c051d3dc0..5d5242b5c18 100644
--- a/.idea/artifacts/KotlinAndroidExtensions.xml
+++ b/.idea/artifacts/KotlinAndroidExtensions.xml
@@ -1,7 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <component name="ArtifactManager">
   <artifact name="KotlinAndroidExtensions">
     <output-path>$PROJECT_DIR$/out/artifacts/KotlinAndroidExtensions</output-path>
+    <properties id="ant-postprocessing">
+      <options enabled="true">
+        <file>file://$PROJECT_DIR$/idea-runner/runner.xml</file>
+        <target>copy-runtime-for-idea-plugin</target>
+      </options>
+    </properties>
     <root id="root">
       <element id="directory" name="lib">
         <element id="archive" name="kotlin-android-extensions.jar">
@@ -15,7 +20,6 @@
         <element id="archive" name="android-compiler-plugin.jar">
           <element id="module-output" name="android-compiler-plugin" />
         </element>
-        <element id="file-copy" path="$PROJECT_DIR$/dist/kotlinc/lib/kotlin-runtime.jar" />
       </element>
     </root>
   </artifact>
diff --git a/idea-runner/runner.xml b/idea-runner/runner.xml
index d4684a0ccee..dc900b9540c 100644
--- a/idea-runner/runner.xml
+++ b/idea-runner/runner.xml
@@ -48,8 +48,9 @@
         </condition>
 
         <!--suppress AntResolveInspection -->
-        <copy file="${runtime.to.copy}" tofile="${artifact.output.path}/lib/kotlin-runtime.jar"/>
-        <copy file="${reflect.to.copy}" tofile="${artifact.output.path}/lib/kotlin-reflect.jar"/>
+        <copy file="${runtime.to.copy}" tofile="${artifact.output.path}/lib/kotlin-runtime.jar" overwrite="true"/>
+        <!--suppress AntResolveInspection -->
+        <copy file="${reflect.to.copy}" tofile="${artifact.output.path}/lib/kotlin-reflect.jar" overwrite="true"/>
     </target>
 
     <target name="copy-runtime-for-jps-plugin" if="bootstrap.or.local.build">