Skip to content

Commit eded177

Browse files
committed
Merge branch 'master' into gui_fixes
# Conflicts: # src/main/java/the/bytecode/club/bytecodeviewer/searching/impl/LDCSearch.java # src/main/java/the/bytecode/club/bytecodeviewer/searching/impl/MemberWithAnnotationSearch.java # src/main/java/the/bytecode/club/bytecodeviewer/searching/impl/MethodCallSearch.java # src/main/java/the/bytecode/club/bytecodeviewer/searching/impl/RegexSearch.java
2 parents b52c194 + 35359d1 commit eded177

70 files changed

Lines changed: 10766 additions & 7802 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
-12.4 KB
Binary file not shown.

libs/org/apktool/apktool-cli/2.6.0/apktool-cli-2.6.0.jar.md5

Lines changed: 0 additions & 1 deletion
This file was deleted.

libs/org/apktool/apktool-cli/2.6.0/apktool-cli-2.6.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

libs/org/apktool/apktool-cli/2.6.0/apktool-cli-2.6.0.pom

Lines changed: 0 additions & 8 deletions
This file was deleted.

libs/org/apktool/apktool-cli/2.6.0/apktool-cli-2.6.0.pom.md5

Lines changed: 0 additions & 1 deletion
This file was deleted.

libs/org/apktool/apktool-cli/2.6.0/apktool-cli-2.6.0.pom.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

libs/org/apktool/apktool-cli/maven-metadata.xml

Lines changed: 0 additions & 12 deletions
This file was deleted.

libs/org/apktool/apktool-cli/maven-metadata.xml.md5

Lines changed: 0 additions & 1 deletion
This file was deleted.

libs/org/apktool/apktool-cli/maven-metadata.xml.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<groupId>the.bytecode.club</groupId>
55
<artifactId>Bytecode-Viewer</artifactId>
6-
<version>2.11.1</version>
6+
<version>2.11.2</version>
77

88
<properties>
99
<!-- Project settings -->
@@ -15,8 +15,8 @@
1515
<!-- Dependency versions -->
1616
<annotations.version>23.0.0</annotations.version>
1717
<antlr4.version>4.9.3</antlr4.version>
18-
<apktool.version>2.6.0</apktool.version>
19-
<asm.version>9.2</asm.version>
18+
<apktool.version>2.6.1</apktool.version>
19+
<asm.version>9.3</asm.version>
2020
<bined.version>0.2.0</bined.version>
2121
<byteanalysis.version>1.0bcv</byteanalysis.version>
2222
<cfr.version>0.152</cfr.version>
@@ -31,12 +31,12 @@
3131
<darklaf.version>2.7.3</darklaf.version>
3232
<darklaf-extensions-rsta.version>0.3.4</darklaf-extensions-rsta.version>
3333
<decompiler-fernflower.version>5.2.1.Final</decompiler-fernflower.version>
34-
<dex2jar.version>v46</dex2jar.version>
35-
<fernflower.version>5a2b2cc</fernflower.version>
34+
<dex2jar.version>v49</dex2jar.version>
35+
<fernflower.version>4281855</fernflower.version>
3636
<gson.version>2.9.0</gson.version>
37-
<guava.version>31.0.1-jre</guava.version>
37+
<guava.version>31.1-jre</guava.version>
3838
<imgscalr-lib.version>4.2</imgscalr-lib.version>
39-
<jadx.version>1.3.3</jadx.version>
39+
<jadx.version>1.3.4</jadx.version>
4040
<janino.version>3.1.6</janino.version>
4141
<jd-gui.version>1.6.6bcv</jd-gui.version>
4242
<jgraphx.version>3.4.1.3</jgraphx.version>
@@ -409,7 +409,7 @@
409409
<filter>
410410
<artifact>*:*</artifact>
411411
<excludes>
412-
<exclude>module-info.class</exclude>
412+
<exclude>**/module-info.class</exclude>
413413
<exclude>META-INF/*.SF</exclude>
414414
<exclude>META-INF/*.DSA</exclude>
415415
<exclude>META-INF/*.RSA</exclude>

0 commit comments

Comments
 (0)