11 files changed, 34 insertions, 23 deletions
diff --git a/build/README b/build/README
index 36a235b..89d3904 100644
--- a/build/README
+++ b/build/README
@@ -37,4 +37,4 @@ Enjoy!
 
 http://proguard.sourceforge.net/
 
-Copyright (c) 2002-2013 Eric Lafortune (eric@graphics.cornell.edu)
+Copyright (c) 2002-2014 Eric Lafortune (eric@graphics.cornell.edu)
diff --git a/build/build.sh b/build/build.sh
index adb2ee7..ad51c04 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -30,10 +30,11 @@ WTK_PLUGIN=proguard/wtk/ProGuardObfuscator
 
 ANT_JAR=$ANT_HOME/lib/ant.jar
 GRADLE_PATH=\
-$GRADLE_HOME/lib/plugins/gradle-plugins-1.3.jar:\
-$GRADLE_HOME/lib/gradle-base-services-1.3.jar:\
-$GRADLE_HOME/lib/gradle-core-1.3.jar:\
-$GRADLE_HOME/lib/groovy-all-1.8.6.jar
+$GRADLE_HOME/lib/plugins/gradle-plugins-2.1.jar:\
+$GRADLE_HOME/lib/gradle-base-services-2.1.jar:\
+$GRADLE_HOME/lib/gradle-base-services-groovy-2.1.jar:\
+$GRADLE_HOME/lib/gradle-core-2.1.jar:\
+$GRADLE_HOME/lib/groovy-all-2.3.6.jar
 WTK_JAR=$WTK_HOME/wtklib/kenv.zip
 
 PROGUARD_JAR=$LIB/proguard.jar
diff --git a/build/build.xml b/build/build.xml
index 7c67c68..0dc4bf4 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -9,10 +9,11 @@
   <property name = "classes" value = "classes"/>
   <property name = "lib"     value = "lib"/>
 
-  <property name = "gradle.jar1" value = "${gradle.home}/lib/plugins/gradle-plugins-1.3.jar"/>
-  <property name = "gradle.jar2" value = "${gradle.home}/lib/gradle-base-services-1.3.jar"/>
-  <property name = "gradle.jar3" value = "${gradle.home}/lib/gradle-core-1.3.jar"/>
-  <property name = "gradle.jar4" value = "${gradle.home}/lib/groovy-all-1.8.6.jar"/>
+  <property name = "gradle.jar1" value = "${gradle.home}/lib/plugins/gradle-plugins-2.1.jar"/>
+  <property name = "gradle.jar2" value = "${gradle.home}/lib/gradle-base-services-2.1.jar"/>
+  <property name = "gradle.jar3" value = "${gradle.home}/lib/gradle-base-services-groovy-2.1.jar"/>
+  <property name = "gradle.jar4" value = "${gradle.home}/lib/gradle-core-2.1.jar"/>
+  <property name = "gradle.jar5" value = "${gradle.home}/lib/groovy-all-2.3.6.jar"/>
   <property name = "wtk.jar"     value = "${wtk.home}/wtklib/kenv.zip"/>
 
   <target name = "all"     depends = "basic,options"/>
@@ -128,6 +129,7 @@
             <available file="${gradle.jar2}"/>
             <available file="${gradle.jar3}"/>
             <available file="${gradle.jar4}"/>
+            <available file="${gradle.jar5}"/>
           </and>
         </not>
       </condition>
@@ -145,6 +147,7 @@
         <path location="${gradle.jar2}"/>
         <path location="${gradle.jar3}"/>
         <path location="${gradle.jar4}"/>
+        <path location="${gradle.jar5}"/>
       </classpath>
     </javac>
 
diff --git a/build/makefile b/build/makefile
index 264a2ac..d5b1d7f 100644
--- a/build/makefile
+++ b/build/makefile
@@ -10,10 +10,11 @@ CLASSES = $(PROGUARD_HOME)/classes
 LIB     = $(PROGUARD_HOME)/lib
 
 ANT_JAR     = $(ANT_HOME)/lib/ant.jar
-GRADLE_JARS = $(GRADLE_HOME)/lib/plugins/gradle-plugins-1.3.jar \
-              $(GRADLE_HOME)/lib/gradle-base-services-1.3.jar \
-              $(GRADLE_HOME)/lib/gradle-core-1.3.jar \
-              $(GRADLE_HOME)/lib/groovy-all-1.8.6.jar
+GRADLE_JARS = $(GRADLE_HOME)/lib/plugins/gradle-plugins-2.1.jar \
+              $(GRADLE_HOME)/lib/gradle-base-services-2.1.jar \
+              $(GRADLE_HOME)/lib/gradle-base-services-groovy-2.1.jar \
+              $(GRADLE_HOME)/lib/gradle-core-2.1.jar \
+              $(GRADLE_HOME)/lib/groovy-all-2.3.6.jar
 WTK_JAR     = $(WTK_HOME)/wtklib/kenv.zip
 
 NOTHING:=
diff --git a/build/maven/ant/pom.xml b/build/maven/ant/pom.xml
index ab3bc52..5ef9bfa 100644
--- a/build/maven/ant/pom.xml
+++ b/build/maven/ant/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sf.proguard</groupId>
         <artifactId>proguard-parent</artifactId>
-        <version>4.10</version>
+        <version>5.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>proguard-anttask</artifactId>
diff --git a/build/maven/base/pom.xml b/build/maven/base/pom.xml
index e61471d..4a04b78 100644
--- a/build/maven/base/pom.xml
+++ b/build/maven/base/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sf.proguard</groupId>
         <artifactId>proguard-parent</artifactId>
-        <version>4.10</version>
+        <version>5.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>proguard-base</artifactId>
diff --git a/build/maven/gradle/pom.xml b/build/maven/gradle/pom.xml
index 86fa2fc..c43e2b6 100644
--- a/build/maven/gradle/pom.xml
+++ b/build/maven/gradle/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sf.proguard</groupId>
         <artifactId>proguard-parent</artifactId>
-        <version>4.10</version>
+        <version>5.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>proguard-gradle</artifactId>
@@ -60,19 +60,25 @@
         <dependency>
             <groupId>org.gradle</groupId>
             <artifactId>gradle-core</artifactId>
-            <version>1.3</version>
+            <version>2.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.gradle</groupId>
             <artifactId>gradle-base-services</artifactId>
-            <version>1.3</version>
+            <version>2.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.gradle</groupId>
+            <artifactId>gradle-base-services-groovy</artifactId>
+            <version>2.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-all</artifactId>
-            <version>2.0.6</version>
+            <version>2.3.6</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/build/maven/gui/pom.xml b/build/maven/gui/pom.xml
index 94d0100..f6add25 100644
--- a/build/maven/gui/pom.xml
+++ b/build/maven/gui/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sf.proguard</groupId>
         <artifactId>proguard-parent</artifactId>
-        <version>4.10</version>
+        <version>5.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>proguard-gui</artifactId>
diff --git a/build/maven/pom.xml b/build/maven/pom.xml
index 8f894ce..08073af 100644
--- a/build/maven/pom.xml
+++ b/build/maven/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>net.sf.proguard</groupId>
     <artifactId>proguard-parent</artifactId>
-    <version>4.10</version>
+    <version>5.1</version>
     <packaging>pom</packaging>
     <name>[${project.groupId}] ${project.artifactId}</name>
     <description>ProGuard is a free Java class file shrinker, optimizer, obfuscator, and preverifier.</description>
diff --git a/build/maven/retrace/pom.xml b/build/maven/retrace/pom.xml
index 382f9ee..e0994d4 100644
--- a/build/maven/retrace/pom.xml
+++ b/build/maven/retrace/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sf.proguard</groupId>
         <artifactId>proguard-parent</artifactId>
-        <version>4.10</version>
+        <version>5.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>proguard-retrace</artifactId>
diff --git a/build/maven/wtk/pom.xml b/build/maven/wtk/pom.xml
index fe00533..4c6db2b 100644
--- a/build/maven/wtk/pom.xml
+++ b/build/maven/wtk/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.sf.proguard</groupId>
         <artifactId>proguard-parent</artifactId>
-        <version>4.10</version>
+        <version>5.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>proguard-wtk-plugin</artifactId>