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

Merge branch 'master' into master2

Browse Source 
# Conflicts:
#	README.md
#	forge-gui-android/pom.xml
#	forge-gui-android/src/main/AndroidManifest.xml
This commit is contained in:
Anthony Calosa
2024-10-17 10:48:20 +08:00
parent 143f2d883f f5b30a6826
commit 0420ad4ef2
4 changed files with 80 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,6 +4,8 @@
<properties>
<timestamp>${maven.build.timestamp}</timestamp>
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
<android.manifest.versionCodeUpdateFromVersion>true</android.manifest.versionCodeUpdateFromVersion>
<android.manifestMerger.versionDigits>2,2,2,4</android.manifestMerger.versionDigits>
<packaging.type>jar</packaging.type>
<build.min.memory>-Xms1024m</build.min.memory>
<build.max.memory>-Xmx1536m</build.max.memory>
@@ -278,7 +280,6 @@
<buildTools>35.0.0</buildTools>
</sdk>
<dexForceJumbo>true</dexForceJumbo>
<androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile>
<assetsDirectory>${project.basedir}/assets</assetsDirectory>
<resourceDirectory>${project.basedir}/res</resourceDirectory>
<nativeLibrariesDirectory>${project.basedir}/libs</nativeLibrariesDirectory>
@@ -312,11 +313,6 @@
<goals>
<goal>manifest-merger</goal>
</goals>
<configuration>
<androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile>
<manifestVersionName>${snapshot-version}</manifestVersionName>
<manifestVersionCode>1</manifestVersionCode>
</configuration>
</execution>
</executions>
</plugin>
@@ -399,7 +395,6 @@
<verbose>false</verbose>
</zipalign>
<dexForceJumbo>true</dexForceJumbo>
<androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile>
<assetsDirectory>${project.basedir}/assets</assetsDirectory>
<resourceDirectory>${project.basedir}/res</resourceDirectory>
<nativeLibrariesDirectory>${project.basedir}/libs</nativeLibrariesDirectory>

4
forge-gui-android/AndroidManifest.xml → forge-gui-android/src/main/AndroidManifest.xml
View File

@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="forge.app"
android:versionCode="1"
android:versionName="1" > <!-- versionName and versionCode will be updated via manifestMerger in the pom -->
package="forge.app">
<uses-sdk
android:minSdkVersion="26"