diff --git a/.gitignore b/.gitignore index 7fb938da444..cd7675ff213 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ forge-ai/target forge-core/forge-core.iml forge-core/target forge-game/target +forge-gui-android/*.iml forge-gui-android/*.keystore forge-gui-android/assets/fallback_skin/Thumbs.db forge-gui-android/bin @@ -47,7 +48,9 @@ forge-gui-android/res/values/target forge-gui-android/target forge-gui-desktop/*.iml forge-gui-desktop/target +forge-gui-ios/*.iml forge-gui-ios/target +forge-gui-mobile-dev/*.iml forge-gui-mobile-dev/bin forge-gui-mobile-dev/fallback_skin/Thumbs.db forge-gui-mobile-dev/res diff --git a/forge-gui-android/pom.xml b/forge-gui-android/pom.xml index f0bfc46cf34..d77f8074bac 100644 --- a/forge-gui-android/pom.xml +++ b/forge-gui-android/pom.xml @@ -8,6 +8,12 @@ -Xms128m -Xmx1024m 1.5.41.001 + keystore + alias + storepass + keypass + ftpuser + ftppass @@ -109,9 +115,9 @@ - com.jayway.maven.plugins.android.generation2 + com.simpligility.maven.plugins android-maven-plugin - 3.9.0-rc.2 + 4.2.1 true @@ -121,7 +127,6 @@ 20 true - true ${project.basedir}/AndroidManifest.xml ${project.basedir}/assets ${project.basedir}/res @@ -138,10 +143,6 @@ ${build.max.memory} - - ${build.min.memory} - ${build.max.memory} - @@ -155,9 +156,9 @@ - com.jayway.maven.plugins.android.generation2 + com.simpligility.maven.plugins android-maven-plugin - 3.9.0-rc.2 + 4.2.1 true @@ -170,7 +171,6 @@ false true - true ${project.basedir}/AndroidManifest.xml ${project.basedir}/assets ${project.basedir}/res @@ -187,10 +187,6 @@ ${build.max.memory} - - ${build.min.memory} - ${build.max.memory} - @@ -238,9 +234,9 @@ - com.jayway.maven.plugins.android.generation2 + com.simpligility.maven.plugins android-maven-plugin - 3.9.0-rc.2 + 4.2.1 true @@ -328,12 +324,12 @@ commons-net commons-net - 1.4.1 + 3.3 - ant + org.apache.ant ant-commons-net - 1.6.5 + 1.9.4 diff --git a/pom.xml b/pom.xml index 1d5d80e23c9..973f3e7dbb4 100644 --- a/pom.xml +++ b/pom.xml @@ -193,6 +193,10 @@ forge-ai forge-gui forge-gui-desktop + forge-gui-mobile + forge-gui-mobile-dev + forge-gui-android + forge-gui-ios