From a1575b6399db7057f68b7ed52bdab2469950442f Mon Sep 17 00:00:00 2001
From: Krazy <mitchell@krazyweb.net>
Date: Mon, 28 Apr 2014 01:23:55 +0000
Subject: [PATCH] Quick fix for building forge-gui-mobile-dev.
 forge-gui-android incomplete still.

---
 .gitattributes                            |   2 +-
 forge-gui-android/pom.xml                 | 133 ++++++++++++++++++++++
 forge-gui-mobile/.classpath               |  38 ++++---
 forge-gui-mobile/pom.xml                  |  72 +-----------
 forge-gui-mobile/src/forge/view/Main.java |  24 ----
 5 files changed, 155 insertions(+), 114 deletions(-)
 create mode 100644 forge-gui-android/pom.xml
 delete mode 100644 forge-gui-mobile/src/forge/view/Main.java

diff --git a/.gitattributes b/.gitattributes
index 44d9b1a3c99..b8c5520dd68 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -653,6 +653,7 @@ forge-gui-android/libs/gdx-sources.jar -text
 forge-gui-android/libs/gdx.jar -text
 forge-gui-android/libs/x86/libgdx.so -text
 forge-gui-android/lint.xml -text
+forge-gui-android/pom.xml -text
 forge-gui-android/proguard.cfg -text
 forge-gui-android/project.properties -text
 forge-gui-android/res/drawable-hdpi/ic_launcher.png -text
@@ -1194,7 +1195,6 @@ forge-gui-mobile/src/forge/util/LayoutHelper.java -text
 forge-gui-mobile/src/forge/util/PhysicsObject.java -text
 forge-gui-mobile/src/forge/util/Utils.java -text
 forge-gui-mobile/src/forge/util/WaitRunnable.java -text
-forge-gui-mobile/src/forge/view/Main.java -text
 forge-gui/.classpath -text
 forge-gui/.project -text
 forge-gui/.settings/org.eclipse.core.resources.prefs -text
diff --git a/forge-gui-android/pom.xml b/forge-gui-android/pom.xml
new file mode 100644
index 00000000000..3ab9441ac86
--- /dev/null
+++ b/forge-gui-android/pom.xml
@@ -0,0 +1,133 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<artifactId>forge</artifactId>
+		<groupId>forge</groupId>
+		<version>1.5.18-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>forge-gui-android</artifactId>
+	<packaging>apk</packaging>
+	<name>Forge</name>
+
+	<build>
+		<sourceDirectory>src</sourceDirectory>
+		<plugins>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.1</version>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>com.jayway.maven.plugins.android.generation2</groupId>
+				<artifactId>android-maven-plugin</artifactId>
+				<version>3.9.0-rc.1</version>
+				<extensions>true</extensions>
+				<configuration>
+					<sign>
+						<debug>true</debug>
+					</sign>
+					<sdk>
+						<platform>19</platform>
+					</sdk>
+					<dexForceJumbo>true</dexForceJumbo>
+					<deleteConflictingFiles>true</deleteConflictingFiles>
+					<androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile>
+					<assetsDirectory>${project.basedir}/assets</assetsDirectory>
+					<resourceDirectory>${project.basedir}/res</resourceDirectory>
+					<nativeLibrariesDirectory>${project.basedir}/libs</nativeLibrariesDirectory>
+					<extractDuplicates>true</extractDuplicates>
+					<proguard>
+						<config>${project.basedir}/proguard.cfg</config>
+					</proguard>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+		<dependency>
+			<groupId>com.google.android</groupId>
+			<artifactId>android</artifactId>
+			<version>4.1.1.4</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>forge</groupId>
+			<artifactId>forge-core</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>forge</groupId>
+			<artifactId>forge-game</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>forge</groupId>
+			<artifactId>forge-ai</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>forge</groupId>
+			<artifactId>forge-net</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>forge</groupId>
+			<artifactId>forge-gui</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>forge</groupId>
+			<artifactId>forge-gui-mobile</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>16.0.1</version>
+		</dependency>
+		<dependency>
+			<groupId>com.thoughtworks.xstream</groupId>
+			<artifactId>xstream</artifactId>
+			<version>1.4.7</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.3</version>
+		</dependency>
+		<dependency>
+			<groupId>com.badlogicgames.gdx</groupId>
+			<artifactId>gdx</artifactId>
+			<version>0.9.9</version>
+		</dependency>
+		<!-- <dependency>
+			<groupId>com.badlogicgames.gdx</groupId>
+			<artifactId>gdx-freetype</artifactId>
+			<version>0.9.9</version>
+		</dependency> -->
+		<dependency>
+			<groupId>com.badlogicgames.gdx</groupId>
+			<artifactId>gdx-freetype-platform</artifactId>
+			<version>0.9.9</version>
+		</dependency>
+		<dependency>
+			<groupId>xmlpull</groupId>
+			<artifactId>xmlpull</artifactId>
+			<version>1.1.3.1</version>
+			<scope>provided</scope>
+		</dependency>
+		<!-- <dependency>
+			<groupId>com.badlogicgames.gdx</groupId>
+			<artifactId>gdx-backend-android</artifactId>
+			<version>0.9.9</version>
+		</dependency> -->
+	</dependencies>
+
+</project>
\ No newline at end of file
diff --git a/forge-gui-mobile/.classpath b/forge-gui-mobile/.classpath
index d5410168633..6fb83883070 100644
--- a/forge-gui-mobile/.classpath
+++ b/forge-gui-mobile/.classpath
@@ -1,20 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/classes" path="src">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>
+        <classpathentry kind="src" output="target/classes" path="src">
+                <attributes>
+                        <attribute name="optional" value="true"/>
+                        <attribute name="maven.pomderived" value="true"/>
+                </attributes>
+        </classpathentry>
+        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+                <attributes>
+                        <attribute name="maven.pomderived" value="true"/>
+                </attributes>
+        </classpathentry>
+        <classpathentry exported="true" kind="lib" path="libs/gdx.jar" sourcepath="libs/gdx-sources.jar"/>
+        <classpathentry kind="lib" path="libs/gdx-freetype.jar"/>
+        <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+                <attributes>
+                        <attribute name="maven.pomderived" value="true"/>
+                </attributes>
+        </classpathentry>
+        <classpathentry kind="output" path="target/classes"/>
+</classpath>
\ No newline at end of file
diff --git a/forge-gui-mobile/pom.xml b/forge-gui-mobile/pom.xml
index b6b9a569302..c952fe8c368 100644
--- a/forge-gui-mobile/pom.xml
+++ b/forge-gui-mobile/pom.xml
@@ -9,54 +9,10 @@
 	</parent>
 
 	<artifactId>forge-gui-mobile</artifactId>
