From ce26f12d4efab9cc279d78445eaf96478e6e1dc6 Mon Sep 17 00:00:00 2001 From: Oliver Jan Krylow Date: Sun, 9 Apr 2017 21:07:15 +0200 Subject: [PATCH] Update to gradle 3.3 and light cleanup. --- .../src/io/github/lonamiwebs/klooni/AndroidLauncher.java | 1 - build.gradle | 2 +- core/src/io/github/lonamiwebs/klooni/Klooni.java | 9 ++------- .../io/github/lonamiwebs/klooni/game/PieceHolder.java | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/android/src/io/github/lonamiwebs/klooni/AndroidLauncher.java b/android/src/io/github/lonamiwebs/klooni/AndroidLauncher.java index bd09751..97611d5 100644 --- a/android/src/io/github/lonamiwebs/klooni/AndroidLauncher.java +++ b/android/src/io/github/lonamiwebs/klooni/AndroidLauncher.java @@ -4,7 +4,6 @@ import android.os.Bundle; import com.badlogic.gdx.backends.android.AndroidApplication; import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration; -import io.github.lonamiwebs.klooni.Klooni; public class AndroidLauncher extends AndroidApplication { @Override diff --git a/build.gradle b/build.gradle index 0a3ce47..7ce013a 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6' - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:2.3.1' classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.0' } } diff --git a/core/src/io/github/lonamiwebs/klooni/Klooni.java b/core/src/io/github/lonamiwebs/klooni/Klooni.java index 33e1f3d..0edac21 100644 --- a/core/src/io/github/lonamiwebs/klooni/Klooni.java +++ b/core/src/io/github/lonamiwebs/klooni/Klooni.java @@ -41,7 +41,7 @@ public class Klooni extends Game { skin.add("button_up", new NinePatch(new Texture( Gdx.files.internal("ui/button_up.png")), 28, 28, 28, 28)); - skin.add("button_down", new NinePatch(new Texture( + skin.add("button_dscalableown", new NinePatch(new Texture( Gdx.files.internal("ui/button_down.png")), 28, 28, 28, 28)); skin.add("play_texture", new Texture(Gdx.files.internal("ui/play.png"))); @@ -82,12 +82,7 @@ public class Klooni extends Game { //endregion //region Screen - - @Override - public void render() { - super.render(); - } - + // TransitionScreen will also dispose by default the previous screen public void transitionTo(Screen screen) { transitionTo(screen, true); diff --git a/core/src/io/github/lonamiwebs/klooni/game/PieceHolder.java b/core/src/io/github/lonamiwebs/klooni/game/PieceHolder.java index 6b614f3..49d7705 100644 --- a/core/src/io/github/lonamiwebs/klooni/game/PieceHolder.java +++ b/core/src/io/github/lonamiwebs/klooni/game/PieceHolder.java @@ -223,7 +223,7 @@ public class PieceHolder implements BinSerializable { Gdx.input.getX(), Gdx.graphics.getHeight() - Gdx.input.getY()); // Y axis is inverted - if (Klooni.onDesktop) { + if (Klooni.onDesktop) { //FIXME(oliver): This is a bad assumption to make. There are desktops with touch input and non-desktops with mouse input. // Center the piece to the mouse mouse.sub(piece.getRectangle().width * 0.5f, piece.getRectangle().height * 0.5f); } else { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2d5bc7c..dd70a4a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Jan 21 20:46:40 CET 2017 +#Sat Apr 08 12:05:23 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip