Merge pull request #345 from ThexXTURBOXx/master

Update a few more libraries
This commit is contained in:
Konloch 2021-08-23 09:23:36 -07:00 committed by GitHub
commit 2d4c339f87
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 36 additions and 90 deletions

View file

@ -21,5 +21,3 @@ Some dependencies may have been modified or could be released by their author in
- `JD-GUI`: Removed ASM, RSyntaxTextArea, ANTLR, and TreeLayout - `JD-GUI`: Removed ASM, RSyntaxTextArea, ANTLR, and TreeLayout
- `APKTool`: Recompiled with the newest dependency versions, removed prebuilt folder - `APKTool`: Recompiled with the newest dependency versions, removed prebuilt folder
- `dx`: Just taken from build-tools without modifications
- `Dex2Jar`: Compiled from scratch ([This fork](https://github.com/ThexXTURBOXx/dex2jar)); download the `all` artifact from [GitHub actions](https://github.com/ThexXTURBOXx/dex2jar/actions)

View file

@ -1 +0,0 @@
e568c8d5c6a7039543c0bdc3a1193051

View file

@ -1 +0,0 @@
3676997aa01d30e6e891ebdce10b5c54eb4f13f7

View file

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>com.github.skylot</groupId>
<artifactId>JADX-Android</artifactId>
<version>5.1bcv</version>
</project>

View file

@ -1 +0,0 @@
d7b27d1753ca7601eaa99e854ab41c6f

View file

@ -1 +0,0 @@
5b189b265dc135d196afd591d8e15a29687a2dd0

View file

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>com.github.skylot</groupId>
<artifactId>JADX-Android</artifactId>
<versioning>
<release>5.1bcv</release>
<versions>
<version>5.1bcv</version>
</versions>
<lastUpdated>20210622185013</lastUpdated>
</versioning>
</metadata>

View file

@ -1 +0,0 @@
50a57c1046d73790f276afd2dcb18eaf

View file

@ -1 +0,0 @@
d8e384d276fc18322a9a28fbbe7c4c3fd5207ca5

View file

@ -1 +0,0 @@
b42c44e1a9bddb3345fd2f5a7ede523e

View file

@ -1 +0,0 @@
7f0730479b29194e089f779592c30dde5f25777e

View file

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>com.github.skylot</groupId>
<artifactId>JADX-Core</artifactId>
<version>1.0bcv</version>
</project>

View file

@ -1 +0,0 @@
86e3f252dd8060389adab49197b87d7b

View file

@ -1 +0,0 @@
585bfb95013389f6791a949624c55ca77e6b9edb

View file

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>com.github.skylot</groupId>
<artifactId>JADX-Core</artifactId>
<versioning>
<release>1.0bcv</release>
<versions>
<version>1.0bcv</version>
</versions>
<lastUpdated>20210622185012</lastUpdated>
</versioning>
</metadata>

View file

@ -1 +0,0 @@
73243ac381a03becf824b78f91466e23

View file

@ -1 +0,0 @@
a989fc2ce008b7c7b6cf7ca18359d78018f19dbd

View file

@ -1 +0,0 @@
470df084337b7ef8e5fd9ada8359973d

View file

@ -1 +0,0 @@
8c993a8b2dd652532c11b57d917e49c8d33efa45

View file

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>com.googlecode</groupId>
<artifactId>D2Jar-obf</artifactId>
<version>2.1v19</version>
</project>

View file

@ -1 +0,0 @@
a738eb686cce7603fda0d7225d911bbb

View file

@ -1 +0,0 @@
d65e7ca6e8c1db7e923e9520f08a2c88b654ff11

View file

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>com.googlecode</groupId>
<artifactId>D2Jar-obf</artifactId>
<versioning>
<release>2.1v19</release>
<versions>
<version>2.1v19</version>
</versions>
<lastUpdated>20210812114713</lastUpdated>
</versioning>
</metadata>

View file

@ -1 +0,0 @@
5e0be1e48a1190b21b4514f83a1a2167

View file

@ -1 +0,0 @@
4c3d40803e18e8b752368e2140a4e61a570b09f6

43
pom.xml
View file

@ -13,6 +13,10 @@
</properties> </properties>
<repositories> <repositories>
<repository>
<id>google</id>
<url>https://maven.google.com/</url>
</repository>
<repository> <repository>
<id>local-maven-repo</id> <id>local-maven-repo</id>
<url>file:///${project.basedir}/libs</url> <url>file:///${project.basedir}/libs</url>
@ -108,6 +112,17 @@
<groupId>org.jboss.windup.decompiler</groupId> <groupId>org.jboss.windup.decompiler</groupId>
<artifactId>decompiler-fernflower</artifactId> <artifactId>decompiler-fernflower</artifactId>
<version>5.2.0.Final</version> <version>5.2.0.Final</version>
<exclusions>
<exclusion>
<groupId>org.jboss.windup.decompiler.fernflower</groupId>
<artifactId>windup-fernflower</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.github.ThexXTURBOXx</groupId>
<artifactId>fernflower</artifactId>
<version>47afd82034</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
@ -200,19 +215,29 @@
<version>1.1.4c</version> <version>1.1.4c</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.skylot</groupId> <groupId>com.github.skylot.jadx</groupId>
<artifactId>JADX-Core</artifactId> <artifactId>jadx-core</artifactId>
<version>1.0bcv</version> <version>c28e8142f4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.skylot</groupId> <groupId>com.github.skylot.jadx</groupId>
<artifactId>JADX-Android</artifactId> <artifactId>jadx-java-convert</artifactId>
<version>5.1bcv</version> <version>c28e8142f4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.googlecode</groupId> <groupId>com.github.skylot.jadx</groupId>
<artifactId>D2Jar-obf</artifactId> <artifactId>jadx-dex-input</artifactId>
<version>2.1v19</version> <version>c28e8142f4</version>
</dependency>
<dependency>
<groupId>com.github.skylot.jadx</groupId>
<artifactId>jadx-smali-input</artifactId>
<version>c28e8142f4</version>
</dependency>
<dependency>
<groupId>com.github.ThexXTURBOXx</groupId>
<artifactId>dex2jar</artifactId>
<version>v23</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.weisj</groupId> <groupId>com.github.weisj</groupId>

View file

@ -60,10 +60,11 @@ public class JADXDecompiler extends InternalDecompiler
} }
File fuckery = new File(fuckery(fileStart)); File fuckery = new File(fuckery(fileStart));
fuckery.mkdirs();
try { try {
JadxArgs args = new JadxArgs(); JadxArgs args = new JadxArgs();
args.getInputFiles().add(tempClass); args.setInputFile(tempClass);
args.setOutDir(fuckery); args.setOutDir(fuckery);
args.setOutDirSrc(fuckery); args.setOutDirSrc(fuckery);
args.setOutDirRes(fuckery); args.setOutDirRes(fuckery);