diff --git a/forge-gui-android/pom.xml b/forge-gui-android/pom.xml index 76e136472a5..265cf68300d 100644 --- a/forge-gui-android/pom.xml +++ b/forge-gui-android/pom.xml @@ -2,15 +2,16 @@ 4.0.0 + C:\Users\Peter\AppData\Local\Android\Sdk yyyyMMdd-HHmm jar - -Xms1024m - -Xmx1536m + -Xms4g + -Xmx8g 1.6.30.001 - keystore - alias - storepass - keypass + C:\Users\Peter\forge.keystore + Forge + forge72 + forge72 user pass ftp.cardforge.org diff --git a/forge-gui-android/project.properties b/forge-gui-android/project.properties index 735ea3db305..c02eade458d 100644 --- a/forge-gui-android/project.properties +++ b/forge-gui-android/project.properties @@ -8,5 +8,8 @@ # project structure. # Project target. +dex.disable.merger=true +dex.disable.merger=true +dex.disable.merger=true project.type=0 -target=android-20 +target=android-25