9 files changed, 37 insertions, 56 deletions

diff --git a/.editorconfig b/.editorconfig
index 4615cdbf..5ce3abdf 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -13,4 +13,3 @@ indent_size = 4
 [*.{html,js,json,jsx,scss,ts,tsx,yml}]
 indent_style = space
 indent_size = 2
-
diff --git a/README.md b/README.md
index a6fb6bbc..6ffed9ff 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@
           
 7. Clone the project Git repository but do not import it into Eclipse yet.
 
-8. Open a new terminal an run `./gradlew eclipseJdt` (`.\gradlew eclipseJdt` on Windows) in the cloned repository.
+8. Open a new terminal an run `./gradlew prepareEclipse` (`.\gradlew prepareEclipse` on Windows) in the cloned repository.
     * This should complete without any compilation errors.
     * If you get any errors about the JVM version, check whether the `JAVA_HOME` environment variable is set to the location of JDK. You can query the variable with `echo $JAVA_HOME` on Linux and `echo $Env:JAVA_HOME` in PowerShell on Windows. To set it, use `export JAVA_HOME=/java/path/here` or `$Env:JAVA_HOME="C:\java\path\here"`, respectively.
 
diff --git a/build.gradle b/build.gradle
index 3591c286..b4980e02 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,6 +20,3 @@ sonarqube.properties {
         property 'sonar.organization', 'graphs4value'
         property 'sonar.host.url', 'https://sonarcloud.io'
 }
-
-apply plugin: 'eclipse'
-
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')
 }
diff --git a/language-ide/build.gradle b/language-ide/build.gradle
index 0556c716..fddf2245 100644
--- a/language-ide/build.gradle
+++ b/language-ide/build.gradle
@@ -7,12 +7,10 @@ dependencies {
         api "org.eclipse.xtext:org.eclipse.xtext.xbase.ide:${xtextVersion}"
 }
 
-def generateXtext = project(':refinery-language').tasks.named('generateXtext')
+def generateXtextLanguage = project(':refinery-language').tasks.named('generateXtextLanguage')
 
-tasks.named('compileJava') {
-        dependsOn generateXtext
-}
-
-tasks.named('processResources') {
-        dependsOn generateXtext
+for (taskName in ['compileJava', 'processResources']) {
+        tasks.named(taskName) {
+                dependsOn generateXtextLanguage
+        }
 }
diff --git a/language-model/build.gradle b/language-model/build.gradle
index fdfad305..b8797ffb 100644
--- a/language-model/build.gradle
+++ b/language-model/build.gradle
@@ -29,12 +29,10 @@ def generateEPackage = tasks.register('generateEPackage', JavaExec) {
         args += "rootPath=/${projectDir}"
 }
 
-tasks.named('compileJava') {
-        dependsOn generateEPackage
-}
-
-tasks.named('processResources') {
-        dependsOn generateEPackage
+for (taskName in ['compileJava', 'processResources', 'generateEclipseSourceFolders']) {
+        tasks.named(taskName) {
+                dependsOn generateEPackage
+        }
 }
 
 tasks.named('clean') {
diff --git a/language-web/build.gradle b/language-web/build.gradle
index 19a378f8..888cbb5c 100644
--- a/language-web/build.gradle
+++ b/language-web/build.gradle
@@ -12,19 +12,17 @@ dependencies {
         implementation "org.slf4j:slf4j-simple:${slf4JVersion}"
 }
 
-def generateXtext = project(':refinery-language').tasks.named('generateXtext')
+def generateXtextLanguage = project(':refinery-language').tasks.named('generateXtextLanguage')
 
-tasks.named('compileJava') {
-        dependsOn generateXtext
-}
-
-tasks.named('processResources') {
-        dependsOn generateXtext
+for (taskName in ['compileJava', 'processResources']) {
+        tasks.named(taskName) {
+                dependsOn generateXtextLanguage
+        }
 }
 
 def webpackOutputDir = "${buildDir}/webpack"
 def productionResources = "${webpackOutputDir}/production"
-def mainClass = 'org.eclipse.viatra.solver.language.web.ServerLauncher'
+def serverMainClass = 'org.eclipse.viatra.solver.language.web.ServerLauncher'
 
 apply plugin: 'org.siouan.frontend-jdk11'
 import org.siouan.frontendgradleplugin.infrastructure.gradle.RunNpmYarn
@@ -42,7 +40,7 @@ def installFrontend = tasks.named('installFrontend')
 
 def assembleFrontend = tasks.named('assembleFrontend')
 assembleFrontend.configure {
-        dependsOn generateXtext
+        dependsOn generateXtextLanguage
         inputs.dir 'src/main/css'
         inputs.dir 'src/main/html'
         inputs.dir 'src/main/js'
@@ -53,7 +51,7 @@ assembleFrontend.configure {
 
 tasks.register('webpackStats', RunNpmYarn) {
         dependsOn installFrontend
-        dependsOn generateXtext
+        dependsOn generateXtextLanguage
         inputs.dir 'src/main/css'
         inputs.dir 'src/main/html'
         inputs.dir 'src/main/js'
@@ -93,7 +91,7 @@ tasks.named('jar') {
 }
 
 apply plugin: 'application'
-mainClassName = mainClass
+mainClassName = serverMainClass
 distTar.enabled = false
 distZip.enabled = false
 
@@ -118,7 +116,7 @@ def jettyRun = tasks.register('jettyRun', JavaExec) {
         dependsOn assembleFrontend
         dependsOn sourceSets.main.runtimeClasspath
         classpath = sourceSets.main.runtimeClasspath.filter{it.exists()}
-        main = mainClass
+        mainClass = serverMainClass
         standardInput = System.in
         environment BASE_RESOURCE: productionResources
         group = 'run'
@@ -127,7 +125,7 @@ def jettyRun = tasks.register('jettyRun', JavaExec) {
 
 tasks.register('webpackServe', RunNpmYarn) {
         dependsOn installFrontend
-        dependsOn generateXtext
+        dependsOn generateXtextLanguage
         outputs.dir "${webpackOutputDir}/development"
         script = 'run serve'
         group = 'run'
@@ -145,9 +143,3 @@ sonarqube.properties {
                 'src/main/js/xtext/**',
         ]
 }
-
-eclipse {
-        project.file.whenMerged {
-                natures.remove('org.eclipse.wst.common.modulecore.ModuleCoreNature')
-        }
-}
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
-}