Merged in v1.3.4 smali/baksmaili/dexlib. Updated doc to reflect github

apktool-cli/pom.xml

@@ -49,6 +49,12 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>apktool-lib</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>baksmali</artifactId>
+                    <groupId>brut.apktool.smali</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <artifactId>common</artifactId>
@@ -62,5 +68,10 @@
             <version>1.3.4-ibot7</version>
             <type>jar</type>
         </dependency>
+        <dependency>
+            <groupId>brut.apktool.smali</groupId>
+            <artifactId>baksmali</artifactId>
+            <version>1.3.4-ibot8</version>
+        </dependency>
     </dependencies>
 </project>

apktool-cli/src/main/java/brut/apktool/Main.java

@@ -263,7 +263,7 @@ public class Main {
             "    if|install-framework <framework.apk> [<tag>]\n" +
             "        Install framework file to your system.\n" +
             "\n" +
-            "For additional info, see: http://code.google.com/p/android-apktool/"
+            "For additional info, see: https://github.com/iBotPeaches/brut.apktool"
         );
     }
 

apktool-lib/pom.xml

@@ -80,17 +80,6 @@
             <artifactId>common</artifactId>
             <version>1.0</version>
         </dependency>
-        <dependency>
-            <groupId>brut.apktool.smali</groupId>
-            <artifactId>smali</artifactId>
-            <version>${smaliVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>brut.apktool.smali</groupId>
-            <artifactId>baksmali</artifactId>
-            <version>1.3.4-ibot7</version>
-            <type>jar</type>
-        </dependency>
         <dependency>
             <groupId>brut.apktool.smali</groupId>
             <artifactId>util</artifactId>
@@ -122,12 +111,6 @@
             <artifactId>xmlunit</artifactId>
             <version>1.3</version>
         </dependency>
-        <dependency>
-            <groupId>brut.apktool.smali</groupId>
-            <artifactId>dexlib</artifactId>
-            <version>1.3.4-ibot7</version>
-            <type>jar</type>
-        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -140,6 +123,21 @@
             <version>3.1</version>
             <type>jar</type>
         </dependency>
+        <dependency>
+            <groupId>brut.apktool.smali</groupId>
+            <artifactId>baksmali</artifactId>
+            <version>1.3.4-ibot8</version>
+        </dependency>
+        <dependency>
+            <groupId>brut.apktool.smali</groupId>
+            <artifactId>dexlib</artifactId>
+            <version>1.3.4-ibot8</version>
+        </dependency>
+        <dependency>
+            <groupId>brut.apktool.smali</groupId>
+            <artifactId>smali</artifactId>
+            <version>1.3.4-ibot8</version>
+        </dependency>
     </dependencies>
     <pluginRepositories>
         <pluginRepository>

apktool-lib/src/main/java/brut/androlib/src/DebugInjector.java

@@ -21,6 +21,7 @@ import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.jf.dexlib.Code.Analysis.RegisterType;
+import org.jf.dexlib.Code.Opcode;
 
 /**
  * @author Ryszard Wiśniewski <brut.alll@gmail.com>

apktool-lib/src/main/java/brut/androlib/src/SmaliDecoder.java

@@ -44,7 +44,7 @@ public class SmaliDecoder {
             baksmali.disassembleDexFile(mApkFile.getAbsolutePath(),
                 new DexFile(mApkFile), false, mOutDir.getAbsolutePath(), null,
                 null, null, false, true, true, true, false, false, 
-                mDebug ? main.ALLPRE : 0, false, false, null);
+                mDebug ? main.FULLMERGE : 0, false, false, null);
         } catch (IOException ex) {
             throw new AndrolibException(ex);
         }

pom.xml

@@ -17,6 +17,10 @@
     <modules>
         <module>apktool-lib</module>
         <module>apktool-cli</module>
+        <module>../brut.apktool.smali</module>
+        <module>../brut.j.dir</module>
+        <module>../brut.j.common</module>
+        <module>../brut.j.util</module>
     </modules>
 
     <build>