external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

revert to sdk 29 (Android 10) until the v2 signing works on android 11 above

Browse Source
This commit is contained in:
Anthony Calosa
2024-09-09 21:04:35 +08:00
parent 7ea3e6b7b4
commit c40edf88e9
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/publish-android.yml vendored
View File

@@ -43,8 +43,8 @@ jobs:
uses: maxim-lobanov/setup-android-tools@v1 uses: maxim-lobanov/setup-android-tools@v1
with: with:
packages: | packages: |
platforms;android-33 platforms;android-29
build-tools;33.0.3 build-tools;30.0.3
- name: Install virtual framebuffer (if not available) to allow running GUI on a headless server - name: Install virtual framebuffer (if not available) to allow running GUI on a headless server
run: | run: |

4
.github/workflows/snapshots-android.yml vendored
View File

@@ -46,8 +46,8 @@ jobs:
- name: Set Up Android tools - name: Set Up Android tools
run: | 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 "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 "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;33.0.3" 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 - name: Install virtual framebuffer (if not available) to allow running GUI on a headless server
run: | run: |

2
forge-gui-android/AndroidManifest.xml
View File

@@ -7,7 +7,7 @@
<uses-sdk <uses-sdk
android:minSdkVersion="26" android:minSdkVersion="26"
android:targetSdkVersion="33" /> android:targetSdkVersion="29" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/> <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.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.REQUEST_INSTALL_PACKAGES" />

10
forge-gui-android/pom.xml
View File

@@ -57,7 +57,7 @@
<dependency> <dependency>
<groupId>org.robolectric</groupId> <groupId>org.robolectric</groupId>
<artifactId>android-all</artifactId> <artifactId>android-all</artifactId>
<version>13-robolectric-9030017</version> <version>10-robolectric-5803371</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@@ -257,8 +257,8 @@
<debug>true</debug> <debug>true</debug>
</sign> </sign>
<sdk> <sdk>
<platform>33</platform> <platform>29</platform>
<buildTools>33.0.3</buildTools> <buildTools>30.0.3</buildTools>
</sdk> </sdk>
<dexForceJumbo>true</dexForceJumbo> <dexForceJumbo>true</dexForceJumbo>
<androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile> <androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile>
@@ -343,8 +343,8 @@
<debug>false</debug> <debug>false</debug>
</sign> </sign>
<sdk> <sdk>
<platform>33</platform> <platform>29</platform>
<buildTools>33.0.3</buildTools> <buildTools>30.0.3</buildTools>
</sdk> </sdk>
<zipalign> <zipalign>
<verbose>false</verbose> <verbose>false</verbose>