Update Android build

.github/workflows/publish-android.yml

@@ -20,10 +20,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 8
+      - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '11'
           distribution: 'temurin'
           cache: 'maven'
           server-id: cardforge-repo
@@ -43,8 +43,8 @@ jobs:
         uses: maxim-lobanov/setup-android-tools@v1
         with:
           packages: |
-            platforms;android-26
-            build-tools;30.0.3
+            platforms;android-33
+            build-tools;33.0.2
 
       - name: Install virtual framebuffer (if not available) to allow running GUI on a headless server
         run: |
@@ -83,7 +83,7 @@ jobs:
       - name: Build/Install/Publish to GitHub Packages Apache Maven
         run: |
           export _JAVA_OPTIONS="-Xmx2g"
-          mvn -U -B -P android-release-build,android-release-sign,android-release-upload install -e -Dsign.keystore=forge.keystore -Dsign.alias=Forge -Dsign.storepass=${{ secrets.SIGN_STORE_PASS }} -Dsign.keypass=${{ secrets.SIGN_STORE_PASS }}  -Dcardforge-repo.username=${{ secrets.FTP_USERNAME }} -Dcardforge-repo.password=${{ secrets.FTP_PASSWORD }} -Dandroid.sdk.path=/usr/local/lib/android/sdk -Dandroid.buildToolsVersion=30.0.3 -Dmaven.test.skip=true
+          mvn -U -B -P android-release-build,android-release-upload install -e -Dcardforge-repo.username=${{ secrets.FTP_USERNAME }} -Dcardforge-repo.password=${{ secrets.FTP_PASSWORD }} -Dandroid.sdk.path=/usr/local/lib/android/sdk -Dandroid.buildToolsVersion=33.0.2 -Dmaven.test.skip=true
         env:
           GITHUB_TOKEN: ${{ github.token }}
 

.github/workflows/snapshots-android.yml

@@ -24,10 +24,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 8
+      - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '11'
           distribution: 'temurin'
           cache: 'maven'
           server-id: cardforge-repo
@@ -46,8 +46,8 @@ jobs:
       - name: Set Up Android tools
         run: |
           JAVA_HOME=${JAVA_HOME_11_X64} ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT "platform-tools"
-          JAVA_HOME=${JAVA_HOME_11_X64} ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT --install "platforms;android-26"
-          JAVA_HOME=${JAVA_HOME_11_X64} ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT --install "build-tools;30.0.3"
+          JAVA_HOME=${JAVA_HOME_11_X64} ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT --install "platforms;android-33"
+          JAVA_HOME=${JAVA_HOME_11_X64} ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT --install "build-tools;33.0.2"
 
       - name: Install virtual framebuffer (if not available) to allow running GUI on a headless server
         run: |
@@ -89,7 +89,7 @@ jobs:
           d=$(date +%m-%d)
           # Replace date in forge-gui-mobile/src/forge/Forge.java
           sed -i -e "s/-SNAPSHOT/-SNAPSHOT-${d}/g" forge-gui-mobile/src/forge/Forge.java
