From a8f6842e2131b518bf459500979264e707aec958 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Sun, 8 Sep 2024 21:30:29 +0800
Subject: [PATCH] update some dependency

---
 forge-core/pom.xml           |  2 +-
 forge-gui-desktop/pom.xml    | 13 ++++++++++++-
 forge-gui-mobile-dev/pom.xml |  4 ++--
 forge-gui/pom.xml            |  4 ++--
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/forge-core/pom.xml b/forge-core/pom.xml
index 7499150ba81..cd79999ddb5 100644
--- a/forge-core/pom.xml
+++ b/forge-core/pom.xml
@@ -16,7 +16,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>33.2.1-android</version>
+            <version>33.3.0-android</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
diff --git a/forge-gui-desktop/pom.xml b/forge-gui-desktop/pom.xml
index ade0b2b0bd0..6e21cbc0bbe 100644
--- a/forge-gui-desktop/pom.xml
+++ b/forge-gui-desktop/pom.xml
@@ -269,6 +269,12 @@
             <groupId>com.sipgate</groupId>
             <artifactId>mp3-wav</artifactId>
             <version>1.0.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.googlecode.soundlibs</groupId>
+                    <artifactId>jlayer</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
@@ -501,7 +507,7 @@
                                             <opt>--add-opens java.base/java.math=ALL-UNNAMED</opt>
                                             <opt>--add-opens java.base/jdk.internal.misc=ALL-UNNAMED</opt>
                                             <opt>--add-opens java.base/java.nio=ALL-UNNAMED</opt>
-                                            <opt>--add-opens=java.base/sun.nio.ch=ALL-UNNAMED</opt>
+                                            <opt>--add-opens java.base/sun.nio.ch=ALL-UNNAMED</opt>
                                             <opt>--add-opens java.base/java.util=ALL-UNNAMED</opt>
                                             <opt>--add-opens java.base/java.lang.reflect=ALL-UNNAMED</opt>
                                             <opt>--add-opens java.base/java.text=ALL-UNNAMED</opt>
@@ -585,11 +591,14 @@
                                             <fileset dir="${project.build.directory}" includes="${project.build.finalName}-jar-with-dependencies.jar" />
                                             <fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-adventure.exe" />
                                             <fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-adventure.sh" />
+                                            <fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-adventure-mac.sh" />
                                             <fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-adventure.command" />
                                             <fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-adventure.cmd" />
                                             <fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target" includes="forge-gui-mobile-dev-${project.version}-jar-with-dependencies.jar" />
+                                            <fileset dir="${project.build.directory}/../../forge-gui-mobile-dev/target/classes" includes="build.txt" />
                                             <fileset dir="${project.build.directory}/../../forge-adventure/target" includes="forge-adventure-editor.exe" />
                                             <fileset dir="${project.build.directory}/../../forge-adventure/target" includes="forge-adventure-editor.sh" />
+                                            <fileset dir="${project.build.directory}/../../forge-adventure/target" includes="forge-adventure-editor-mac.sh" />
                                             <fileset dir="${project.build.directory}/../../forge-adventure/target" includes="forge-adventure-editor.command" />
                                             <fileset dir="${project.build.directory}/../../forge-adventure/target" includes="forge-adventure-editor.cmd" />
                                             <fileset dir="${project.build.directory}/../../forge-adventure/target" includes="forge-adventure-${project.version}-jar-with-dependencies.jar" />
@@ -600,9 +609,11 @@
                                         <chmod file="${project.build.directory}/${project.build.finalName}/forge.command" perm="a+rx" />
                                         <chmod file="${project.build.directory}/${project.build.finalName}/forge.cmd" perm="a+rx" />
                                         <chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure.sh" perm="a+rx" />
+                                        <chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure-mac.sh" perm="a+rx" />
                                         <chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure.command" perm="a+rx" />
                                         <chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure.cmd" perm="a+rx" />
                                         <chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure-editor.sh" perm="a+rx" />
+                                        <chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure-editor-mac.sh" perm="a+rx" />
                                         <chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure-editor.command" perm="a+rx" />
                                         <chmod file="${project.build.directory}/${project.build.finalName}/forge-adventure-editor.cmd" perm="a+rx" />
                                         <chmod file="${project.build.directory}/${project.build.finalName}/forge.exe" perm="a+rx" />
diff --git a/forge-gui-mobile-dev/pom.xml b/forge-gui-mobile-dev/pom.xml
index 3581c65526c..e484c155c80 100644
--- a/forge-gui-mobile-dev/pom.xml
+++ b/forge-gui-mobile-dev/pom.xml
@@ -68,7 +68,7 @@
             <plugin>
                 <groupId>com.akathist.maven.plugins.launch4j</groupId>
                 <artifactId>launch4j-maven-plugin</artifactId>
-                <version>1.7.25</version>
+                <version>2.1.2</version>
                 <executions>
                     <execution>
                         <id>l4j-adv</id>
@@ -99,7 +99,7 @@
                                     <opt>--add-opens java.base/java.math=ALL-UNNAMED</opt>
                                     <opt>--add-opens java.base/jdk.internal.misc=ALL-UNNAMED</opt>
                                     <opt>--add-opens java.base/java.nio=ALL-UNNAMED</opt>
-                                    <opt>--add-opens=java.base/sun.nio.ch=ALL-UNNAMED</opt>
+                                    <opt>--add-opens java.base/sun.nio.ch=ALL-UNNAMED</opt>
                                     <opt>--add-opens java.base/java.util=ALL-UNNAMED</opt>
                                     <opt>--add-opens java.base/java.lang.reflect=ALL-UNNAMED</opt>
                                     <opt>--add-opens java.base/java.text=ALL-UNNAMED</opt>
diff --git a/forge-gui/pom.xml b/forge-gui/pom.xml
index 50a9263501f..edd205ea8cb 100644
--- a/forge-gui/pom.xml
+++ b/forge-gui/pom.xml
@@ -39,12 +39,12 @@
         <dependency>
             <groupId>com.thoughtworks.xstream</groupId>
             <artifactId>xstream</artifactId>
-            <version>1.4.19</version>
+            <version>1.4.20</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
-            <version>4.1.71.Final</version>
+            <version>4.1.113.Final</version>
             <scope>compile</scope>
         </dependency>
         <dependency>