Update libGDX to 1.9.5 #270
This commit is contained in:
parent
61b8233b97
commit
feae45f78b
@ -14,8 +14,8 @@ allprojects {
|
|||||||
ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
|
ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
|
||||||
|
|
||||||
ext.androidBuildVersionTools = "25.0.2"
|
ext.androidBuildVersionTools = "25.0.2"
|
||||||
ext.gdxVersion = "1.9.4"
|
ext.gdxVersion = "1.9.5"
|
||||||
ext.gwtVersion = "2.7.0"
|
ext.gwtVersion = "2.8.0"
|
||||||
|
|
||||||
if (JavaVersion.current().isJava8Compatible()) {
|
if (JavaVersion.current().isJava8Compatible()) {
|
||||||
tasks.withType(Javadoc) {
|
tasks.withType(Javadoc) {
|
||||||
|
@ -11,7 +11,7 @@ include ':vtm-gdx'
|
|||||||
include ':vtm-desktop'
|
include ':vtm-desktop'
|
||||||
include ':vtm-android-gdx'
|
include ':vtm-android-gdx'
|
||||||
include ':vtm-web'
|
include ':vtm-web'
|
||||||
include ':vtm-web-app'
|
//include ':vtm-web-app'
|
||||||
//include ':vtm-web-js'
|
//include ':vtm-web-js'
|
||||||
include ':vtm-jeo'
|
include ':vtm-jeo'
|
||||||
include ':vtm-playground'
|
include ':vtm-playground'
|
||||||
|
@ -13,13 +13,12 @@ apply plugin: 'robovm'
|
|||||||
|
|
||||||
sourceSets.main.java.srcDirs = ["src/"]
|
sourceSets.main.java.srcDirs = ["src/"]
|
||||||
|
|
||||||
sourceCompatibility = '1.7'
|
|
||||||
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
|
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
|
||||||
|
|
||||||
ext {
|
ext {
|
||||||
// Configure your application main class
|
// Configure your application main class
|
||||||
mainClassName = "org.oscim.ios.RoboVmLauncher"
|
mainClassName = "org.oscim.ios.RoboVmLauncher"
|
||||||
roboVMVersion = "2.2.0"
|
roboVMVersion = "2.3.0"
|
||||||
}
|
}
|
||||||
|
|
||||||
launchIPhoneSimulator.dependsOn build
|
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
|
compileTask -> compileTask.dependsOn copyVtmResources
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.withType(org.gradle.api.tasks.compile.JavaCompile) {
|
tasks.withType(JavaCompile) {
|
||||||
compileTask -> compileTask.dependsOn copyVtmThemesResources
|
compileTask -> compileTask.dependsOn copyVtmThemesResources
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
buildscript {
|
buildscript {
|
||||||
repositories {
|
repositories {
|
||||||
maven { url 'http://dl.bintray.com/steffenschaefer/maven' }
|
jcenter()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'
|
classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
buildscript {
|
buildscript {
|
||||||
repositories {
|
repositories {
|
||||||
maven { url 'http://dl.bintray.com/steffenschaefer/maven' }
|
jcenter()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'
|
classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
buildscript {
|
buildscript {
|
||||||
repositories {
|
repositories {
|
||||||
maven { url 'http://dl.bintray.com/steffenschaefer/maven' }
|
jcenter()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.5'
|
classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -18,6 +18,7 @@ package com.badlogic.gdx.backends.gwt;
|
|||||||
|
|
||||||
import com.badlogic.gdx.Application;
|
import com.badlogic.gdx.Application;
|
||||||
import com.badlogic.gdx.ApplicationListener;
|
import com.badlogic.gdx.ApplicationListener;
|
||||||
|
import com.badlogic.gdx.ApplicationLogger;
|
||||||
import com.badlogic.gdx.Audio;
|
import com.badlogic.gdx.Audio;
|
||||||
import com.badlogic.gdx.Files;
|
import com.badlogic.gdx.Files;
|
||||||
import com.badlogic.gdx.Gdx;
|
import com.badlogic.gdx.Gdx;
|
||||||
@ -71,6 +72,7 @@ public abstract class GwtApplication implements EntryPoint, Application {
|
|||||||
private Panel root = null;
|
private Panel root = null;
|
||||||
private TextArea log = null;
|
private TextArea log = null;
|
||||||
private int logLevel = LOG_ERROR;
|
private int logLevel = LOG_ERROR;
|
||||||
|
private ApplicationLogger applicationLogger;
|
||||||
private Array<Runnable> runnables = new Array<Runnable>();
|
private Array<Runnable> runnables = new Array<Runnable>();
|
||||||
private Array<Runnable> runnablesHelper = new Array<Runnable>();
|
private Array<Runnable> runnablesHelper = new Array<Runnable>();
|
||||||
private Array<LifecycleListener> lifecycleListeners = new Array<LifecycleListener>();
|
private Array<LifecycleListener> lifecycleListeners = new Array<LifecycleListener>();
|
||||||
@ -415,6 +417,16 @@ public abstract class GwtApplication implements EntryPoint, Application {
|
|||||||
return logLevel;
|
return logLevel;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setApplicationLogger(ApplicationLogger applicationLogger) {
|
||||||
|
this.applicationLogger = applicationLogger;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ApplicationLogger getApplicationLogger() {
|
||||||
|
return applicationLogger;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ApplicationType getType() {
|
public ApplicationType getType() {
|
||||||
return ApplicationType.WebGL;
|
return ApplicationType.WebGL;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user