From cbbf8dec7eb18552d9dfe39ab14add943639e02b Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Mon, 1 Jun 2015 18:48:34 +0300
Subject: [PATCH] Drop ant-1.7 from project, advance Ant to 1.8.2

Ant 1.8.2 has the API (namely,
CompilerAdapterExtension#getSupportedFileExtensions) which will allow to fix a
critical bug in <withKotlin/> task (see KT-7870)
---
 .idea/libraries/ant.xml     | 14 ++++++++++++++
 .idea/libraries/ant_1_7.xml | 21 ---------------------
 ant/ant.iml                 |  2 +-
 build.xml                   |  2 +-
 update_dependencies.xml     |  5 ++---
 5 files changed, 18 insertions(+), 26 deletions(-)
 create mode 100644 .idea/libraries/ant.xml
 delete mode 100644 .idea/libraries/ant_1_7.xml

diff --git a/.idea/libraries/ant.xml b/.idea/libraries/ant.xml
new file mode 100644
index 00000000000..30d85a51b20
--- /dev/null
+++ b/.idea/libraries/ant.xml
@@ -0,0 +1,14 @@
+<component name="libraryTable">
+  <library name="ant">
+    <ANNOTATIONS>
+      <root url="file://$PROJECT_DIR$/annotations" />
+    </ANNOTATIONS>
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/dependencies/ant-1.8/lib/ant.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/dependencies/apache-ant-1.8.2-src.zip!/apache-ant-1.8.2/src/main" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/ant_1_7.xml b/.idea/libraries/ant_1_7.xml
deleted file mode 100644
index 88ad8f660fc..00000000000
--- a/.idea/libraries/ant_1_7.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<component name="libraryTable">
-  <library name="ant-1.7">
-    <ANNOTATIONS>
-      <root url="file://$PROJECT_DIR$/annotations" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/dependencies/ant-1.7/lib/ant.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/dependencies/apache-ant-1.7.0-src.zip!/apache-ant-1.7.0/src/etc/testcases/core/loaderref/src" />
-      <root url="jar://$PROJECT_DIR$/dependencies/apache-ant-1.7.0-src.zip!/apache-ant-1.7.0/src/etc/testcases/core/containersrc" />
-      <root url="jar://$PROJECT_DIR$/dependencies/apache-ant-1.7.0-src.zip!/apache-ant-1.7.0/src/etc/testcases/types/assertions" />
-      <root url="jar://$PROJECT_DIR$/dependencies/apache-ant-1.7.0-src.zip!/apache-ant-1.7.0/src/etc/testcases/taskdefs/apt" />
-      <root url="jar://$PROJECT_DIR$/dependencies/apache-ant-1.7.0-src.zip!/apache-ant-1.7.0/src/etc/testcases/taskdefs/rmic/src" />
-      <root url="jar://$PROJECT_DIR$/dependencies/apache-ant-1.7.0-src.zip!/apache-ant-1.7.0/src/etc/testcases/taskdefs/fixcrlf/input" />
-      <root url="jar://$PROJECT_DIR$/dependencies/apache-ant-1.7.0-src.zip!/apache-ant-1.7.0/src/etc/testcases/taskdefs/fixcrlf/expected" />
-      <root url="jar://$PROJECT_DIR$/dependencies/apache-ant-1.7.0-src.zip!/apache-ant-1.7.0/src/main" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/ant/ant.iml b/ant/ant.iml
index c7770d1e52b..8b81457744b 100644
--- a/ant/ant.iml
+++ b/ant/ant.iml
@@ -7,7 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="ant-1.7" level="project" />
+    <orderEntry type="library" name="ant" level="project" />
     <orderEntry type="library" name="kotlin-runtime" level="project" />
     <orderEntry type="module" module-name="preloader" />
   </component>
diff --git a/build.xml b/build.xml
index 118be654e8a..7350855833a 100644
--- a/build.xml
+++ b/build.xml
@@ -577,7 +577,7 @@
             <classpath>
                 <file file="${bootstrap.runtime}"/>
                 <file file="${bootstrap.reflect}"/>
-                <pathelement location="${dependencies.dir}/ant-1.7/lib/ant.jar"/>
+                <pathelement location="${dependencies.dir}/ant-1.8/lib/ant.jar"/>
                 <pathelement location="${kotlin-home}/lib/kotlin-preloader.jar"/>
             </classpath>
         </javac2>
diff --git a/update_dependencies.xml b/update_dependencies.xml
index 5c9223eb8f0..0025eb8e114 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -146,9 +146,8 @@
         <get src="http://jarjar.googlecode.com/files/jarjar-1.4.jar" dest="dependencies/download/jarjar-1.4.jar" usetimestamp="true"/>
         <copy file="dependencies/download/jarjar-1.4.jar" tofile="dependencies/jarjar.jar" overwrite="true"/>
 
-        <!-- ant 1.7.0, 1.8.0 -->
-        <get-ant-library version="1.7.0" folderName="ant-1.7"/>
-        <get-ant-library version="1.8.0" folderName="ant-1.8"/>
+        <!-- ant 1.8.2 -->
+        <get-ant-library version="1.8.2" folderName="ant-1.8"/>
 
         <!-- dx.jar -->
         <property name="android-build-tools.zip" value="build-tools_r21.1.1-linux.zip"/>