From f7ffa8dd4d6236a6f34685d3cfc71274db9a9a2e Mon Sep 17 00:00:00 2001
From: Jj! <jj@unicon.net>
Date: Tue, 6 Aug 2019 16:01:53 -0500
Subject: [PATCH] [SHIBUI-1317] merge and clean build.gradle

---
 backend/build.gradle | 31 ++++++-------------------------
 1 file changed, 6 insertions(+), 25 deletions(-)

diff --git a/backend/build.gradle b/backend/build.gradle
index 2570b8693..805bc841b 100644
--- a/backend/build.gradle
+++ b/backend/build.gradle
@@ -55,13 +55,19 @@ sourceSets {
         java {
             srcDirs = []
         }
+        resources {
+            srcDir new File(buildDir, 'generated/ui')
+        }
     }
     integrationTest {
         groovy {
             srcDirs = ['src/integration/groovy']
+            compileClasspath += main.output
+            runtimeClasspath += main.output
         }
         resources {
             srcDir 'src/integration/resources'
+            srcDir new File(buildDir, 'generated/ui')
         }
     }
 
@@ -220,31 +226,6 @@ dependencies {
     enversTestRuntime configurations.testRuntime
 }
 
-sourceSets {
-    main {
-        groovy {
-            srcDirs = ['src/main/groovy', 'src/main/java', generatedSrcDir]
-        }
-        java {
-            srcDirs = []
-        }
-        resources {
-            srcDir new File(buildDir, 'generated/ui')
-        }
-    }
-    integrationTest {
-        groovy {
-            srcDirs = ['src/integration/groovy']
-            compileClasspath += main.output
-            runtimeClasspath += main.output
-        }
-        resources {
-            srcDir 'src/integration/resources'
-            srcDir new File(buildDir, 'generated/ui')
-        }
-    }
-}
-
 task copyUI(type: Copy) {
     from tasks.findByPath(':ui:npm_run_buildProd').outputs
     into new File(buildDir, 'generated/ui/static')