[SHIBUI-1317]

merge and clean build.gradle
TIER · Aug 6, 2019 · f7ffa8d · f7ffa8d
1 parent c4a041b
commit f7ffa8d
Showing 1 changed file with 6 additions and 25 deletions.
diff --git 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')