From e9738642b23d64fe4946c68c3be50823ac41ec16 Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor.tumbleson@gmail.com>
Date: Fri, 6 Jul 2012 09:00:16 -0500
Subject: [PATCH] finally, fixed bugs. Pushing v1.4.7 public

---
 apktool-cli/src/main/assembly/jar-with-deps.xml | 2 +-
 apktool-lib/pom.xml                             | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/apktool-cli/src/main/assembly/jar-with-deps.xml b/apktool-cli/src/main/assembly/jar-with-deps.xml
index 0cb65f30..335fdc81 100644
--- a/apktool-cli/src/main/assembly/jar-with-deps.xml
+++ b/apktool-cli/src/main/assembly/jar-with-deps.xml
@@ -36,7 +36,7 @@
           <include>org.yaml:snakeyaml</include>
           <include>commons-io:*</include>
           <include>org.antlr:antlr-runtime</include>
-          <include>com.google.collections</include>
+          <include>com.google.*</include>
       </includes>
     </dependencySet>
   </dependencySets>
diff --git a/apktool-lib/pom.xml b/apktool-lib/pom.xml
index a93ed52e..1f0a470b 100644
--- a/apktool-lib/pom.xml
+++ b/apktool-lib/pom.xml
@@ -128,9 +128,10 @@
             <type>jar</type>
         </dependency>
         <dependency>
-            <groupId>com.google.collections</groupId>
-            <artifactId>google-collections</artifactId>
-            <version>1.0</version>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>12.0</version>
+            <type>jar</type>
         </dependency>
     </dependencies>