Merge branch 'feature-libgdx-upgrade' into devel

android/build.gradle

@@ -44,6 +44,7 @@ android {
             res.srcDirs = ['res/main']
             assets.srcDirs = ['assets']
             java.srcDir file('src/main/java')
+            jniLibs.srcDirs = ['libs']
         }
         androidTest {
             java.srcDir file('src/androidTest/java')
@@ -156,11 +157,6 @@ tasks.whenTaskAdded { compileTask ->
     }
 }
 
-// needed to add JNI shared libraries to APK when compiling on CLI
-tasks.withType(com.android.build.gradle.tasks.PackageApplication) { pkgTask ->
-    pkgTask.jniFolders = new HashSet<File>()
-    pkgTask.jniFolders.add(new File(projectDir, 'libs'))
-}
 // called every time gradle gets executed, takes the native dependencies of
 // the natives configuration, and extracts them to the proper libs/ folders
 // so they get packed with the APK.

build.gradle

@@ -4,16 +4,15 @@ import com.badlogic.gdx.tools.texturepacker.TexturePacker
 buildscript {
     repositories {
         //mavenCentral()
-        jcenter{
-            url "http://jcenter.bintray.com/"
-        }
+        maven { url 'https://jitpack.io' }
+        jcenter{ url "http://jcenter.bintray.com/" }
     }
     dependencies {
         classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'
-        classpath 'com.android.tools.build:gradle:1.2.3'
-        classpath 'org.robovm:robovm-gradle-plugin:1.2.0'
+        classpath 'com.android.tools.build:gradle:2.0.0'
+        classpath 'org.robovm:robovm-gradle-plugin:1.12.0'
         classpath 'de.felixschulze.gradle:gradle-spoon-plugin:2.1'
-        classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0'
+        classpath 'com.github.JakeWharton:sdk-manager-plugin:220bf7a88a7072df3ed16dc8466fb144f2817070'
         classpath 'com.novoda:gradle-android-command-plugin:1.3.0'
         classpath "com.badlogicgames.gdx:gdx-tools:1.6.1"
     }
@@ -56,13 +55,13 @@ allprojects {
         applicationIdDevelSuffix = '.devel'
         applicationIdDevel = applicationIdRelease + applicationIdDevelSuffix
 
-        gdxVersion = '1.6.1'
-		gdxUtilsVersion = '0.13.1'
+        gdxVersion = '1.9.2'
+		gdxUtilsVersion = '0.13.2'
 	    mbassadorVersion = '1.2.0'
-        roboVMVersion = '1.7.0'
-        box2DLightsVersion = '1.3'
-        ashleyVersion = '1.3.1'
-        aiVersion = '1.4.0'
+        roboVMVersion = '1.12.0'
+        box2DLightsVersion = '1.4'
+        ashleyVersion = '1.6.0'
+        aiVersion = '1.6.0'
         sqlDroidVersion = '1.0.3'
         sqlLiteJdbcVersion = '3.8.10.1'
         guavaVersion = '18.0'

core/src/cz/nic/tablexia/TablexiaApplication.java

@@ -215,8 +215,10 @@ public abstract class TablexiaApplication implements ApplicationListener {
     public void resize(int width, int height) {
         if (lastScreen != null) lastScreen.resize(width, height);
         if (screen != null) screen.resize(width, height);
-        stage.getViewport().update(width, height, true);
-        setScreenDimmerBounds();
+        if (stage != null) {
+            stage.getViewport().update(width, height, true);
+            setScreenDimmerBounds();
+        }
 
         if (screenSizeUnderThreshold != ComponentScaleUtil.isUnderThreshold()) {
             ApplicationBus.getInstance().publishAsync(new ScreenSizeThresholdChanged(ComponentScaleUtil.isUnderThreshold()));

gradle/wrapper/gradle-wrapper.properties

-#Fri Jan 09 13:07:45 CET 2015
+#Tue Apr 12 14:42:29 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip

ios/build.gradle

@@ -4,7 +4,6 @@ sourceCompatibility = '1.7'
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 
 robovm {
-	ipaArchs = "thumbv7:arm64"
     iosSkipSigning = false
 }
 
@@ -91,7 +90,7 @@ tasks.launchIOSDevice.doFirst {
     updateRoboVMProperties("devel", applicationIdDevel, 'Icon_devel')
 }
 
-tasks.create(name: "createDebugIPA", type: org.robovm.gradle.tasks.CreateIPATask) {
+tasks.create(name: "createDebugIPA", type: org.robovm.gradle.tasks.ArchiveTask) {
     doFirst {
     robovm.iosSignIdentity = TABLEXIA_IOS_SIGNING_IDENTITY
 	robovm.iosProvisioningProfile = TABLEXIA_IOS_DEBUG_PROVISIONING
@@ -99,7 +98,7 @@ tasks.create(name: "createDebugIPA", type: org.robovm.gradle.tasks.CreateIPATask
     }
 }
 
-tasks.create(name: "createReleaseIPA", type: org.robovm.gradle.tasks.CreateIPATask) {
+tasks.create(name: "createReleaseIPA", type: org.robovm.gradle.tasks.ArchiveTask) {
     doFirst {
     robovm.iosSignIdentity = TABLEXIA_IOS_SIGNING_IDENTITY
 	robovm.iosProvisioningProfile = TABLEXIA_IOS_RELEASE_PROVISIONING
@@ -136,4 +135,4 @@ createReleaseIPA.dependsOn updateRoboVMXML
 eclipse.project {
     name = appName + "-ios"
     natures 'org.robovm.eclipse.RoboVMNature'
-}
\ No newline at end of file
+}

wrapperVersion.gradle

+task wrapper(type: Wrapper) {
+    gradleVersion = '2.10'
+}