summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2018-09-14 00:37:47 +0200
committerJérémy Zurcher <jeremy@asynk.ch>2018-09-14 00:37:47 +0200
commita3cc66dc1fe2f468b234083baacd82a37c51fd3f (patch)
treee6b5d7dc243b918f7f68cb41bf62d9ea045137c5
parentad423ba369941ebd3f9cced4030291ac67c4b3c6 (diff)
downloadgdx-boardgame-a3cc66dc1fe2f468b234083baacd82a37c51fd3f.zip
gdx-boardgame-a3cc66dc1fe2f468b234083baacd82a37c51fd3f.tar.gz
desktop -> test
-rw-r--r--.gitignore1
-rw-r--r--assets/build.gradle6
-rw-r--r--build.gradle2
-rwxr-xr-xdo34
-rw-r--r--settings.gradle2
-rw-r--r--test/build.gradle (renamed from desktop/build.gradle)0
-rw-r--r--test/src/ch/asynk/gdx/board/test/Assets.java (renamed from desktop/src/ch/asynk/zproject/desktop/Assets.java)0
-rw-r--r--test/src/ch/asynk/gdx/board/test/DesktopLauncher.java (renamed from desktop/src/ch/asynk/zproject/desktop/DesktopLauncher.java)0
-rw-r--r--test/src/ch/asynk/gdx/board/test/GameBoard.java (renamed from desktop/src/ch/asynk/zproject/desktop/GameBoard.java)0
-rw-r--r--test/src/ch/asynk/gdx/board/test/GameHud.java (renamed from desktop/src/ch/asynk/zproject/desktop/GameHud.java)0
-rw-r--r--test/src/ch/asynk/gdx/board/test/GameScreen.java (renamed from desktop/src/ch/asynk/zproject/desktop/GameScreen.java)0
-rw-r--r--test/src/ch/asynk/gdx/board/test/GdxBoardTest.java (renamed from desktop/src/ch/asynk/zproject/desktop/GdxBoardTest.java)0
-rw-r--r--test/src/ch/asynk/gdx/board/test/LoadingScreen.java (renamed from desktop/src/ch/asynk/zproject/desktop/LoadingScreen.java)0
13 files changed, 6 insertions, 39 deletions
diff --git a/.gitignore b/.gitignore
index 5dc530a..a94d558 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,6 +70,7 @@ com_crashlytics_export_strings.xml
/android/build/
/core/build/
/desktop/build/
+/test/build/
/html/build/
/ios/build/
/ios-moe/build/
diff --git a/assets/build.gradle b/assets/build.gradle
index 7cf2e15..9ba20fd 100644
--- a/assets/build.gradle
+++ b/assets/build.gradle
@@ -9,18 +9,18 @@ dependencies {
defaultTasks 'build'
task clean(type: Delete) {
- delete '../desktop/build/assets'
+ delete '../test/build/assets'
}
task copyData(type: Copy) {
from 'data'
- into '../desktop/build/assets'
+ into '../test/build/assets'
}
task packLoading(type: JavaExec) {
main = 'com.badlogic.gdx.tools.texturepacker.TexturePacker'
classpath = configurations.texturePacker
- args = ['./loading', '../desktop/build/assets', 'loading']
+ args = ['./loading', '../test/build/assets', 'loading']
}
/* task buildUI(dependsOn: ["processXHDPI"]) { */
diff --git a/build.gradle b/build.gradle
index b6cb934..67d7b7c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,7 +28,7 @@ allprojects {
}
}
-project(":desktop") {
+project(":test") {
apply plugin: "java"
dependencies {
diff --git a/do b/do
deleted file mode 100755
index 1e62e13..0000000
--- a/do
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/bash
-
-ARGS="ctags desktop:run"
-
-function gradlew_do()
-{
- echo "./gradlew $ARGS" && ./gradlew $ARGS || exit 1
-}
-
-case "$1" in
-# clean
- "c")
- shift;
- ARGS="clean assets:build $ARGS"
- gradlew_do
- ;;
-# build
- "b")
- shift;
- ARGS="desktop:build"
- gradlew_do
- ;;
-# dist
- "d")
- shift;
- ARGS="desktop:dist $@"
- gradlew_do
- ;;
- *)
- ARGS="$ARGS $@"
- gradlew_do
- ;;
-esac
-
diff --git a/settings.gradle b/settings.gradle
index d957330..3788307 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include 'desktop', 'core', 'assets'
+include 'test', 'core', 'assets'
diff --git a/desktop/build.gradle b/test/build.gradle
index 8dde89f..8dde89f 100644
--- a/desktop/build.gradle
+++ b/test/build.gradle
diff --git a/desktop/src/ch/asynk/zproject/desktop/Assets.java b/test/src/ch/asynk/gdx/board/test/Assets.java
index e89d2a9..e89d2a9 100644
--- a/desktop/src/ch/asynk/zproject/desktop/Assets.java
+++ b/test/src/ch/asynk/gdx/board/test/Assets.java
diff --git a/desktop/src/ch/asynk/zproject/desktop/DesktopLauncher.java b/test/src/ch/asynk/gdx/board/test/DesktopLauncher.java
index 0e14b17..0e14b17 100644
--- a/desktop/src/ch/asynk/zproject/desktop/DesktopLauncher.java
+++ b/test/src/ch/asynk/gdx/board/test/DesktopLauncher.java
diff --git a/desktop/src/ch/asynk/zproject/desktop/GameBoard.java b/test/src/ch/asynk/gdx/board/test/GameBoard.java
index a2343db..a2343db 100644
--- a/desktop/src/ch/asynk/zproject/desktop/GameBoard.java
+++ b/test/src/ch/asynk/gdx/board/test/GameBoard.java
diff --git a/desktop/src/ch/asynk/zproject/desktop/GameHud.java b/test/src/ch/asynk/gdx/board/test/GameHud.java
index d2c8649..d2c8649 100644
--- a/desktop/src/ch/asynk/zproject/desktop/GameHud.java
+++ b/test/src/ch/asynk/gdx/board/test/GameHud.java
diff --git a/desktop/src/ch/asynk/zproject/desktop/GameScreen.java b/test/src/ch/asynk/gdx/board/test/GameScreen.java
index 253affa..253affa 100644
--- a/desktop/src/ch/asynk/zproject/desktop/GameScreen.java
+++ b/test/src/ch/asynk/gdx/board/test/GameScreen.java
diff --git a/desktop/src/ch/asynk/zproject/desktop/GdxBoardTest.java b/test/src/ch/asynk/gdx/board/test/GdxBoardTest.java
index 03726f7..03726f7 100644
--- a/desktop/src/ch/asynk/zproject/desktop/GdxBoardTest.java
+++ b/test/src/ch/asynk/gdx/board/test/GdxBoardTest.java
diff --git a/desktop/src/ch/asynk/zproject/desktop/LoadingScreen.java b/test/src/ch/asynk/gdx/board/test/LoadingScreen.java
index ee6ef2e..ee6ef2e 100644
--- a/desktop/src/ch/asynk/zproject/desktop/LoadingScreen.java
+++ b/test/src/ch/asynk/gdx/board/test/LoadingScreen.java