summaryrefslogtreecommitdiff
path: root/libre/proguard/proguard-fix_build.patch
blob: 2d0c7e5e56b45664565c44bf7e32e097b5b4be04 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
--- proguard5.2.1.orig/buildscripts/build.xml	2015-03-11 10:31:58.000000000 -0500
+++ proguard5.2.1/buildscripts/build.xml	2016-07-04 09:35:18.286198528 -0500
@@ -4,16 +4,17 @@
          default = "all"
          basedir = "..">
 
-  <property file = "build/build.properties"/>
+  <property file = "buildscripts/build.properties"/>
   <property name = "src"     value = "src"/>
   <property name = "classes" value = "classes"/>
   <property name = "lib"     value = "lib"/>
 
-  <property name = "gradle.jar1" value = "${gradle.home}/lib/plugins/gradle-plugins-2.2.1.jar"/>
-  <property name = "gradle.jar2" value = "${gradle.home}/lib/gradle-base-services-2.2.1.jar"/>
-  <property name = "gradle.jar3" value = "${gradle.home}/lib/gradle-base-services-groovy-2.2.1.jar"/>
-  <property name = "gradle.jar4" value = "${gradle.home}/lib/gradle-core-2.2.1.jar"/>
-  <property name = "gradle.jar5" value = "${gradle.home}/lib/groovy-all-2.3.6.jar"/>
+  <property name = "gradle.jar1" value = "${gradle.home}/lib/plugins/gradle-plugins-2.14.jar"/>
+  <property name = "gradle.jar2" value = "${gradle.home}/lib/gradle-base-services-2.14.jar"/>
+  <property name = "gradle.jar3" value = "${gradle.home}/lib/gradle-base-services-groovy-2.14.jar"/>
+  <property name = "gradle.jar4" value = "${gradle.home}/lib/gradle-core-2.14.jar"/>
+  <property name = "gradle.jar5" value = "${gradle.home}/lib/groovy-all-2.4.4.jar"/>
+  <property name = "gradle.jar6" value = "${gradle.home}/lib/gradle-logging-2.14.jar"/>
   <property name = "wtk.jar"     value = "${wtk.home}/wtklib/kenv.zip"/>
 
   <target name = "all"     depends = "basic,options"/>
@@ -130,6 +131,7 @@
             <available file="${gradle.jar3}"/>
             <available file="${gradle.jar4}"/>
             <available file="${gradle.jar5}"/>
+            <available file="${gradle.jar6}"/>
           </and>
         </not>
       </condition>
@@ -148,6 +150,7 @@
         <path location="${gradle.jar3}"/>
         <path location="${gradle.jar4}"/>
         <path location="${gradle.jar5}"/>
+        <path location="${gradle.jar6}"/>
       </classpath>
     </javac>