-          mvn -U -B -P android-release-build,android-release-sign install -e -Dsign.keystore=forge.keystore -Dsign.alias=Forge -Dsign.storepass=${{ secrets.SIGN_STORE_PASS }} -Dsign.keypass=${{ secrets.SIGN_STORE_PASS }}  -Dcardforge-repo.username=${{ secrets.FTP_USERNAME }} -Dcardforge-repo.password=${{ secrets.FTP_PASSWORD }} -Dandroid.sdk.path=/usr/local/lib/android/sdk -Dandroid.buildToolsVersion=30.0.3 -Dmaven.test.skip=true
+          mvn -U -B -P android-release-build install -e -Dcardforge-repo.username=${{ secrets.FTP_USERNAME }} -Dcardforge-repo.password=${{ secrets.FTP_PASSWORD }} -Dandroid.sdk.path=/usr/local/lib/android/sdk -Dandroid.buildToolsVersion=33.0.2 -Dmaven.test.skip=true
           mkdir -p  forge-gui-android/target/upload
           mv forge-gui-android/target/*-signed-aligned.apk forge-gui-android/target/upload/
           mv forge-gui-android/target/assets.zip forge-gui-android/target/upload/

forge-adventure/pom.xml

@@ -46,65 +46,19 @@
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>11</source>
+                    <target>11</target>
                 </configuration>
             </plugin>
 
             <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>
-                            <phase>package</phase>
-                            <goals>
-                                <goal>launch4j</goal>
-                            </goals>
-                            <configuration>
-                                <headerType>gui</headerType>
-                                <outfile>${project.build.directory}/forge-adventure-editor-java8.exe</outfile>
-                                <jar>${project.build.finalName}-jar-with-dependencies.jar</jar>
-                                <dontWrapJar>true</dontWrapJar>
-                                <errTitle>forge</errTitle>
-                                <icon>src/main/config/forge-adventure-editor.ico</icon>
-                                <classPath>
-                                    <mainClass>forge.adventure.Main</mainClass>
-                                    <addDependencies>false</addDependencies>
-                                    <preCp>anything</preCp>
-                                </classPath>
-                                <jre>
-                                    <minVersion>1.8.0</minVersion>
-                                    <maxHeapSize>4096</maxHeapSize>
-                                    <opts>
-                                        <opt>-Dfile.encoding=UTF-8</opt>
-                                    </opts>
-                                </jre>
-                                <versionInfo>
-                                    <fileVersion>
-                                        1.0.0.0
-                                    </fileVersion>
-                                    <txtFileVersion>
-                                        1.0.0.0
-                                    </txtFileVersion>
-                                    <fileDescription>Forge</fileDescription>
-                                    <copyright>Forge</copyright>
-                                    <productVersion>
-                                        1.0.0.0
-                                    </productVersion>
-                                    <txtProductVersion>
-                                        1.0.0.0
-                                    </txtProductVersion>
-                                    <productName>forge-adventure-editor</productName>
-                                    <internalName>forge-adventure-editor</internalName>
-                                    <originalFilename>forge-adventure-editor-java8.exe</originalFilename>
-                                </versionInfo>
-                            </configuration>
-                        </execution>
                         <!--extra-->
                         <execution>
-                            <id>l4j-adv2</id>
+                            <id>l4j-adv</id>
                             <phase>package</phase>
                             <goals>
                                 <goal>launch4j</goal>
@@ -132,7 +86,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>
@@ -285,7 +239,7 @@
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>22.0.0</version>
+            <version>24.1.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

forge-core/pom.xml

@@ -16,12 +16,12 @@
         <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>
             <artifactId>commons-lang3</artifactId>
-            <version>3.12.0</version>
+            <version>3.17.0</version>
         </dependency>
     </dependencies>
 

forge-gui-android/AndroidManifest.xml

@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="forge.app"
     android:versionCode="106650000"
     android:versionName="1.6.65" > <!-- versionName should be updated and it's used for Sentry releases tag -->
 
     <uses-sdk
         android:minSdkVersion="26"
-        android:targetSdkVersion="28" />
+        android:targetSdkVersion="33" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> <!-- This one needs Android Runtime Permission for Android 6+ -->
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" tools:node="remove" />
     <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
@@ -23,20 +26,22 @@
         android:icon="@mipmap/ic_launcher"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:label="@string/app_name"
-        android:largeHeap="true">
+        android:largeHeap="true"
+        android:resizeableActivity="false">
         <activity
-                android:name=".Launcher"
-                android:configChanges="density|fontScale|keyboard|keyboardHidden|layoutDirection|locale|mcc|mnc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|touchscreen|uiMode"
-                android:theme="@style/Theme.Transparent">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.SEND" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="text/plain" />
-            </intent-filter>
+            android:name=".Launcher"
+            android:configChanges="density|fontScale|keyboard|keyboardHidden|layoutDirection|locale|mcc|mnc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|touchscreen|uiMode"
+            android:theme="@style/Theme.Transparent"
+            android:exported="true">
+                <intent-filter>
+                    <action android:name="android.intent.action.MAIN" />
+                    <category android:name="android.intent.category.LAUNCHER" />
+                </intent-filter>
+                <intent-filter>
+                    <action android:name="android.intent.action.SEND" />
+                    <category android:name="android.intent.category.DEFAULT" />
+                    <data android:mimeType="text/plain" />
+                </intent-filter>
         </activity>
         <activity
             android:name=".Main"