diff --git a/build.gradle b/build.gradle index e9579750e766c80aa888f480449aeb706e95b000..fbcf7afe3d0856fdb6f9ca371e53804b9518591a 100644 --- a/build.gradle +++ b/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' diff --git a/gradle.properties b/gradle.properties index fa55fd1e14b8d2fed73f35d83db8fd615562e510..db8bf5542f9905910659f2361eeaaf4a8496bf94 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ -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 diff --git a/ios/Info.plist.xml b/ios/Info.plist.xml index da6f83710d131a7b1148defed95f1399f62c5b8c..fbe480ed333133bfb6797a815bda628129f43bd3 100644 --- a/ios/Info.plist.xml +++ b/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> diff --git a/ios/build.gradle b/ios/build.gradle index 29ae615b0cdd0de7ee4552db0ba22e16f7dcd27a..0cb41a5377b14f20d75548b8f445bb09d1baceb8 100644 --- a/ios/build.gradle +++ b/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') } } diff --git a/ios/data/Icon-72.png b/ios/data/Icon-72.png deleted file mode 100644 index d28a5256ca00d606594dd5b0058f5ed42840174c..0000000000000000000000000000000000000000 Binary files a/ios/data/Icon-72.png and /dev/null differ diff --git a/ios/data/Icon-72@2x.png b/ios/data/Icon-72@2x.png deleted file mode 100644 index 3fb40ba40e41684704e93d504a06917a656ca3d9..0000000000000000000000000000000000000000 Binary files a/ios/data/Icon-72@2x.png and /dev/null differ diff --git a/ios/data/Icon.png b/ios/data/Icon.png deleted file mode 100644 index f9d82ced2018dfbdef51edb90ae19a14cada498f..0000000000000000000000000000000000000000 Binary files a/ios/data/Icon.png and /dev/null differ diff --git a/ios/data/Icon@2x.png b/ios/data/Icon@2x.png deleted file mode 100644 index 724ae2382544092422f52a7a8528aa9738d44915..0000000000000000000000000000000000000000 Binary files a/ios/data/Icon@2x.png and /dev/null differ diff --git a/ios/data/Icon_debug-72.png b/ios/data/Icon_debug-72.png new file mode 100755 index 0000000000000000000000000000000000000000..2f653df9fcf632a97127e4a10f762f83600e965b Binary files /dev/null and b/ios/data/Icon_debug-72.png differ diff --git a/ios/data/Icon_debug-72@2x.png b/ios/data/Icon_debug-72@2x.png new file mode 100755 index 0000000000000000000000000000000000000000..01d91594bb34e9092d6b826f1c571379ce743d3f Binary files /dev/null and b/ios/data/Icon_debug-72@2x.png differ diff --git a/ios/data/Icon_debug.png b/ios/data/Icon_debug.png new file mode 100755 index 0000000000000000000000000000000000000000..f9593f442a715060e60613d49141f3d83debffec Binary files /dev/null and b/ios/data/Icon_debug.png differ diff --git a/ios/data/Icon_debug@2x.png b/ios/data/Icon_debug@2x.png new file mode 100755 index 0000000000000000000000000000000000000000..a0e4fc9fcb98a33ecad8f3ba12e6cd81c189f2ae Binary files /dev/null and b/ios/data/Icon_debug@2x.png differ diff --git a/ios/data/Icon_release-72.png b/ios/data/Icon_release-72.png new file mode 100755 index 0000000000000000000000000000000000000000..44f6830878e0e6fbe21315ef3a91d93ce0af1f1c Binary files /dev/null and b/ios/data/Icon_release-72.png differ diff --git a/ios/data/Icon_release-72@2x.png b/ios/data/Icon_release-72@2x.png new file mode 100755 index 0000000000000000000000000000000000000000..7d21f227cba47cdbcd85a2d53ccca19f6b2a5dea Binary files /dev/null and b/ios/data/Icon_release-72@2x.png differ diff --git a/ios/data/Icon_release.png b/ios/data/Icon_release.png new file mode 100755 index 0000000000000000000000000000000000000000..f99f707a57e68475c838bcc0ad46e32172b3de84 Binary files /dev/null and b/ios/data/Icon_release.png differ diff --git a/ios/data/Icon_release@2x.png b/ios/data/Icon_release@2x.png new file mode 100755 index 0000000000000000000000000000000000000000..ba49c295b73efda3cec47d85eafac0996bbc5fd0 Binary files /dev/null and b/ios/data/Icon_release@2x.png differ