Merge pull request #37 from G8XSU/generated-code

Include generated source code in version control.

Author: G8XSU

java/app/build.gradle

@@ -23,18 +23,17 @@ repositories {
 
 sourceSets {
   main {
+    java {
+      srcDirs += './src/main/generated/proto'
+      srcDirs += './src/main/generated/jooq'
+      srcDirs -= './build/generated'
+    }
     proto {
       srcDir '../../proto'
     }
   }
 }
 
-idea {
-  module {
-    generatedSourceDirs.add(file("build/generated/proto/main"))
-  }
-}
-
 group 'org.vss'
 version '1.0'
 
@@ -81,12 +80,23 @@ protobuf {
   protoc {
     artifact = "com.google.protobuf:protoc:$protobufVersion"
   }
+
+  generatedFilesBaseDir = "${projectDir}/src/"
+  generateProtoTasks {
+    all().each { task ->
+      task.builtins {
+        java {
+          outputSubDir = 'generated/proto'
+        }
+      }
+    }
+  }
 }
 
 jooq {
   configurations {
     main {
-      generateSchemaSourceOnCompilation = true
+      generateSchemaSourceOnCompilation = false
 
       generationTool {
         jdbc {
@@ -115,7 +125,7 @@ jooq {
           }
           target {
             packageName = 'org.vss.postgres'
-            directory = 'build/generated-src/jooq/main'
+            directory = 'src/main/generated/jooq'
           }
           strategy.name = 'org.jooq.codegen.DefaultGeneratorStrategy'
         }