From 3947b4c9410086313a3b212d3da86436b4437496 Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor.tumbleson@gmail.com>
Date: Wed, 16 Jan 2013 19:18:32 -0600
Subject: [PATCH] cleaning up gradle build files, removing proguard

---
 brut.apktool/apktool-cli/build.gradle | 31 +---------------------
 brut.j.common/build.gradle            |  2 +-
 build.gradle                          | 37 +++++++++++++--------------
 3 files changed, 20 insertions(+), 50 deletions(-)

diff --git a/brut.apktool/apktool-cli/build.gradle b/brut.apktool/apktool-cli/build.gradle
index ea17046b..9eab2732 100644
--- a/brut.apktool/apktool-cli/build.gradle
+++ b/brut.apktool/apktool-cli/build.gradle
@@ -16,12 +16,7 @@
 
 version = apktoolversion
 
-configurations {
-    proguard
-}
-
 dependencies {
-  proguard 'net.sf.proguard:proguard-base:4.8'
   compile project(':brut.apktool:apktool-lib')
 }
 
@@ -33,28 +28,4 @@ gradle.taskGraph.whenReady {
       attributes("Main-Class": "brut.apktool.Main")
     }
   }
-}
-
-task proguard(type: JavaExec, dependsOn: jar) {
-    def outFile = jar.destinationDir.getPath() + '/' + jar.baseName + '-' + jar.version + '-small' + '.' + jar.extension
-    inputs.file jar.archivePath
-    outputs.file outFile
-
-    classpath = configurations.proguard
-    main = 'proguard.ProGuard'
-    args '-injars ' + jar.archivePath
-    args '-outjars ' + outFile
-    args '-dontobfuscate'
-    args '-libraryjars ' + System.properties['java.home'] + '/lib/rt.jar'
-    args '-dontoptimize'
-    args '-dontskipnonpubliclibraryclassmembers'
-    args '-keep public class brut.apktool.Main { public static void main(java.lang.String[]); }'
-    args '-keepclassmembers enum * { public static **[] values(); public static ** valueOf(java.lang.String); }'
-    args '-dontwarn com.google.common.base.**'
-    args '-dontnote com.google.common.base.**'
-    args '-dontwarn sun.**'
-    args '-dontnote sun.**'
-}
-
-tasks.getByPath(':release').dependsOn(proguard)
-
+}
\ No newline at end of file
diff --git a/brut.j.common/build.gradle b/brut.j.common/build.gradle
index 9e51f029..17d20c5a 100644
--- a/brut.j.common/build.gradle
+++ b/brut.j.common/build.gradle
@@ -15,6 +15,6 @@
  */
 
 dependencies {
-    testCompile "junit:junit:3.8.1"
+    testCompile 'junit:junit:4.8.2'
 }
 
diff --git a/build.gradle b/build.gradle
index 240b03ac..cd891960 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,14 +13,13 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
- 
+
 apply plugin: 'java'
 apply plugin: 'maven'
 apply plugin: 'license'
 ext.apktoolversion = '1.5.2-SNAPSHOT'
 ext.fullrev = '';
 ext.gitrev_version = '';
-import org.apache.tools.ant.filters.*
 
 repositories {
   mavenCentral()
@@ -39,7 +38,7 @@ class Compatibility {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '1.3'
+  gradleVersion = '1.3'
 }
 
 // If anyone uses this outside of GoogleCode (Apktool) developers. I will hunt you down and hurt you.
@@ -48,23 +47,23 @@ task release {
 }
 
 buildscript {
-        repositories {
-            mavenCentral()
-        }
-        dependencies {
-            classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.5.0'
-        }
+  repositories {
+    mavenCentral()
+  }
+  dependencies {
+    classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.5.0'
+  }
 }
 
 subprojects {
-    apply plugin: 'java'
-    apply plugin: 'maven'
-    apply plugin: 'idea'
-
-    repositories {
-       mavenCentral()
-    }
-    dependencies {
-        testCompile 'junit:junit:4.8.2'
-    }
+  apply plugin: 'java'
+  apply plugin: 'maven'
+  apply plugin: 'idea'
+  
+  repositories {
+    mavenCentral()
+  }
+  dependencies {
+    testCompile 'junit:junit:4.8.2'
+  }
 }
\ No newline at end of file