-	<packaging>apk</packaging>
+	<packaging>jar</packaging>
 	<name>Forge</name>
 
-	<build>
-		<sourceDirectory>src</sourceDirectory>
-		<plugins>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.1</version>
-				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>com.jayway.maven.plugins.android.generation2</groupId>
-				<artifactId>android-maven-plugin</artifactId>
-				<version>3.9.0-rc.1</version>
-				<extensions>true</extensions>
-				<configuration>
-					<sign>
-						<debug>true</debug>
-					</sign>
-					<sdk>
-						<platform>19</platform>
-					</sdk>
-					<dexForceJumbo>true</dexForceJumbo>
-					<deleteConflictingFiles>true</deleteConflictingFiles>
-					<androidManifestFile>${project.basedir}/../forge-gui-android/AndroidManifest.xml</androidManifestFile>
-					<assetsDirectory>${project.basedir}/../forge-gui-android/assets</assetsDirectory>
-					<resourceDirectory>${project.basedir}/../forge-gui-android/res</resourceDirectory>
-					<nativeLibrariesDirectory>${project.basedir}/../forge-gui-android/libs</nativeLibrariesDirectory>
-					<extractDuplicates>true</extractDuplicates>
-					<proguard>
-						<config>${project.basedir}/../forge-gui-android/proguard.cfg</config>
-					</proguard>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
 	<dependencies>
-		<dependency>
-			<groupId>com.google.android</groupId>
-			<artifactId>android</artifactId>
-			<version>4.1.1.4</version>
-			<scope>provided</scope>
-		</dependency>
 		<dependency>
 			<groupId>forge</groupId>
 			<artifactId>forge-core</artifactId>
@@ -97,32 +53,6 @@
 			<artifactId>commons-lang3</artifactId>
 			<version>3.3</version>
 		</dependency>
-		<dependency>
-			<groupId>com.badlogicgames.gdx</groupId>
-			<artifactId>gdx</artifactId>
-			<version>0.9.9</version>
-		</dependency>
-		<dependency>
-			<groupId>com.badlogicgames.gdx</groupId>
-			<artifactId>gdx-freetype</artifactId>
-			<version>0.9.9</version>
-		</dependency>
-		<dependency>
-			<groupId>com.badlogicgames.gdx</groupId>
-			<artifactId>gdx-freetype-platform</artifactId>
-			<version>0.9.9</version>
-		</dependency>
-		<dependency>
-			<groupId>xmlpull</groupId>
-			<artifactId>xmlpull</artifactId>
-			<version>1.1.3.1</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.badlogicgames.gdx</groupId>
-			<artifactId>gdx-backend-android</artifactId>
-			<version>0.9.9</version>
-		</dependency>
 	</dependencies>
 
 </project>
\ No newline at end of file
diff --git a/forge-gui-mobile/src/forge/view/Main.java b/forge-gui-mobile/src/forge/view/Main.java
deleted file mode 100644
index 25055ae5c0d..00000000000
--- a/forge-gui-mobile/src/forge/view/Main.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package forge.view;
-
-import android.content.pm.ActivityInfo;
-import android.os.Build;
-import android.os.Bundle;
-
-import com.badlogic.gdx.backends.android.AndroidApplication;
-
-import forge.Forge;
-
-public class Main extends AndroidApplication {
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        //setup portrait orientation
-        this.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-        if (Build.VERSION.SDK_INT > 8) { //use dual-side portrait mode if supported
-            this.setRequestedOrientation(7);
-        }
-
-        initialize(new Forge(getClipboard()), false);
-    }
-}