From 206b0670a4e65c4d839092b682536b0ffe813161 Mon Sep 17 00:00:00 2001
From: Lem Dulfo <lemuel.dulfo@gmail.com>
Date: Sun, 10 Apr 2016 00:18:16 +0800
Subject: [PATCH] Fixed mainClassName error, fix entity generation

---
 GBDaoGenerator/build.gradle                               | 8 +++++---
 .../gadgetbridge/daogen/GBDaoGenerator.java               | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/GBDaoGenerator/build.gradle b/GBDaoGenerator/build.gradle
index 897609bc..a708acb1 100644
--- a/GBDaoGenerator/build.gradle
+++ b/GBDaoGenerator/build.gradle
@@ -13,14 +13,16 @@ sourceSets {
     main {
         java {
             srcDir 'src'
-            srcDir 'src-gen'
         }
     }
 }
 
-task (genSources, type: JavaExec) {
-    main = "nodomain.freeyourgadget.gadgetbridge.daogen.GBDaoGenerator"
+mainClassName = "nodomain.freeyourgadget.gadgetbridge.daogen.GBDaoGenerator"
+
+task genSources(type: JavaExec) {
+    main = mainClassName
     classpath = sourceSets.main.runtimeClasspath
+    workingDir = '../'
 }
 
 artifacts {
diff --git a/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java b/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java
index 651b1aa3..5d1cb457 100644
--- a/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java
+++ b/GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java
@@ -40,7 +40,7 @@ public class GBDaoGenerator {
 
         addActivitySample(schema, user, device);
 
-        new DaoGenerator().generateAll(schema, "../app/src/main/gen");
+        new DaoGenerator().generateAll(schema, "app/src/main/java");
     }
 
     private static Entity addUserInfo(Schema schema, Entity userAttributes) {