From e64d41a3307d0620a05e367bee081e1c806c07a7 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Mon, 29 Jun 2015 20:04:12 +0200
Subject: [PATCH] bundle Kotlin with IDEA: corrections after code review

---
 .idea/externalDependencies.xml | 14 ++++++++++++++
 build/download_kotlin.xml      |  1 +
 build/scripts/layouts.gant     |  1 -
 lib/.gitignore                 |  2 --
 4 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 .idea/externalDependencies.xml
 delete mode 100644 lib/.gitignore

diff --git a/.idea/externalDependencies.xml b/.idea/externalDependencies.xml
new file mode 100644
index 000000000000..5e97b5603233
--- /dev/null
+++ b/.idea/externalDependencies.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalDependencies">
+    <plugin id="DevKit" />
+    <plugin id="Git4Idea" />
+    <plugin id="JUnit" />
+    <plugin id="com.intellij.copyright" />
+    <plugin id="com.intellij.java-i18n" />
+    <plugin id="com.intellij.properties" />
+    <plugin id="com.intellij.uiDesigner" />
+    <plugin id="org.intellij.groovy" />
+    <plugin id="org.jetbrains.kotlin" min-version="0.12.613" max-version="0.12.614" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/build/download_kotlin.xml b/build/download_kotlin.xml
index 36e0de7f21ba..58d2a024c67c 100644
--- a/build/download_kotlin.xml
+++ b/build/download_kotlin.xml
@@ -12,6 +12,7 @@
   </target>
 
   <target name="download" depends="check_present" unless="kotlin.path">
+    <delete dir="${basedir}" includes="kotlin-plugin*.zip"/>
     <loadresource property="kotlin.build.number">
       <url url="https://teamcity.jetbrains.com/guestAuth/app/rest/buildTypes/id:${kotlin.build.type.id}/builds/status:SUCCESS,count:1/number"/>
     </loadresource>
diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index 31f0f876af5d..2a476831dbb2 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -696,7 +696,6 @@ def reorder(String home, String targetDirectory) {
     arg(value: "${home}/lib")
     classpath {
       projectBuilder.moduleRuntimeClasspath(findModule("util"), false).each {
-        println(it)
         pathelement(location: it)
       }
     }
diff --git a/lib/.gitignore b/lib/.gitignore
deleted file mode 100644
index 0ca1c5c32bae..000000000000
--- a/lib/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-kotlin-runtime.jar
-kotlin-reflect.jar