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

update target sdk and build tools to 33

Browse Source
This commit is contained in:
Anthony Calosa
2024-09-09 14:18:37 +08:00
parent a8f6842e21
commit af89e52213
3 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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-29" 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;30.0.3" 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"
- 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: |

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

@@ -7,7 +7,7 @@
<uses-sdk <uses-sdk
android:minSdkVersion="26" android:minSdkVersion="26"
android:targetSdkVersion="29" /> android:targetSdkVersion="33" />
<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" />
@@ -29,18 +29,19 @@
android:largeHeap="true" android:largeHeap="true"
android:resizeableActivity="false"> android:resizeableActivity="false">
<activity <activity
android:name=".Launcher" android:name=".Launcher"
android:configChanges="density|fontScale|keyboard|keyboardHidden|layoutDirection|locale|mcc|mnc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|touchscreen|uiMode" android:configChanges="density|fontScale|keyboard|keyboardHidden|layoutDirection|locale|mcc|mnc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|touchscreen|uiMode"
android:theme="@style/Theme.Transparent"> android:theme="@style/Theme.Transparent"
<intent-filter> android:exported="true">
<action android:name="android.intent.action.MAIN" /> <intent-filter>
<category android:name="android.intent.category.LAUNCHER" /> <action android:name="android.intent.action.MAIN" />
</intent-filter> <category android:name="android.intent.category.LAUNCHER" />
<intent-filter> </intent-filter>
<action android:name="android.intent.action.SEND" /> <intent-filter>
<category android:name="android.intent.category.DEFAULT" /> <action android:name="android.intent.action.SEND" />
<data android:mimeType="text/plain" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> <data android:mimeType="text/plain" />
</intent-filter>
</activity> </activity>
<activity <activity
android:name=".Main" android:name=".Main"

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>10-robolectric-5803371</version> <version>13-robolectric-9030017</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>29</platform> <platform>33</platform>
<buildTools>30.0.3</buildTools> <buildTools>33.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>29</platform> <platform>33</platform>
<buildTools>30.0.3</buildTools> <buildTools>33.0.3</buildTools>
</sdk> </sdk>
<zipalign> <zipalign>
<verbose>false</verbose> <verbose>false</verbose>