Update libGDX to 1.9.5 #270

mapsforge · Dec 14, 2016 · feae45f · feae45f
1 parent 61b8233
commit feae45f
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -14,8 +14,8 @@ allprojects {
     ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
 
     ext.androidBuildVersionTools = "25.0.2"
-    ext.gdxVersion = "1.9.4"
-    ext.gwtVersion = "2.7.0"
+    ext.gdxVersion = "1.9.5"
+    ext.gwtVersion = "2.8.0"
 
     if (JavaVersion.current().isJava8Compatible()) {
         tasks.withType(Javadoc) {

diff --git a/settings.gradle b/settings.gradle
@@ -11,7 +11,7 @@ include ':vtm-gdx'
 include ':vtm-desktop'
 include ':vtm-android-gdx'
 include ':vtm-web'
-include ':vtm-web-app'
+//include ':vtm-web-app'
 //include ':vtm-web-js'
 include ':vtm-jeo'
 include ':vtm-playground'

diff --git a/vtm-ios/build.gradle b/vtm-ios/build.gradle
@@ -13,13 +13,12 @@ apply plugin: 'robovm'
 
 sourceSets.main.java.srcDirs = ["src/"]
 
-sourceCompatibility = '1.7'
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 
 ext {
     // Configure your application main class
     mainClassName = "org.oscim.ios.RoboVmLauncher"
-    roboVMVersion = "2.2.0"
+    roboVMVersion = "2.3.0"
 }
 
 launchIPhoneSimulator.dependsOn build
@@ -47,11 +46,11 @@ task copyVtmThemesResources(type: Copy) {
 }
 
 
-tasks.withType(org.gradle.api.tasks.compile.JavaCompile) {
+tasks.withType(JavaCompile) {
     compileTask -> compileTask.dependsOn copyVtmResources
 }
 
-tasks.withType(org.gradle.api.tasks.compile.JavaCompile) {
+tasks.withType(JavaCompile) {
     compileTask -> compileTask.dependsOn copyVtmThemesResources
 }
 

diff --git a/vtm-web-app/build.gradle b/vtm-web-app/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     repositories {
-        maven { url 'http://dl.bintray.com/steffenschaefer/maven' }
+        jcenter()
     }
     dependencies {
         classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'

diff --git a/vtm-web-js/build.gradle b/vtm-web-js/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     repositories {
-        maven { url 'http://dl.bintray.com/steffenschaefer/maven' }
+        jcenter()
     }
     dependencies {
         classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'

diff --git a/vtm-web/build.gradle b/vtm-web/build.gradle
@@ -1,9 +1,9 @@
 buildscript {
     repositories {
-        maven { url 'http://dl.bintray.com/steffenschaefer/maven' }
+        jcenter()
     }
     dependencies {
-        classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.5'
+        classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'
     }
 }
 

diff --git a/vtm-web/src/org/oscim/gdx/emu/com/badlogic/gdx/backends/gwt/GwtApplication.java b/vtm-web/src/org/oscim/gdx/emu/com/badlogic/gdx/backends/gwt/GwtApplication.java
@@ -18,6 +18,7 @@
 
 import com.badlogic.gdx.Application;
 import com.badlogic.gdx.ApplicationListener;
+import com.badlogic.gdx.ApplicationLogger;
 import com.badlogic.gdx.Audio;
 import com.badlogic.gdx.Files;
 import com.badlogic.gdx.Gdx;
@@ -71,6 +72,7 @@ public abstract class GwtApplication implements EntryPoint, Application {
     private Panel root = null;
     private TextArea log = null;
     private int logLevel = LOG_ERROR;
+    private ApplicationLogger applicationLogger;
     private Array<Runnable> runnables = new Array<Runnable>();
     private Array<Runnable> runnablesHelper = new Array<Runnable>();
     private Array<LifecycleListener> lifecycleListeners = new Array<LifecycleListener>();
@@ -415,6 +417,16 @@ public int getLogLevel() {
         return logLevel;
     }
 
+    @Override
+    public void setApplicationLogger(ApplicationLogger applicationLogger) {
+        this.applicationLogger = applicationLogger;
+    }
+
+    @Override
+    public ApplicationLogger getApplicationLogger() {
+        return applicationLogger;
+    }
+
     @Override
     public ApplicationType getType() {
         return ApplicationType.WebGL;