1 files changed, 4 insertions, 16 deletions

diff --git a/language/build.gradle b/language/build.gradle
index 31bf6bc5..0b8492c3 100644
--- a/language/build.gradle
+++ b/language/build.gradle
@@ -46,17 +46,10 @@ def generateXtextLanguage = tasks.register('generateXtextLanguage', JavaExec) {
         args += "rootPath=/${projectDir}/.."
 }
 
-def generateXtext = tasks.named('generateXtext')
-generateXtext.configure {
-        dependsOn generateXtextLanguage
-}
-
-tasks.named('compileJava') {
-        dependsOn generateXtext
-}
-
-tasks.named('processResources') {
-        dependsOn generateXtext
+for (taskName in ['compileJava', 'processResources', 'generateXtext', 'generateEclipseSourceFolders']) {
+        tasks.named(taskName) {
+                dependsOn generateXtextLanguage
+        }
 }
 
 tasks.named('clean') {
@@ -72,8 +65,3 @@ sonarqube.properties {
                 'src/testFixtures/xtext-gen/**',
         ]
 }
-
-tasks.named('eclipseJdt') {
-        // Make sure all xtext-gen source folders are available.
-        dependsOn generateXtextLanguage
-}