Merge pull request #301 from ThexXTURBOXx/master

Optimize Build Process
This commit is contained in:
Kalen (Konloch) Kinloch 2021-06-22 12:15:15 -07:00 committed by GitHub
commit 0a34c71210
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
66 changed files with 202 additions and 29 deletions

View file

@ -0,0 +1 @@
f917a330ef6379f8976ce3761e30e0fc

View file

@ -0,0 +1 @@
f5fbd039a4c3161b2a3db817786b39366e2cd796

View file

@ -0,0 +1,8 @@
<?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.android</groupId>
<artifactId>D2Jar-obf</artifactId>
<version>1.0bcv</version>
</project>

View file

@ -0,0 +1 @@
08b71893e812afc9c2670a92acdded46

View file

@ -0,0 +1 @@
d0eb90a0d8eb49d0a9573224000c859358610783

View file

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

View file

@ -0,0 +1 @@
0591d48d90ee4e7bcf92f9995686d3cb

View file

@ -0,0 +1 @@
24a479a29c3fe9293a6ccf69d975e0f3a3b09546

View file

@ -0,0 +1 @@
cab2e66e5444aaab6a440f7afa4f7829

View file

@ -0,0 +1 @@
9aee7f4031c7717c9dd18a61410d81cdbc4c7fb9

View file

@ -0,0 +1,8 @@
<?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.android</groupId>
<artifactId>DX</artifactId>
<version>1.16bcv</version>
</project>

View file

@ -0,0 +1 @@
5d95e64f137ec77ddf401d25771b671c

View file

@ -0,0 +1 @@
926db5c7f9b2abf84fa1b17063e6676af73b9fcf

View file

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>com.android</groupId>
<artifactId>DX</artifactId>
<versioning>
<release>1.16bcv</release>
<versions>
<version>1.16bcv</version>
</versions>
<lastUpdated>20210622185015</lastUpdated>
</versioning>
</metadata>

View file

@ -0,0 +1 @@
00c4e169d820da2b52ecff592c462a5c

View file

@ -0,0 +1 @@
3aa3ae5b23afd0e8e497860be45d2babcbdd03de

View file

@ -0,0 +1 @@
e568c8d5c6a7039543c0bdc3a1193051

View file

@ -0,0 +1 @@
3676997aa01d30e6e891ebdce10b5c54eb4f13f7

View file

@ -0,0 +1,8 @@
<?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

@ -0,0 +1 @@
d7b27d1753ca7601eaa99e854ab41c6f

View file

@ -0,0 +1 @@
5b189b265dc135d196afd591d8e15a29687a2dd0

View file

@ -0,0 +1,12 @@
<?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

@ -0,0 +1 @@
50a57c1046d73790f276afd2dcb18eaf

View file

@ -0,0 +1 @@
d8e384d276fc18322a9a28fbbe7c4c3fd5207ca5

View file

@ -0,0 +1 @@
b42c44e1a9bddb3345fd2f5a7ede523e

View file

@ -0,0 +1 @@
7f0730479b29194e089f779592c30dde5f25777e

View file

@ -0,0 +1,8 @@
<?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

@ -0,0 +1 @@
86e3f252dd8060389adab49197b87d7b

View file

@ -0,0 +1 @@
585bfb95013389f6791a949624c55ca77e6b9edb

View file

@ -0,0 +1,12 @@
<?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

@ -0,0 +1 @@
73243ac381a03becf824b78f91466e23

View file

@ -0,0 +1 @@
a989fc2ce008b7c7b6cf7ca18359d78018f19dbd

View file

@ -0,0 +1 @@
65e4fe5688630ec32c2c78d9e5c30e74

View file

@ -0,0 +1 @@
dcb766ec3af6a0d2af5deb8aa5200552c3e47422

View file

@ -0,0 +1,8 @@
<?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.jd</groupId>
<artifactId>jd-gui</artifactId>
<version>1.6.6bcv</version>
</project>

View file

@ -0,0 +1 @@
045d93571840130425280acf44d0b1c4

View file

@ -0,0 +1 @@
e02d9bcadc36628f908f5c5cc7dbb73593a6e5e2

View file

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>com.jd</groupId>
<artifactId>jd-gui</artifactId>
<versioning>
<release>1.6.6bcv</release>
<versions>
<version>1.6.6bcv</version>
</versions>
<lastUpdated>20210622184950</lastUpdated>
</versioning>
</metadata>

View file

@ -0,0 +1 @@
69423fd3d1b2f3a0ceef4fd7410c1c37

View file

@ -0,0 +1 @@
06ba4857ceb9120126431234133b607486389758

View file

@ -0,0 +1 @@
577771e809d7208659fa9536da1a1f1d

View file

@ -0,0 +1 @@
cc4f751caa6c3fbb6d159b5b4fc772fc78d09faa

View file

@ -0,0 +1,8 @@
<?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>eu.bibl.banalysis</groupId>
<artifactId>byteanalysis</artifactId>
<version>1.0bcv</version>
</project>

View file

@ -0,0 +1 @@
24ece026db49446067a87df4147fb22e

View file

@ -0,0 +1 @@
91deca562ba5dae7996327e35d9d4ca5d793e4cf

View file

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>eu.bibl.banalysis</groupId>
<artifactId>byteanalysis</artifactId>
<versioning>
<release>1.0bcv</release>
<versions>
<version>1.0bcv</version>
</versions>
<lastUpdated>20210622184952</lastUpdated>
</versioning>
</metadata>

View file

@ -0,0 +1 @@
06e2d8072d6732e85afce26be23c2a49

