mirror of
https://github.com/revanced/Apktool.git
synced 2024-12-12 05:47:46 +01:00
This commit is contained in:
parent
321dcfa91b
commit
1b0e066e92
@ -4,7 +4,7 @@
|
||||
|
||||
<groupId>brut.apktool</groupId>
|
||||
<artifactId>apktool-cli</artifactId>
|
||||
<version>1.4.4-SNAPSHOT</version>
|
||||
<version>1.4.5-SNAPSHOT</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<parent>
|
||||
|
@ -30,6 +30,7 @@
|
||||
<unpack>true</unpack>
|
||||
<scope>runtime</scope>
|
||||
<includes>
|
||||
<include>org.jf.*</include>
|
||||
<include>brut.*</include>
|
||||
<include>xpp3:xpp3</include>
|
||||
<include>org.yaml:snakeyaml</include>
|
||||
|
@ -16,9 +16,7 @@
|
||||
|
||||
package brut.apktool;
|
||||
|
||||
import brut.androlib.Androlib;
|
||||
import brut.androlib.AndrolibException;
|
||||
import brut.androlib.ApkDecoder;
|
||||
import brut.androlib.*;
|
||||
import brut.androlib.err.CantFindFrameworkResException;
|
||||
import brut.androlib.err.InFileNotFoundException;
|
||||
import brut.androlib.err.OutDirExistsException;
|
||||
|
@ -16,7 +16,7 @@
|
||||
<name>apktool library</name>
|
||||
|
||||
<properties>
|
||||
<smaliVersion>1.3.0-brut6</smaliVersion>
|
||||
<smaliVersion>1.3.3-ibot7</smaliVersion>
|
||||
<root.basedir>${project.parent.basedir}</root.basedir>
|
||||
</properties>
|
||||
|
||||
@ -88,12 +88,14 @@
|
||||
<dependency>
|
||||
<groupId>brut.apktool.smali</groupId>
|
||||
<artifactId>baksmali</artifactId>
|
||||
<version>${smaliVersion}</version>
|
||||
<version>1.3.3-ibot7</version>
|
||||
<type>jar</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>brut.apktool.smali</groupId>
|
||||
<artifactId>util</artifactId>
|
||||
<version>${smaliVersion}</version>
|
||||
<version>1.3.3-ibot7-SNAPSHOT</version>
|
||||
<type>jar</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.yaml</groupId>
|
||||
@ -115,6 +117,12 @@
|
||||
<artifactId>xmlunit</artifactId>
|
||||
<version>1.3</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.jf</groupId>
|
||||
<artifactId>util</artifactId>
|
||||
<version>1.3.3-dev</version>
|
||||
<type>jar</type>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<pluginRepositories>
|
||||
|
@ -16,9 +16,7 @@
|
||||
|
||||
package brut.androlib.mod;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
import java.io.*;
|
||||
import org.antlr.runtime.*;
|
||||
import org.antlr.runtime.tree.CommonTree;
|
||||
import org.antlr.runtime.tree.CommonTreeNodeStream;
|
||||
|
@ -16,8 +16,8 @@
|
||||
|
||||
package brut.androlib.res.data;
|
||||
|
||||
import brut.androlib.AndrolibException;
|
||||
import brut.androlib.err.UndefinedResObject;
|
||||
import brut.androlib.AndrolibException;
|
||||
import brut.androlib.res.data.value.ResFileValue;
|
||||
import brut.androlib.res.data.value.ResValueFactory;
|
||||
import brut.androlib.res.xml.ResValuesXmlSerializable;
|
||||
|
@ -23,9 +23,7 @@ import brut.androlib.res.data.value.ResBoolValue;
|
||||
import brut.androlib.res.data.value.ResFileValue;
|
||||
import brut.directory.Directory;
|
||||
import brut.directory.DirectoryException;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
import java.io.*;
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
|
@ -19,7 +19,8 @@ package brut.androlib.src;
|
||||
import brut.androlib.AndrolibException;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import org.jf.baksmali.*;
|
||||
import org.jf.baksmali.baksmali;
|
||||
import org.jf.baksmali.main;
|
||||
import org.jf.dexlib.DexFile;
|
||||
|
||||
/**
|
||||
@ -43,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.DIFFPRE : 0, false, false, null);
|
||||
mDebug ? main.FULLMERGE : 0, false, false, null);
|
||||
} catch (IOException ex) {
|
||||
throw new AndrolibException(ex);
|
||||
}
|
||||
|
@ -19,19 +19,11 @@ package brut.androlib;
|
||||
import brut.androlib.res.util.ExtFile;
|
||||
import brut.common.BrutException;
|
||||
import brut.util.OS;
|
||||
import java.io.File;
|
||||
import java.io.FileReader;
|
||||
import java.io.IOException;
|
||||
import java.io.Reader;
|
||||
import java.io.*;
|
||||
import java.util.logging.Logger;
|
||||
import org.custommonkey.xmlunit.DetailedDiff;
|
||||
import org.custommonkey.xmlunit.Diff;
|
||||
import org.custommonkey.xmlunit.ElementNameAndAttributeQualifier;
|
||||
import org.custommonkey.xmlunit.ElementQualifier;
|
||||
import org.junit.AfterClass;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
import org.junit.BeforeClass;
|
||||
import org.junit.Test;
|
||||
import org.custommonkey.xmlunit.*;
|
||||
import org.junit.*;
|
||||
import static org.junit.Assert.*;
|
||||
import org.xml.sax.SAXException;
|
||||
|
||||
|
||||
@ -124,7 +116,9 @@ public class BuildAndDecodeTest {
|
||||
|
||||
@Test
|
||||
public void qualifiersTest() throws BrutException {
|
||||
compareValuesFiles("values-mcc004/strings.xml");
|
||||
compareValuesFiles("values-mcc004-mnc4-en-rUS-sw100dp-w200dp-h300dp" +
|
||||
"-xlarge-long-land-television-night-xhdpi-finger-keyssoft-12key" +
|
||||
"-navhidden-dpad/strings.xml");
|
||||
}
|
||||
|
||||
private void compareValuesFiles(String path) throws BrutException {
|
||||
|
Loading…
Reference in New Issue
Block a user