2 files changed, 12 insertions, 3 deletions

diff --git a/gradle/java-common.gradle b/gradle/java-common.gradle
index bfcf2657..0a63cfe1 100644
--- a/gradle/java-common.gradle
+++ b/gradle/java-common.gradle
@@ -16,6 +16,17 @@ tasks.named('jar') {
 
 apply plugin: 'eclipse'
 
+def generateEclipseSourceFolders = tasks.register('generateEclipseSourceFolders')
+
+tasks.register('prepareEclipse') {
+        dependsOn generateEclipseSourceFolders
+        dependsOn tasks.named('eclipseJdt')
+}
+
+tasks.named('eclipseClasspath') {
+        dependsOn generateEclipseSourceFolders
+}
+
 eclipse {
         classpath.file.whenMerged {
                 for (entry in entries) {
@@ -30,4 +41,3 @@ eclipse {
                 properties['org.eclipse.jdt.core.compiler.problem.unhandledWarningToken'] = 'ignore'
         }
 }
-
diff --git a/gradle/xtend.gradle b/gradle/xtend.gradle
index b70892c7..db1c2a57 100644
--- a/gradle/xtend.gradle
+++ b/gradle/xtend.gradle
@@ -27,8 +27,7 @@ sonarqube.properties {
         ]
 }
 
-tasks.named('eclipseJdt') {
-        // Make sure all xtend-gen source folders are available.
+tasks.named('generateEclipseSourceFolders') {
         dependsOn tasks.named('generateXtext')
         dependsOn tasks.named('generateTestXtext')
 }