View file

@ -0,0 +1 @@
f28f7af3dedb25b5d112a263bf5c6b596010206e

View file

@ -0,0 +1 @@
c877e494e20674cab5224aee1911bc31

View file

@ -0,0 +1 @@
9a12d6ef2207335c4a77caf4414d300c38aa1cfa

View file

@ -0,0 +1,8 @@
<?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>org.apktool</groupId>
<artifactId>apktool</artifactId>
<version>2.5.0bcv</version>
</project>

View file

@ -0,0 +1 @@
2b41e18b3dcc4169cd7beb86fe9eb5a2

View file

@ -0,0 +1 @@
fa92129bc63d5cbbe8496d4dc93ca48b1b113783

View file

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>org.apktool</groupId>
<artifactId>apktool</artifactId>
<versioning>
<release>2.5.0bcv</release>
<versions>
<version>2.5.0bcv</version>
</versions>
<lastUpdated>20210622183833</lastUpdated>
</versioning>
</metadata>

View file

@ -0,0 +1 @@
17f9ccd076a81fa456a4c92e4f26329d

View file

@ -0,0 +1 @@
f1b0999a6132c549dd2f94583a0c5b5de99c0320

36
pom.xml
View file

@ -6,7 +6,7 @@
<version>2.10.12</version>
<properties>
<java.version>8</java.version>
<java.version>1.8</java.version>
<maven.compiler.target>${java.version}</maven.compiler.target>
<maven.compiler.source>${java.version}</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@ -17,6 +17,10 @@
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
<repository>
<id>local-maven-repo</id>
<url>file:///${project.basedir}/libs</url>
</repository>
</repositories>
<dependencies>
@ -28,9 +32,7 @@
<dependency>
<groupId>org.apktool</groupId>
<artifactId>apktool</artifactId>
<version>2.3.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/libs/apktool-2.5.0.jar</systemPath>
<version>2.5.0bcv</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
@ -130,16 +132,12 @@
<dependency>
<groupId>com.jd</groupId>
<artifactId>jd-gui</artifactId>
<version>1.6.6</version>
<scope>system</scope>
<systemPath>${project.basedir}/libs/jd-gui-1.6.6-no-asm-rsta.jar</systemPath>
<version>1.6.6bcv</version>
</dependency>
<dependency>
<groupId>eu.bibl.banalysis</groupId>
<artifactId>byteanalysis</artifactId>
<version>1.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/libs/byteanalysis-1.0.jar</systemPath>
<version>1.0bcv</version>
</dependency>
<dependency>
<groupId>org.tinyjee.jgraphx</groupId>
@ -204,30 +202,22 @@
<dependency>
<groupId>com.github.skylot</groupId>
<artifactId>JADX-Core</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/libs/jadx/jadx-core.jar</systemPath>
<version>1.0bcv</version>
</dependency>
<dependency>
<groupId>com.github.skylot</groupId>
<artifactId>JADX-Android</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/libs/jadx/android-5.1.jar</systemPath>
<version>5.1bcv</version>
</dependency>
<dependency>
<groupId>com.android</groupId>
<artifactId>DX</artifactId>
<version>1.16</version>
<scope>system</scope>
<systemPath>${project.basedir}/libs/jadx/dx-1.16.jar</systemPath>
<version>1.16bcv</version>
</dependency>
<dependency>
<groupId>com.android</groupId>
<artifactId>D2Jar-obf</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/libs/jadx/d2jar-lib-obf.jar</systemPath>
<version>1.0bcv</version>
</dependency>
</dependencies>
@ -256,7 +246,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>
<version>3.1.1</version> <!-- 3.1.2 breaks build on JDK 9+ -->
<configuration>
<archive>
<manifest>

View file

@ -3,6 +3,7 @@ package the.bytecode.club.bytecodeviewer.gui.resourcelist;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.MutableTreeNode;
import java.util.Comparator;
import javax.swing.tree.TreeNode;
/**
* @author Konloch
@ -33,19 +34,19 @@ public class ResourceTreeNode extends DefaultMutableTreeNode
private void recursiveSort(final ResourceTreeNode node)
{
node.children.sort(nodeComparator);
for (ResourceTreeNode nextNode : (Iterable<ResourceTreeNode>) node.children)
for (TreeNode nextNode : (Iterable<TreeNode>) node.children)
{
if (nextNode.getChildCount() > 0)
{
recursiveSort(nextNode);
recursiveSort((ResourceTreeNode) nextNode);
}
}
}
protected Comparator<ResourceTreeNode> nodeComparator = new Comparator<ResourceTreeNode>()
protected Comparator<TreeNode> nodeComparator = new Comparator<TreeNode>()
{
@Override
public int compare(final ResourceTreeNode o1, final ResourceTreeNode o2)
public int compare(final TreeNode o1, final TreeNode o2)
{
// To make sure nodes with children are always on top
final int firstOffset = o1.getChildCount() > 0 ? -1000 : 0;

View file

@ -82,10 +82,10 @@ public class SearchKeyAdapter extends KeyAdapter
else
{
@SuppressWarnings("unchecked")
Enumeration<ResourceTreeNode> enums = curNode.depthFirstEnumeration();
Enumeration<TreeNode> enums = curNode.depthFirstEnumeration();
while (enums != null && enums.hasMoreElements())
{
ResourceTreeNode node = enums.nextElement();
ResourceTreeNode node = (ResourceTreeNode) enums.nextElement();
if (node.isLeaf())
{
if (((String) (node.getUserObject())).toLowerCase().contains(path[path.length - 1].toLowerCase()))