From f86bb119bb0f230376f0a5eff6e27cf0d07a9a79 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Thu, 30 Jul 2015 18:56:31 +0200
Subject: [PATCH] download ProGuard from Artifactory

---
 build.xml               |  7 ++++++-
 update_dependencies.xml | 16 ++++------------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/build.xml b/build.xml
index ca210f27c0e..d4f64e44992 100644
--- a/build.xml
+++ b/build.xml
@@ -490,7 +490,12 @@
     </target>
 
     <target name="compiler">
-        <taskdef resource="proguard/ant/task.properties" classpath="${dependencies.dir}/proguard.jar"/>
+        <taskdef resource="proguard/ant/task.properties">
+            <classpath>
+                <pathelement path="${dependencies.dir}/proguard.jar"/>
+                <pathelement path="${dependencies.dir}/proguard-anttask.jar"/>
+            </classpath>
+        </taskdef>
 
         <cleandir dir="${output}/classes/compiler"/>
 
diff --git a/update_dependencies.xml b/update_dependencies.xml
index 52579430adc..91127de4049 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -149,18 +149,6 @@
         <mkdir dir="dependencies"/>
         <mkdir dir="dependencies/download"/>
 
-        <!-- ProGuard -->
-        <get src="http://heanet.dl.sourceforge.net/project/proguard/proguard/5.1/proguard5.1.zip"
-             dest="dependencies/download/proguard5.1.zip" usetimestamp="true"/>
-
-        <delete file="dependencies/proguard.jar" failonerror="false"/>
-        <unzip src="dependencies/download/proguard5.1.zip" dest="dependencies">
-            <patternset>
-                <include name="proguard5.1/lib/proguard.jar"/>
-            </patternset>
-            <mapper type="flatten"/>
-        </unzip>
-
         <!-- ant contrib -->
         <get src="http://heanet.dl.sourceforge.net/project/ant-contrib/ant-contrib/1.0b3/ant-contrib-1.0b3-bin.zip"
              dest="dependencies/download/ant-contrib-1.0b3-bin.zip" usetimestamp="true"/>
@@ -173,6 +161,10 @@
             <mapper type="merge" to="ant-contrib.jar"/>
         </unzip>
 
+        <!-- ProGuard -->
+        <get-maven-library prefix="net/sf/proguard" lib="proguard-base" version="5.1" target.jar.name.base="proguard" src="false"/>
+        <get-maven-library prefix="net/sf/proguard" lib="proguard-anttask" version="5.1" target.jar.name.base="proguard-anttask" src="false"/>
+
         <!-- JarJar -->
         <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"/>