Refactoring based on Sonar reports

4 files changed, 82 insertions, 28 deletions

diff --git a/gradle/java-common.gradle b/gradle/java-common.gradle
new file mode 100644
index 00000000..0cc09a4f
--- /dev/null
+++ b/gradle/java-common.gradle
@@ -0,0 +1,50 @@
+repositories {
+        mavenCentral()
+}
+
+apply plugin: 'java'
+apply plugin: 'org.xtext.xtend'
+
+sourceCompatibility = '11'
+targetCompatibility = '11'
+
+sourceSets {
+        main {
+                xtendOutputDir = 'src/main/xtend-gen'
+        }
+        test {
+                xtendOutputDir = 'src/test/xtend-gen'
+        }
+}
+
+configurations.all {
+        exclude group: 'asm'
+}
+
+jar {
+        manifest {
+                attributes 'Bundle-SymbolicName': project.name
+        }
+}
+
+clean.doLast {
+        delete 'src/main/xtend-gen'
+        delete 'src/test/xtend-gen'
+}
+
+apply plugin: 'eclipse'
+
+eclipse {
+        classpath.file.whenMerged {
+                for (entry in entries) {
+                        if (entry.path.endsWith('-gen')) {
+                                entry.entryAttributes['ignore_optional_problems'] = true
+                        }
+                }
+        }
+        
+        jdt.file.whenMerged { properties ->
+                // Allow @SupperessWarnings to suppress SonalLint warnings
+                properties['org.eclipse.jdt.core.compiler.problem.unhandledWarningToken'] = 'ignore'
+        }
+}
diff --git a/gradle/mwe2.gradle b/gradle/mwe2.gradle
new file mode 100644
index 00000000..5fd53126
--- /dev/null
+++ b/gradle/mwe2.gradle
@@ -0,0 +1,11 @@
+configurations {
+        mwe2 {
+                extendsFrom compile
+        }
+}
+
+dependencies {
+        mwe2 "org.eclipse.emf:org.eclipse.emf.mwe2.launch:${mwe2Version}"
+}
+
+eclipse.classpath.plusConfigurations += [configurations.mwe2]
diff --git a/gradle/source-layout.gradle b/gradle/source-layout.gradle
deleted file mode 100644
index 254798f1..00000000
--- a/gradle/source-layout.gradle
+++ /dev/null
@@ -1,28 +0,0 @@
-sourceSets {
-        main {
-                java.srcDirs = ['src/main/java', 'src/main/xtext-gen']
-                resources.srcDirs = ['src/main/resources', 'src/main/xtext-gen']
-                xtendOutputDir = 'src/main/xtend-gen'
-        }
-        test {
-                java.srcDirs = ['src/test/java', 'src/test/xtext-gen']
-                resources.srcDirs = ['src/test/resources', 'src/test/xtext-gen']
-                xtendOutputDir = 'src/test/xtend-gen'
-        }
-}
-
-jar {
-        from(sourceSets.main.allSource) {
-                include '**/*.xtext'
-        }
-        manifest {
-                attributes 'Bundle-SymbolicName': project.name
-        }
-}
-
-clean.doLast {
-        delete 'src/main/xtend-gen'
-        delete 'src/main/xtext-gen'
-        delete 'src/test/xtend-gen'
-        delete 'src/test/xtext-gen'
-}
diff --git a/gradle/xtext-common.gradle b/gradle/xtext-common.gradle
new file mode 100644
index 00000000..cf6a5831
--- /dev/null
+++ b/gradle/xtext-common.gradle
@@ -0,0 +1,21 @@
+apply from: "${rootDir}/gradle/java-common.gradle"
+
+dependencies {
+        compile platform("org.eclipse.xtext:xtext-dev-bom:${xtextVersion}")
+}
+
+sourceSets {
+        main {
+                java.srcDirs += ['src/main/xtext-gen']
+                resources.srcDirs += ['src/main/xtext-gen']
+        }
+        test {
+                java.srcDirs = ['src/test/xtext-gen']
+                resources.srcDirs = ['src/test/xtext-gen']
+        }
+}
+
+clean.doLast {
+        delete 'src/main/xtext-gen'
+        delete 'src/test/xtext-gen'
+}