From c40edf88e9976b6a3ebe247b968b2d89960a4bc5 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Mon, 9 Sep 2024 21:04:35 +0800
Subject: [PATCH] revert to sdk 29 (Android 10) until the v2 signing works on
 android 11 above

---
 .github/workflows/publish-android.yml   |  4 ++--
 .github/workflows/snapshots-android.yml |  4 ++--
 forge-gui-android/AndroidManifest.xml   |  2 +-
 forge-gui-android/pom.xml               | 10 +++++-----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/publish-android.yml b/.github/workflows/publish-android.yml
index dadb37381cb..7f566b4a2a2 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-33
-            build-tools;33.0.3
+            platforms;android-29
+            build-tools;30.0.3
 
       - name: Install virtual framebuffer (if not available) to allow running GUI on a headless server
         run: |
diff --git a/.github/workflows/snapshots-android.yml b/.github/workflows/snapshots-android.yml
index 11eb9bf5daa..497934db733 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-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.3"
+          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"
 
       - name: Install virtual framebuffer (if not available) to allow running GUI on a headless server
         run: |
diff --git a/forge-gui-android/AndroidManifest.xml b/forge-gui-android/AndroidManifest.xml
index 79ba1fe3ff7..3942958971e 100644
--- a/forge-gui-android/AndroidManifest.xml
+++ b/forge-gui-android/AndroidManifest.xml
@@ -7,7 +7,7 @@
 
     <uses-sdk
         android:minSdkVersion="26"
-        android:targetSdkVersion="33" />
+        android:targetSdkVersion="29" />
     <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" />
diff --git a/forge-gui-android/pom.xml b/forge-gui-android/pom.xml
index ddf570fca2d..7c8f4a92d45 100644
--- a/forge-gui-android/pom.xml
+++ b/forge-gui-android/pom.xml
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>org.robolectric</groupId>
             <artifactId>android-all</artifactId>
-            <version>13-robolectric-9030017</version>
+            <version>10-robolectric-5803371</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -257,8 +257,8 @@
                                 <debug>true</debug>
                             </sign>
                             <sdk>
-                                <platform>33</platform>
-                                <buildTools>33.0.3</buildTools>
+                                <platform>29</platform>
+                                <buildTools>30.0.3</buildTools>
                             </sdk>
                             <dexForceJumbo>true</dexForceJumbo>
                             <androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile>
@@ -343,8 +343,8 @@
                                 <debug>false</debug>
                             </sign>
                             <sdk>
-                                <platform>33</platform>
-                                <buildTools>33.0.3</buildTools>
+                                <platform>29</platform>
+                                <buildTools>30.0.3</buildTools>
                             </sdk>
                             <zipalign>
                                 <verbose>false</verbose>