From f5f2dc4e0978c3b8a76353edab0126771f7ea7cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubo=C5=A1=20Hor=C3=A1=C4=8Dek?= <horaceklubos@gmail.com>
Date: Mon, 11 May 2015 15:32:14 +0200
Subject: [PATCH] #9 Spoon tests
---
android/build.gradle | 18 ++++--------------
build.gradle | 5 +----
.../game/games/robbery/RobberyScreen.java | 18 ++++++++++--------
3 files changed, 15 insertions(+), 26 deletions(-)
diff --git a/android/build.gradle b/android/build.gradle
index 0da01d2f7..48e775443 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,17 +1,3 @@
-buildscript {
- repositories {
- mavenCentral()
- }
- dependencies {
- classpath('com.stanfy.spoon:spoon-gradle-plugin:0.14.1') {
- exclude module: 'commons-io'
- exclude module: 'guava'
- }
- classpath 'commons-io:commons-io:2.4'
- classpath 'com.google.guava:guava:17.0'
- }
-}
-
android {
buildToolsVersion "21.1.2"
compileSdkVersion 21
@@ -138,3 +124,7 @@ idea {
}
}
}
+
+spoon {
+ debug = true // for debug output
+}
diff --git a/build.gradle b/build.gradle
index a6020ac69..098107197 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,10 +7,7 @@ buildscript {
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('com.stanfy.spoon:spoon-gradle-plugin:0.14.1') {
- exclude module: 'commons-io'
- exclude module: 'guava'
- }
+ classpath('com.stanfy.spoon:spoon-gradle-plugin:1.0.2')
classpath 'commons-io:commons-io:2.4'
classpath 'com.google.guava:guava:17.0'
}
diff --git a/core/src/cz/nic/tablexia/game/games/robbery/RobberyScreen.java b/core/src/cz/nic/tablexia/game/games/robbery/RobberyScreen.java
index 0619a27da..4a1ec653f 100644
--- a/core/src/cz/nic/tablexia/game/games/robbery/RobberyScreen.java
+++ b/core/src/cz/nic/tablexia/game/games/robbery/RobberyScreen.java
@@ -1,13 +1,5 @@
package cz.nic.tablexia.game.games.robbery;
-import static com.badlogic.gdx.scenes.scene2d.actions.Actions.alpha;
-import static com.badlogic.gdx.scenes.scene2d.actions.Actions.fadeIn;
-import static com.badlogic.gdx.scenes.scene2d.actions.Actions.fadeOut;
-import static com.badlogic.gdx.scenes.scene2d.actions.Actions.run;
-import static com.badlogic.gdx.scenes.scene2d.actions.Actions.sequence;
-
-import java.util.List;
-
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.InputMultiplexer;
import com.badlogic.gdx.InputProcessor;
@@ -18,6 +10,8 @@ import com.badlogic.gdx.graphics.g2d.Batch;
import com.badlogic.gdx.math.Interpolation;
import com.badlogic.gdx.scenes.scene2d.Actor;
+import java.util.List;
+
import cz.nic.tablexia.game.common.RandomAccess;
import cz.nic.tablexia.game.difficulty.GameDifficulty;
import cz.nic.tablexia.game.games.robbery.assets.RobberyAssets;
@@ -28,6 +22,12 @@ import cz.nic.tablexia.graphics.ColorTexture;
import cz.nic.tablexia.loader.CommonAssets;
import cz.nic.tablexia.screen.AbstractTablexiaScreen;
+import static com.badlogic.gdx.scenes.scene2d.actions.Actions.alpha;
+import static com.badlogic.gdx.scenes.scene2d.actions.Actions.fadeIn;
+import static com.badlogic.gdx.scenes.scene2d.actions.Actions.fadeOut;
+import static com.badlogic.gdx.scenes.scene2d.actions.Actions.run;
+import static com.badlogic.gdx.scenes.scene2d.actions.Actions.sequence;
+
public class RobberyScreen extends AbstractTablexiaScreen<GameRule> {
private static int CREATURES_COUNT = 50;
@@ -325,6 +325,8 @@ public class RobberyScreen extends AbstractTablexiaScreen<GameRule> {
private void processNewScreen(AbstractTablexiaScreen<Void> newScreen) {
AbstractTablexiaScreen<Void> lastScreen = actualScreen;
actualScreen = newScreen;
+
+
inputMultiplexer.addProcessor(newScreen.getInputProcessor());
newScreen.show();
if (lastScreen != null) {
--
GitLab