Skip to content

Commit 3390ac7

Browse files
KonlochKonloch
authored
Merge pull request #566 from ThexXTURBOXx/master
Update dependencies
2 parents a5a0f36 + fdd8ff3 commit 3390ac7

5 files changed

Lines changed: 30 additions & 28 deletions

File tree

‎pom.xml‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -13,48 +13,48 @@
1313
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1414

1515
<!-- Dependency versions -->
16-
<annotations.version>24.1.0</annotations.version>
17-
<apktool.version>2.11.0</apktool.version>
18-
<asm.version>9.9</asm.version>
16+
<annotations.version>26.0.2-1</annotations.version>
17+
<apktool.version>2.12.1</apktool.version>
18+
<asm.version>9.9.1</asm.version>
1919
<bined.version>0.2.2</bined.version>
2020
<byteanalysis.version>1.0bcv</byteanalysis.version>
2121
<cfr.version>0.152</cfr.version>
2222
<cloning.version>1.9.12</cloning.version>
23-
<commons-cli.version>1.9.0</commons-cli.version>
24-
<commons-codec.version>1.17.1</commons-codec.version>
23+
<commons-cli.version>1.11.0</commons-cli.version>
24+
<commons-codec.version>1.20.0</commons-codec.version>
2525
<commons-compiler.version>3.1.12</commons-compiler.version>
26-
<commons-compress.version>1.27.1</commons-compress.version>
27-
<commons-io.version>2.16.1</commons-io.version>
28-
<commons-lang3.version>3.17.0</commons-lang3.version>
29-
<commons-text.version>1.12.0</commons-text.version>
30-
<darklaf.version>3.0.2</darklaf.version>
26+
<commons-compress.version>1.28.0</commons-compress.version>
27+
<commons-io.version>2.21.0</commons-io.version>
28+
<commons-lang3.version>3.20.0</commons-lang3.version>
29+
<commons-text.version>1.15.0</commons-text.version>
30+
<darklaf.version>3.0.2</darklaf.version> <!-- Newer versions require Java 17+ -->
3131
<darklaf-extensions-rsta.version>0.4.1</darklaf-extensions-rsta.version>
3232
<decompiler-fernflower.version>6.3.9.Final</decompiler-fernflower.version>
33-
<dex2jar.version>2.4.22</dex2jar.version>
33+
<dex2jar.version>2.4.34</dex2jar.version>
34+
<disk-lib.version>1.2.0</disk-lib.version>
3435
<fernflower.version>e0d44f4</fernflower.version>
35-
<gson.version>2.11.0</gson.version>
36-
<guava.version>33.3.0-jre</guava.version>
36+
<google-java-format.version>1.7</google-java-format.version> <!-- Newer versions require Java 11+ -->
37+
<gson.version>2.13.2</gson.version>
38+
<guava.version>33.5.0-jre</guava.version>
3739
<httprequest.version>2.2.0</httprequest.version>
3840
<imgscalr-lib.version>4.2</imgscalr-lib.version>
3941
<jadx.version>1.4.7</jadx.version> <!-- Newer versions require Java 11+ -->
42+
<java-parser.version>3.27.1</java-parser.version>
4043
<jd-gui.version>1.6.6bcv</jd-gui.version>
4144
<jgraphx.version>3.4.1.3</jgraphx.version>
4245
<js.version>21.2.0</js.version>
4346
<objenesis.version>3.4</objenesis.version>
4447
<binary-data.version>0.2.2</binary-data.version>
4548
<procyon.version>0.6.0</procyon.version>
46-
<rsyntaxtextarea.version>3.5.2</rsyntaxtextarea.version> <!-- Upcoming 4.0 release will require Java 11+ -->
49+
<rsyntaxtextarea.version>3.6.0</rsyntaxtextarea.version> <!-- Upcoming 4.0 release will require Java 11+ -->
4750
<semantic-version.version>2.1.1</semantic-version.version>
48-
<slf4j.version>2.0.16</slf4j.version>
49-
<smali.version>3.0.8</smali.version>
51+
<slf4j.version>2.0.17</slf4j.version>
52+
<smali.version>3.0.9</smali.version>
5053
<safeyaml.version>1.34.1</safeyaml.version>
54+
<taskmanager.version>1.0.1</taskmanager.version>
5155
<treelayout.version>1.0.3</treelayout.version>
52-
<webp-imageio.version>a8f700b</webp-imageio.version>
56+
<webp-imageio.version>901abbd</webp-imageio.version>
5357
<xpp3.version>1.1.4c</xpp3.version>
54-
<java-parser.version>3.26.2</java-parser.version>
55-
<taskmanager.version>1.0.1</taskmanager.version>
56-
<google-java-format.version>1.7</google-java-format.version> <!-- Newer versions require Java 11+ -->
57-
<disk-lib.version>1.2.0</disk-lib.version>
5858
</properties>
5959

6060
<repositories>
@@ -420,15 +420,15 @@
420420
<plugin>
421421
<groupId>org.apache.maven.plugins</groupId>
422422
<artifactId>maven-checkstyle-plugin</artifactId>
423-
<version>3.5.0</version>
423+
<version>3.6.0</version>
424424
<configuration>
425425
<configLocation>checkstyle.xml</configLocation>
426426
</configuration>
427427
</plugin>
428428
<plugin>
429429
<groupId>org.apache.maven.plugins</groupId>
430430
<artifactId>maven-compiler-plugin</artifactId>
431-
<version>3.13.0</version>
431+
<version>3.14.1</version>
432432
<configuration>
433433
<source>${maven.compiler.source}</source>
434434
<target>${maven.compiler.target}</target>
@@ -438,15 +438,15 @@
438438
<plugin>
439439
<groupId>org.apache.maven.plugins</groupId>
440440
<artifactId>maven-javadoc-plugin</artifactId>
441-
<version>3.10.0</version>
441+
<version>3.12.0</version>
442442
<configuration>
443443
<source>${maven.compiler.source}</source>
444444
</configuration>
445445
</plugin>
446446
<plugin>
447447
<groupId>org.apache.maven.plugins</groupId>
448448
<artifactId>maven-shade-plugin</artifactId>
449-
<version>3.6.0</version>
449+
<version>3.6.1</version>
450450
<executions>
451451
<execution>
452452
<phase>package</phase>

‎src/main/java/the/bytecode/club/bytecodeviewer/plugin/PluginWriter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import com.google.common.io.Files;
2222
import com.konloch.disklib.DiskReader;
2323
import com.konloch.disklib.DiskWriter;
24-
import org.apache.commons.compress.utils.FileNameUtils;
24+
import org.apache.commons.io.FilenameUtils;
2525
import the.bytecode.club.bytecodeviewer.BytecodeViewer;
2626
import the.bytecode.club.bytecodeviewer.Configuration;
2727
import the.bytecode.club.bytecodeviewer.gui.components.FileChooser;
@@ -233,7 +233,7 @@ public void save()
233233
{
234234
try
235235
{
236-
final String ext = FileNameUtils.getExtension(pluginName);
236+
final String ext = FilenameUtils.getExtension(pluginName);
237237
JFileChooser fc = FileChooser.create(Configuration.getLastPluginDirectory(), "Save Plugin", "BCV Plugin", ext);
238238

239239
int returnVal = fc.showSaveDialog(BytecodeViewer.viewer);

‎src/main/java/the/bytecode/club/bytecodeviewer/resources/ResourceContainerImporter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ private ResourceContainerImporter importZipInputStream(boolean classesOnly) thro
224224
*/
225225
private ResourceContainerImporter importApacheZipFile(boolean classesOnly) throws IOException
226226
{
227-
try (ZipFile zipFile = new ZipFile(container.file))
227+
try (ZipFile zipFile = ZipFile.builder().setFile(container.file).get())
228228
{
229229
Enumeration<? extends ZipArchiveEntry> entries = zipFile.getEntries();
230230
while (entries.hasMoreElements())

‎src/main/resources/translations/english.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
"COMPILE_ON_SAVE": "Compile On Save",
6464
"COMPILE_ON_REFRESH": "Compile On Refresh",
6565
"REFRESH_ON_VIEW_CHANGE": "Refresh On View Change",
66+
"DISABLE_RELOAD_CONFIRMATION": "Disable Reload Confirmation",
6667
"DECODE_APK_RESOURCES": "Decode APK Resources",
6768
"APK_CONVERSION": "APK Conversion",
6869
"APK_CONVERSION_DECODING": "APK Conversion/Decoding",

‎src/main/resources/translations/german.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
"COMPILE_ON_SAVE": "Bei Speichern kompilieren",
6464
"COMPILE_ON_REFRESH": "Bei Aktualisierung kompilieren",
6565
"REFRESH_ON_VIEW_CHANGE": "Bei Änderung der Ansicht aktualisieren",
66+
"DISABLE_RELOAD_CONFIRMATION": "Bestätigung beim Neuladen deaktivieren",
6667
"DECODE_APK_RESOURCES": "APK Ressourcen dekodieren",
6768
"APK_CONVERSION": "APK-Umwandlung",
6869
"APK_CONVERSION_DECODING": "APK-Konvertierung",

0 commit comments

Comments
 (0)