Fixed GDX Setup UI to use MobiDevelop RoboVM fork. Reverted making MOE the default backend for iOS, not stable enough just yet. Default Gradle JVM heap is now 1.5GB, also uses daemon. Fixed IOSRobovmTests starter

4 files changed, 12 insertions, 12 deletions

diff --git a/extensions/gdx-setup/src/com/badlogic/gdx/setup/DependencyBank.java b/extensions/gdx-setup/src/com/badlogic/gdx/setup/DependencyBank.java
index 7de9d8000..d09eefbdf 100644
--- a/extensions/gdx-setup/src/com/badlogic/gdx/setup/DependencyBank.java
+++ b/extensions/gdx-setup/src/com/badlogic/gdx/setup/DependencyBank.java
@@ -25,7 +25,7 @@ public class DependencyBank {
 	static String libgdxVersion = "1.9.2";
 	//Temporary snapshot version, we need a more dynamic solution for pointing to the latest nightly
 	static String libgdxNightlyVersion = "1.9.3-SNAPSHOT";
-	static String roboVMVersion = "1.12.0";
+	static String roboVMVersion = "2.1.0";
 	static String moeVersion = "1.1.0.final-1";
 	static String buildToolsVersion = "23.0.1";
 	static String androidAPILevel = "20";
@@ -42,7 +42,7 @@ public class DependencyBank {
 	//Project plugins
 	static String gwtPluginImport = "de.richsource.gradle.plugins:gwt-gradle-plugin:0.6";
 	static String androidPluginImport = "com.android.tools.build:gradle:1.5.0";
-	static String roboVMPluginImport = "org.robovm:robovm-gradle-plugin:" + roboVMVersion;
+	static String roboVMPluginImport = "com.mobidevelop.robovm:robovm-gradle-plugin:" + roboVMVersion;
 	static String moePluginImport = "com.intel.gradle:moeGradlePlugin:" + moeVersion;
 	
 	//Extension versions
@@ -85,7 +85,7 @@ public class DependencyBank {
 			new String[]{"com.badlogicgames.gdx:gdx:$gdxVersion"},
 			new String[]{"com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion", "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"},
 			new String[]{"com.badlogicgames.gdx:gdx-backend-android:$gdxVersion", "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi", "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi-v7a", "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-arm64-v8a", "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86", "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86_64"},
-			new String[]{"org.robovm:robovm-rt:$roboVMVersion", "org.robovm:robovm-cocoatouch:$roboVMVersion", "com.badlogicgames.gdx:gdx-backend-robovm:$gdxVersion", "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-ios"},
+			new String[]{"com.mobidevelop.robovm:robovm-rt:$roboVMVersion", "com.mobidevelop.robovm:robovm-cocoatouch:$roboVMVersion", "com.badlogicgames.gdx:gdx-backend-robovm:$gdxVersion", "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-ios"},
 			new String[]{"com.badlogicgames.gdx:gdx-backend-moe:$gdxVersion", "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-ios"},
 			new String[]{"com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion", "com.badlogicgames.gdx:gdx:$gdxVersion:sources", "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion:sources"},
 			new String[]{"com.badlogic.gdx.backends.gdx_backends_gwt"},
diff --git a/extensions/gdx-setup/src/com/badlogic/gdx/setup/GdxSetupUI.java b/extensions/gdx-setup/src/com/badlogic/gdx/setup/GdxSetupUI.java
index fa01e93d0..ebd24e3e4 100644
--- a/extensions/gdx-setup/src/com/badlogic/gdx/setup/GdxSetupUI.java
+++ b/extensions/gdx-setup/src/com/badlogic/gdx/setup/GdxSetupUI.java
@@ -519,10 +519,12 @@ public class GdxSetupUI extends JFrame {
 			for (final ProjectType projectType : ProjectType.values()) {
 				if (projectType.equals(ProjectType.CORE)) {
 					continue;
-				}
-				modules.add(projectType);
+				}				
 				SetupCheckBox checkBox = new SetupCheckBox(projectType.getName().substring(0, 1).toUpperCase() + projectType.getName().substring(1, projectType.getName().length()));
-				checkBox.setSelected(true);
+				if (projectType != ProjectType.IOSMOE) {
+					modules.add(projectType);
+					checkBox.setSelected(true);
+				}
 				subProjectsPanel.add(checkBox);
 				checkBox.addItemListener(new ItemListener() {
 					@Override
diff --git a/extensions/gdx-setup/src/com/badlogic/gdx/setup/resources/gradle.properties b/extensions/gdx-setup/src/com/badlogic/gdx/setup/resources/gradle.properties
index f3ac04b3c..339fa1508 100644
--- a/extensions/gdx-setup/src/com/badlogic/gdx/setup/resources/gradle.properties
+++ b/extensions/gdx-setup/src/com/badlogic/gdx/setup/resources/gradle.properties
@@ -1,3 +1,3 @@
-org.gradle.daemon=false
-org.gradle.jvmargs=-Xms128m -Xmx512m
+org.gradle.daemon=true
+org.gradle.jvmargs=-Xms128m -Xmx1500m
 org.gradle.configureondemand=true
diff --git a/tests/gdx-tests-iosrobovm/src/com/badlogic/gdx/tests/IOSRobovmTests.java b/tests/gdx-tests-iosrobovm/src/com/badlogic/gdx/tests/IOSRobovmTests.java
index 7e5bafcc9..de8fd8d90 100644
--- a/tests/gdx-tests-iosrobovm/src/com/badlogic/gdx/tests/IOSRobovmTests.java
+++ b/tests/gdx-tests-iosrobovm/src/com/badlogic/gdx/tests/IOSRobovmTests.java
@@ -19,16 +19,14 @@ package com.badlogic.gdx.tests;
 import org.robovm.apple.foundation.NSAutoreleasePool;

 import org.robovm.apple.uikit.UIApplication;

 

-import com.badlogic.gdx.backends.iosmoe.IOSApplication;

-import com.badlogic.gdx.backends.iosmoe.IOSApplicationConfiguration;

+import com.badlogic.gdx.backends.iosrobovm.IOSApplication;

+import com.badlogic.gdx.backends.iosrobovm.IOSApplicationConfiguration;

 

 public class IOSRobovmTests extends IOSApplication.Delegate {

 	

 	@Override

 	protected IOSApplication createApplication() {

 		IOSApplicationConfiguration config = new IOSApplicationConfiguration();

-		config.useAccelerometer = false;

-		config.useGL30 = true;

 		return new IOSApplication(new BulletTestCollection(), config);

 	}