From 26941e8f93b896658fe3e4d2d343174057301db2 Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor.tumbleson@gmail.com>
Date: Mon, 2 Jul 2012 11:52:53 -0500
Subject: [PATCH] New baksmali/smali merged in. Updated MAVEN repos.

---
 apktool-cli/pom.xml                            |  6 +++---
 .../src/main/java/brut/apktool/Main.java       |  2 +-
 apktool-lib/pom.xml                            | 18 ++++--------------
 pom.xml                                        | 14 +++++---------
 4 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/apktool-cli/pom.xml b/apktool-cli/pom.xml
index 95fc4af4..b5fd551a 100644
--- a/apktool-cli/pom.xml
+++ b/apktool-cli/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>brut.apktool</groupId>
     <artifactId>apktool-cli</artifactId>
-    <version>1.4.6-SNAPSHOT</version>
+    <version>1.4.7-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <parent>
@@ -54,13 +54,13 @@
         <dependency>
             <groupId>org.jf</groupId>
             <artifactId>baksmali</artifactId>
-            <version>1.3.3-dev</version>
+            <version>1.3.4-dev</version>
             <type>jar</type>
         </dependency>
                 <dependency>
             <groupId>org.jf</groupId>
             <artifactId>util</artifactId>
-            <version>1.3.3-dev</version>
+            <version>1.3.4-dev</version>
             <type>jar</type>
         </dependency>
     </dependencies>
diff --git a/apktool-cli/src/main/java/brut/apktool/Main.java b/apktool-cli/src/main/java/brut/apktool/Main.java
index 492f7f8b..1e04c3e6 100644
--- a/apktool-cli/src/main/java/brut/apktool/Main.java
+++ b/apktool-cli/src/main/java/brut/apktool/Main.java
@@ -207,7 +207,7 @@ public class Main {
     }
 
     private static void usage() {
-        String smaliVersion = "1.3.3-dev";
+        String smaliVersion = "1.3.4-dev";
         System.out.println(
             "Apktool v" + Androlib.getVersion() + " - a tool for reengineering Android apk files\n" +
             "Copyright 2010 Ryszard Wiśniewski <brut.alll@gmail.com>\n" +
diff --git a/apktool-lib/pom.xml b/apktool-lib/pom.xml
index 665d9048..24b0aa98 100644
--- a/apktool-lib/pom.xml
+++ b/apktool-lib/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>brut.apktool</groupId>
     <artifactId>apktool-lib</artifactId>
-    <version>1.4.6-SNAPSHOT</version>
+    <version>1.4.7-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <parent>
@@ -16,7 +16,7 @@
     <name>apktool library</name>
 
     <properties>
-        <smaliVersion>1.3.3-ibot7</smaliVersion>
+        <smaliVersion>1.3.4-ibot7</smaliVersion>
         <root.basedir>${project.parent.basedir}</root.basedir>
     </properties>
 
@@ -70,11 +70,6 @@
             <artifactId>dir</artifactId>
             <version>1.0</version>
         </dependency>
-        <dependency>
-            <groupId>brut.j</groupId>
-            <artifactId>util</artifactId>
-            <version>1.0</version>
-        </dependency>
         <dependency>
             <groupId>brut.j</groupId>
             <artifactId>common</artifactId>
@@ -85,15 +80,10 @@
             <artifactId>smali</artifactId>
             <version>${smaliVersion}</version>
         </dependency>
-        <dependency>
-            <groupId>brut.apktool.smali</groupId>
-            <artifactId>baksmali</artifactId>
-            <version>${smaliVersion}</version>
-        </dependency>
         <dependency>
             <groupId>brut.apktool.smali</groupId>
             <artifactId>util</artifactId>
-            <version>1.3.3-ibot7-SNAPSHOT</version>
+            <version>1.3.4-ibot7</version>
             <type>jar</type>
         </dependency>
         <dependency>
@@ -119,7 +109,7 @@
         <dependency>
             <groupId>org.jf</groupId>
             <artifactId>util</artifactId>
-            <version>1.3.3-ibot7</version>
+            <version>1.3.4-ibot7</version>
             <type>jar</type>
         </dependency>
     </dependencies>
diff --git a/pom.xml b/pom.xml
index 968dc895..eaf01df5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
     <packaging>pom</packaging>
 
     <name>apktool</name>
-    <url>http://github.com/ibotpeaches/brut.apktool</url>
+    <url>http://github.com/iBotPeaches/brut.apktool</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -16,10 +16,6 @@
     </properties>
 
     <modules>
-        <module>../brut.apktool.smali</module>
-        <module>../brut.j.dir</module>
-        <module>../brut.j.common</module>
-        <module>../brut.j.util</module>
         <module>apktool-lib</module>
         <module>apktool-cli</module>
     </modules>
@@ -80,18 +76,18 @@
     <repositories>
         <repository>
             <id>android-apktool.googlecode.com</id>
-            <url>http://apktool2.googlecode.com/svn/m2-releases</url>
+            <url>http://apktool2.googlecode.com/git/m2-releases</url>
         </repository>
     </repositories>
 
     <distributionManagement>
         <repository>
             <id>android-apktool.googlecode.com</id>
-            <url>dav:https://apktool2.googlecode.com/svn/m2-releases</url>
+            <url>dav:https://apktool2.googlecode.com/git/m2-releases</url>
         </repository>
         <snapshotRepository>
             <id>android-apktool.googlecode.com</id>
-            <url>dav:https://apktool2.googlecode.com/svn/m2-snapshots</url>
+            <url>dav:https://apktool2.googlecode.com/git/m2-snapshots</url>
         </snapshotRepository>
     </distributionManagement>
-</project>
+</project>
\ No newline at end of file