From fca9478fd865ac68bb155b744a278f42841636f1 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Wed, 2 Aug 2017 12:30:31 +0200
Subject: [PATCH] Tweak dependencies loading and other minor infrastructure
 changes

---
 .gitignore              |  1 +
 .idea/.name             |  2 +-
 update_dependencies.xml | 47 -----------------------------------------
 3 files changed, 2 insertions(+), 48 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9a2acdd1b15..5f368b9690d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,5 +21,6 @@ workspace.xml
 .gradle/
 build/
 !**/src/**/build
+*.iml
 !**/test/**/build
 
diff --git a/.idea/.name b/.idea/.name
index d5c8fb37f4b..c163a967b87 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-Kotlin
\ No newline at end of file
+kotlin
\ No newline at end of file
diff --git a/update_dependencies.xml b/update_dependencies.xml
index 93b63fd8c02..2320da3266f 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -271,53 +271,6 @@
             <mapper type="flatten"/>
         </unzip>
 
-        <local name="download.bootstrap.compiler"/>
-        <condition property="download.bootstrap.compiler">
-            <or>
-                <not>
-                    <isset property="teamcity.version"/>
-                </not>
-                <and>
-                    <istrue value="${kotlin.bootstrap.locator.force}"/>
-                    <istrue value="${bootstrap.build.no.tests}"/>
-                </and>
-            </or>
-        </condition>
-
-        <sequential if:set="download.bootstrap.compiler">
-            <!-- Download bootstrap compiler for local build -->
-            <download_teamcity_artifact
-                teamcity.server.url="https://teamcity.jetbrains.com"
-                build.locator.request="${kotlin.bootstrap.locator}"
-                artifact.path="kotlin-plugin-{build.number}.zip"
-                dest="${dependencies}/download/bootstrap-compiler.zip"
-                build.number.pattern="[\w-+\.]+"
-                usetimestamp="true"/>
-
-            <delete dir="${dependencies}/bootstrap-compiler" failonerror="false"/>
-            <unzip src="${dependencies}/download/bootstrap-compiler.zip" dest="${dependencies}/bootstrap-compiler"/>
-        </sequential>
-
-        <sequential unless:set="download.bootstrap.compiler">
-            <available file="${dependencies}/bootstrap-compiler/Kotlin" property="have.bootstrap.compiler"/>
-            <fail message="Bootstrap compiler is expected to be downloaded to '${dependencies}/bootstrap-compiler' by TeamCity" unless:set="have.bootstrap.compiler"/>
-            <echo message="Bootstrap compiler found in '${dependencies}/bootstrap-compiler'" if:set="have.bootstrap.compiler"/>
-        </sequential>
-
-        <local name="bootstrap.need.chmod"/>
-        <condition property="bootstrap.need.chmod">
-            <or>
-                <isset property="isMac" />
-                <isset property="isLinux" />
-            </or>
-        </condition>
-
-        <!-- Java can't manipulate permissions -->
-        <exec executable="find" if:set="bootstrap.need.chmod">
-            <arg value="${dependencies}/bootstrap-compiler/Kotlin/kotlinc/bin"/>
-            <arg line="-name 'kotlin*' ! -name '*.bat' -exec chmod a+x '{}' ;"/>
-        </exec>
-
         <get-protobuf-and-rename-packages/>
 
         <download_teamcity_artifact