From acac0ee5e282d6f90d473841c33a4e0d2045b1a0 Mon Sep 17 00:00:00 2001
From: klaxnek <klaxnek@gmail.com>
Date: Wed, 4 Dec 2019 23:09:03 +0100
Subject: [PATCH] Add personal changes

---
 forge-gui-android/pom.xml            | 13 +++++++------
 forge-gui-android/project.properties |  5 ++++-
 2 files changed, 11 insertions(+), 7 deletions(-)

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 @@
     <modelVersion>4.0.0</modelVersion>
 
     <properties>
+        <android.sdk.path>C:\Users\Peter\AppData\Local\Android\Sdk</android.sdk.path>
         <maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
         <packaging.type>jar</packaging.type>
-        <build.min.memory>-Xms1024m</build.min.memory>
-        <build.max.memory>-Xmx1536m</build.max.memory>
+        <build.min.memory>-Xms4g</build.min.memory>
+        <build.max.memory>-Xmx8g</build.max.memory>
         <alpha-version>1.6.30.001</alpha-version>
-        <sign.keystore>keystore</sign.keystore>
-        <sign.alias>alias</sign.alias>
-        <sign.storepass>storepass</sign.storepass>
-        <sign.keypass>keypass</sign.keypass>
+        <sign.keystore>C:\Users\Peter\forge.keystore</sign.keystore>
+        <sign.alias>Forge</sign.alias>
+        <sign.storepass>forge72</sign.storepass>
+        <sign.keypass>forge72 </sign.keypass>
         <cardforge.user>user</cardforge.user>
         <cardforge.pass>pass</cardforge.pass>
         <cardforge.server>ftp.cardforge.org</cardforge.server>
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