From dfbcf298c22ba57c94cb8b112ac69c081cf57acf Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <me@connortumbleson.com>
Date: Mon, 8 May 2017 08:33:12 -0400
Subject: [PATCH] Move to shadowJar, leaving fatJar behind

 - plugin was deprecated
---
 brut.apktool/apktool-cli/build.gradle | 15 ++++++---------
 build.gradle                          |  7 ++-----
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/brut.apktool/apktool-cli/build.gradle b/brut.apktool/apktool-cli/build.gradle
index 517d73cf..60106618 100644
--- a/brut.apktool/apktool-cli/build.gradle
+++ b/brut.apktool/apktool-cli/build.gradle
@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-apply plugin: 'eu.appsatori.fatjar'
+apply plugin: 'com.github.johnrengelman.shadow'
 
 dependencies {
     compile depends.commons_cli
@@ -30,22 +30,20 @@ buildscript {
     }
 }
 
-gradle.taskGraph.whenReady {
-  fatJar { 
+jar {
     manifest {
-      attributes("Main-Class": "brut.apktool.Main")
+        attributes 'Main-Class' : 'brut.apktool.Main'
     }
-  }
 }
 
 task cleanOutputDirectory(type: Delete) {
-    delete fileTree(dir: jar.destinationDir.getPath(), exclude: "apktool-cli.jar")
+    delete fileTree(dir: jar.destinationDir.getPath(), exclude: "apktool-cli-all.jar")
 }
 
-task proguard(type: proguard.gradle.ProGuardTask, dependsOn: fatJar) {
+task proguard(type: proguard.gradle.ProGuardTask, dependsOn: shadowJar) {
     def outFile = jar.destinationDir.getPath() + '/' + "apktool" + '-' + project.apktool_version + '-small' + '.' + jar.extension
 
-    injars fatJar.archivePath
+    injars shadowJar.archivePath
     outjars outFile
 
     libraryjars "${System.properties['java.home']}/lib/rt.jar"
@@ -54,7 +52,6 @@ task proguard(type: proguard.gradle.ProGuardTask, dependsOn: fatJar) {
     dontoptimize
 
     keep 'public class brut.apktool.Main { public static void main(java.lang.String[]); }'
-    keep 'class org.yaml.snakeyaml.** { public protected private *; }'
     keepclassmembers 'enum * { public static **[] values(); public static ** valueOf(java.lang.String); }'
     dontwarn 'com.google.common.base.**'
     dontwarn 'com.google.common.collect.**'
diff --git a/build.gradle b/build.gradle
index 4346cf05..ba3f344f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,17 +21,16 @@ buildscript {
         options.encoding = "UTF-8"
     }
     dependencies {
-        classpath 'eu.appsatori:gradle-fatjar-plugin:0.3'
+        classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.4'
     }
 }
 
-apply plugin: 'maven'
 apply from: 'gradle/functions.gradle'
 
 def apktoolversion_major = '2.2.3'
 def apktoolversion_minor = 'SNAPSHOT';
 
-defaultTasks 'build', 'fatJar', 'proguard'
+defaultTasks 'build', 'shadowJar', 'proguard'
 
 allprojects {
     apply plugin: 'java'
@@ -80,8 +79,6 @@ task release {
 
 subprojects {
     apply plugin: 'java'
-    apply plugin: 'maven'
-    apply plugin: 'idea'
 
     ext {
         depends = [