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 @@ + android:targetSdkVersion="29" /> 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 @@ org.robolectric android-all - 13-robolectric-9030017 + 10-robolectric-5803371 provided @@ -257,8 +257,8 @@ true - 33 - 33.0.3 + 29 + 30.0.3 true ${project.basedir}/AndroidManifest.xml @@ -343,8 +343,8 @@ false - 33 - 33.0.3 + 29 + 30.0.3 false