From 23ae5ae57c7c59a00355e8e5bf56c77c07c470a9 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <Nikolay.Krasko@jetbrains.com>
Date: Fri, 3 Jul 2015 10:40:48 +0300
Subject: [PATCH] Remove own idea runtime and reflect jars

---
 update_dependencies.xml | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/update_dependencies.xml b/update_dependencies.xml
index f775fc2efbe..10ca0e8ca2d 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -652,6 +652,19 @@
                         </else>
                     </if>
 
+                    <!--
+                         This one needs to be deleted because otherwise it gets onto the classpath
+                         together with junit-4.10.jar and the classloading goes crazy that breaks
+                         many nice features of IDEA including diffs in the test console.
+                    -->
+                    <delete file="@{idea.dir}/lib/junit.jar"/>
+
+                    <!--
+                    Plugin depends on newer runtime and reflect jar from our bootstrap compiler.
+                    -->
+                    <delete file="@{idea.dir}/lib/kotlin-runtime.jar"/>
+                    <delete file="@{idea.dir}/lib/kotlin-reflect.jar"/>
+
                     <echo message="@{download.dir.intellij-core}/intellij-core-analysis.jar"/>
 
                     <mkdir dir="@{core-analysis}"/>
@@ -705,13 +718,6 @@
 
                     <mkdir dir="@{sources}"/>
                     <copy file="@{download.file.archive.sources}" tofile="@{sources}/sources.zip" overwrite="true"/>
-
-                    <!--
-                         This one needs to be deleted because otherwise it gets onto the classpath
-                         together with junit-4.10.jar and the classloading goes crazy that breaks
-                         many nice features of IDEA including diffs in the test console.
-                    -->
-                    <delete file="@{idea.dir}/lib/junit.jar"/>
                 </then>
             </if>