clean assets build

2 files changed, 5 insertions, 15 deletions

diff --git a/assets/build.gradle b/assets/build.gradle
index 9ba20fd..6301d59 100644
--- a/assets/build.gradle
+++ b/assets/build.gradle
@@ -8,26 +8,16 @@ dependencies {
 
 defaultTasks 'build'
 
-task clean(type: Delete) {
-    delete '../test/build/assets'
-}
-
-task copyData(type: Copy) {
-    from 'data'
-    into '../test/build/assets'
-}
-
 task packLoading(type: JavaExec) {
     main = 'com.badlogic.gdx.tools.texturepacker.TexturePacker'
     classpath = configurations.texturePacker
-    args = ['./loading', '../test/build/assets', 'loading']
+    args = ['loading', 'data', 'loading']
 }
 
-/* task buildUI(dependsOn: ["processXHDPI"]) { */
-task build(dependsOn: clean) {
+task build() {
     description "Builds the skin at various DPIs"
 }
 
 build.dependsOn {
-    tasks.findAll { task -> (task.name.startsWith('pack') || task.name.startsWith('copy')) }
+    tasks.findAll { task -> task.name.startsWith('pack') }
 }
diff --git a/test/build.gradle b/test/build.gradle
index 8dde89f..1be602a 100644
--- a/test/build.gradle
+++ b/test/build.gradle
@@ -6,7 +6,7 @@ sourceCompatibility = 1.8
 sourceSets.main.java.srcDirs = [ "src/" ]
 
 project.ext.mainClassName = "ch.asynk.gdx.board.test.DesktopLauncher"
-project.ext.assetsDir = new File("build/assets");
+project.ext.assetsDir = new File("../assets/data");
 
 task run(dependsOn: classes, type: JavaExec) {
     main = project.mainClassName
@@ -29,7 +29,7 @@ task debug(dependsOn: classes, type: JavaExec) {
 }
 
 task dist(type: Jar) {
-    from files(sourceSets.main.output.classesDir)
+    from files(sourceSets.main.output.classesDirs)
     from files(sourceSets.main.output.resourcesDir)
     from {configurations.compile.collect {zipTree(it)}}
     from files(project.assetsDir);