New baksmali/smali merged in. Updated MAVEN repos.

This commit is contained in:
Connor Tumbleson 2012-07-02 11:52:53 -05:00
parent d6b4767ff8
commit 26941e8f93
4 changed files with 13 additions and 27 deletions

View File

@ -4,7 +4,7 @@
<groupId>brut.apktool</groupId> <groupId>brut.apktool</groupId>
<artifactId>apktool-cli</artifactId> <artifactId>apktool-cli</artifactId>
<version>1.4.6-SNAPSHOT</version> <version>1.4.7-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<parent> <parent>
@ -54,13 +54,13 @@
<dependency> <dependency>
<groupId>org.jf</groupId> <groupId>org.jf</groupId>
<artifactId>baksmali</artifactId> <artifactId>baksmali</artifactId>
<version>1.3.3-dev</version> <version>1.3.4-dev</version>
<type>jar</type> <type>jar</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jf</groupId> <groupId>org.jf</groupId>
<artifactId>util</artifactId> <artifactId>util</artifactId>
<version>1.3.3-dev</version> <version>1.3.4-dev</version>
<type>jar</type> <type>jar</type>
</dependency> </dependency>
</dependencies> </dependencies>

View File

@ -207,7 +207,7 @@ public class Main {
} }
private static void usage() { private static void usage() {
String smaliVersion = "1.3.3-dev"; String smaliVersion = "1.3.4-dev";
System.out.println( System.out.println(
"Apktool v" + Androlib.getVersion() + " - a tool for reengineering Android apk files\n" + "Apktool v" + Androlib.getVersion() + " - a tool for reengineering Android apk files\n" +
"Copyright 2010 Ryszard Wiśniewski <brut.alll@gmail.com>\n" + "Copyright 2010 Ryszard Wiśniewski <brut.alll@gmail.com>\n" +

View File

@ -4,7 +4,7 @@
<groupId>brut.apktool</groupId> <groupId>brut.apktool</groupId>
<artifactId>apktool-lib</artifactId> <artifactId>apktool-lib</artifactId>
<version>1.4.6-SNAPSHOT</version> <version>1.4.7-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<parent> <parent>
@ -16,7 +16,7 @@
<name>apktool library</name> <name>apktool library</name>
<properties> <properties>
<smaliVersion>1.3.3-ibot7</smaliVersion> <smaliVersion>1.3.4-ibot7</smaliVersion>
<root.basedir>${project.parent.basedir}</root.basedir> <root.basedir>${project.parent.basedir}</root.basedir>
</properties> </properties>
@ -70,11 +70,6 @@
<artifactId>dir</artifactId> <artifactId>dir</artifactId>
<version>1.0</version> <version>1.0</version>
</dependency> </dependency>
<dependency>
<groupId>brut.j</groupId>
<artifactId>util</artifactId>
<version>1.0</version>
</dependency>
<dependency> <dependency>
<groupId>brut.j</groupId> <groupId>brut.j</groupId>
<artifactId>common</artifactId> <artifactId>common</artifactId>
@ -85,15 +80,10 @@
<artifactId>smali</artifactId> <artifactId>smali</artifactId>
<version>${smaliVersion}</version> <version>${smaliVersion}</version>
</dependency> </dependency>
<dependency>
<groupId>brut.apktool.smali</groupId>
<artifactId>baksmali</artifactId>
<version>${smaliVersion}</version>
</dependency>
<dependency> <dependency>
<groupId>brut.apktool.smali</groupId> <groupId>brut.apktool.smali</groupId>
<artifactId>util</artifactId> <artifactId>util</artifactId>
<version>1.3.3-ibot7-SNAPSHOT</version> <version>1.3.4-ibot7</version>
<type>jar</type> <type>jar</type>
</dependency> </dependency>
<dependency> <dependency>
@ -119,7 +109,7 @@
<dependency> <dependency>
<groupId>org.jf</groupId> <groupId>org.jf</groupId>
<artifactId>util</artifactId> <artifactId>util</artifactId>
<version>1.3.3-ibot7</version> <version>1.3.4-ibot7</version>
<type>jar</type> <type>jar</type>
</dependency> </dependency>
</dependencies> </dependencies>

12
pom.xml
View File

@ -8,7 +8,7 @@
<packaging>pom</packaging> <packaging>pom</packaging>
<name>apktool</name> <name>apktool</name>
<url>http://github.com/ibotpeaches/brut.apktool</url> <url>http://github.com/iBotPeaches/brut.apktool</url>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@ -16,10 +16,6 @@
</properties> </properties>
<modules> <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-lib</module>
<module>apktool-cli</module> <module>apktool-cli</module>
</modules> </modules>
@ -80,18 +76,18 @@
<repositories> <repositories>
<repository> <repository>
<id>android-apktool.googlecode.com</id> <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> </repository>
</repositories> </repositories>
<distributionManagement> <distributionManagement>
<repository> <repository>
<id>android-apktool.googlecode.com</id> <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> </repository>
<snapshotRepository> <snapshotRepository>
<id>android-apktool.googlecode.com</id> <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> </snapshotRepository>
</distributionManagement> </distributionManagement>
</project> </project>