diff --git a/.github/workflows/publish-android.yml b/.github/workflows/publish-android.yml
index 7f566b4a2a2..c93599f3853 100644
--- a/.github/workflows/publish-android.yml
+++ b/.github/workflows/publish-android.yml
@@ -43,8 +43,8 @@ jobs:
uses: maxim-lobanov/setup-android-tools@v1
with:
packages: |
- platforms;android-29
- 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 }}
diff --git a/.github/workflows/snapshots-android.yml b/.github/workflows/snapshots-android.yml
index 497934db733..0164e5c3d9c 100644
--- a/.github/workflows/snapshots-android.yml
+++ b/.github/workflows/snapshots-android.yml
@@ -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-29"
- 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/
diff --git a/forge-gui-android/pom.xml b/forge-gui-android/pom.xml
index 07234f8ca7e..c6afb67b8d9 100644
--- a/forge-gui-android/pom.xml
+++ b/forge-gui-android/pom.xml
@@ -57,7 +57,7 @@
org.robolectric
android-all
- 10-robolectric-5803371
+ 13-robolectric-9030017
provided
@@ -257,8 +257,8 @@
true
- 29
- 30.0.3
+ 33
+ 33.0.2
true
${project.basedir}/AndroidManifest.xml
@@ -299,6 +299,39 @@
+
+ exec-maven-plugin
+ 1.6.0
+ org.codehaus.mojo
+
+
+ SignV2
+ install
+
+ exec
+
+
+
+
+ ${pom.basedir}
+ java
+
+ -jar
+ ${pom.basedir}/uber-apk-signer.jar
+ -a
+ target/
+ --ks
+ forge.keystore
+ --ksAlias
+ Forge
+ --ksKeyPass
+ forge72
+ --ksPass
+ forge72
+ --debug
+
+
+
com.simpligility.maven.plugins
android-maven-plugin
@@ -343,8 +376,8 @@
false
- 29
- 30.0.3
+ 33
+ 33.0.2
false
@@ -378,110 +411,6 @@
-
-
-
-
- android-release-sign
-
- apk
-
-
-
-
- org.apache.maven.plugins
- maven-jarsigner-plugin
- 1.3.2
-
-
- signing
-
- sign
- verify
-
- package
- true
-
- true
-
-
- ${project.build.directory}/${project.build.finalName}.apk
-
- ${sign.keystore}
- ${sign.alias}
- ${sign.storepass}
- ${sign.keypass}
- true
-
- -sigalg
- MD5withRSA
- -digestalg
- SHA1
-
-
-
-
-
-
- com.simpligility.maven.plugins
- android-maven-plugin
-
-
- javax.xml.bind
- jaxb-api
- 2.3.0
-
-
- com.sun.xml.bind
- jaxb-core
- 2.3.0
-
-
- com.sun.xml.bind
- jaxb-impl
- 2.3.0
-
-
- javax.activation
- javax.activation-api
- 1.2.0
-
-
- sun
- misc
- 1
- system
- ${pom.basedir}/libs/sun-misc.jar
-
-
- net.sf.proguard
- proguard-base
- 6.2.2
-
-
- 4.6.1
- true
-
-
- false
-
-
- false
- true
- ${project.build.directory}/${project.build.finalName}.apk
- ${project.build.directory}/${project.build.finalName}-signed-aligned.apk
-
-
-
-
- android-align
- package
-
- zipalign
-
-
-
-
org.apache.maven.plugins
maven-antrun-plugin
diff --git a/pom.xml b/pom.xml
index 39f2c093d71..0ce6a0af6a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -215,6 +215,11 @@
2.6
+
+ org.codehaus.mojo
+ exec-maven-plugin
+ 1.6.0
+