Merge branch 'build_types' into 'devel'

Build types

See merge request !16

build.gradle

@@ -6,7 +6,7 @@ buildscript {
     dependencies {
         classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'
         classpath 'com.android.tools.build:gradle:1.0.0'
-        classpath 'org.robovm:robovm-gradle-plugin:1.0.0-beta-01'
+        classpath 'org.robovm:robovm-gradle-plugin:1.0.0'
     }
 }
 
@@ -24,10 +24,10 @@ allprojects {
         applicationIdDebugSuffix = '.debug'
         applicationIdDebug = applicationIdRelease + applicationIdDebugSuffix
 
-        gdxVersion = '1.5.2'
+        gdxVersion = '1.5.5'
 		gdxUtilsVersion = '0.9.1'
 	    mbassadorVersion = '1.2.0'
-        roboVMVersion = '1.0.0-beta-01'
+        roboVMVersion = '1.0.0'
         box2DLightsVersion = '1.3'
         ashleyVersion = '1.3.1'
         aiVersion = '1.4.0'

gradle.properties

-org.gradle.daemon=true
-org.gradle.jvmargs=-Xms128m -Xmx512m
-org.gradle.configureondemand=true
\ No newline at end of file
+org.gradle.daemon=false
+org.gradle.jvmargs=-Xms256m -Xmx1024m
+org.gradle.configureondemand=true

ios/Info.plist.xml

@@ -51,8 +51,8 @@
         <dict>
             <key>CFBundleIconFiles</key>
             <array>
-                <string>Icon</string>
-                <string>Icon-72</string>
+                <string>${app.icon}</string>
+                <string>${app.icon}-72</string>
             </array>
         </dict>
     </dict>

ios/build.gradle

@@ -3,12 +3,18 @@ sourceSets.main.java.srcDirs = [ "src/" ]
 sourceCompatibility = '1.7'
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 
+robovm {
+        iosSignIdentity = "iPhone Distribution: CZ.NIC, z.s.p.o. (NQZA4DGKTW)"
+        iosSkipSigning = false
+	ipaArchs = "thumbv7:arm64"
+}
+
 ext {
 	mainClassName = "cz.nic.tablexia.IOSLauncher"
 }
 
 // Updates or create a robovm.properties file.
-def updateRoboVMProperties(String buildType, String applicationId) {
+def updateRoboVMProperties(String buildType, String applicationId, String iconName) {
     Properties props = new Properties()
     def propsFile = file('robovm.properties')
 
@@ -18,6 +24,7 @@ def updateRoboVMProperties(String buildType, String applicationId) {
 
     props.load(propsFile.newDataInputStream())
     props.setProperty('app.name', appName)
+    props.setProperty('app.icon', iconName)
     props.setProperty('app.id', applicationId)
     props.setProperty('app.mainclass', mainClassName)
     props.setProperty('app.version', tablexiaVersionName)
@@ -72,13 +79,15 @@ task updateRoboVMXML << {
 
 tasks.create(name: "createDebugIPA", type: org.robovm.gradle.tasks.CreateIPATask) {
     doFirst {
-        updateRoboVMProperties("debug", applicationIdDebug)
+	robovm.iosProvisioningProfile = "Tablexia Debug Provisioning"
+        updateRoboVMProperties("debug", applicationIdDebug, 'Icon_debug')
     }
 }
 
 tasks.create(name: "createReleaseIPA", type: org.robovm.gradle.tasks.CreateIPATask) {
     doFirst {
-        updateRoboVMProperties("release", applicationIdRelease)
+	robovm.iosProvisioningProfile = "Tablexia Release Provisioning"
+        updateRoboVMProperties("release", applicationIdRelease, 'Icon_release')
     }
 }