1 files changed, 8 insertions, 8 deletions

diff --git a/language/build.gradle b/language/build.gradle
index 7e079f27..5ad5ab1f 100644
--- a/language/build.gradle
+++ b/language/build.gradle
@@ -1,8 +1,5 @@
-configurations {
-        mwe2 {
-                extendsFrom compile
-        }
-}
+apply from: "${rootDir}/gradle/xtext-common.gradle"
+apply from: "${rootDir}/gradle/mwe2.gradle"
 
 dependencies {
         testCompile "org.junit.jupiter:junit-jupiter-api:${junitVersion}"
@@ -15,13 +12,18 @@ dependencies {
         compile "org.eclipse.xtext:org.eclipse.xtext.xbase:${xtextVersion}"
         compile "org.eclipse.emf:org.eclipse.emf.ecore:${ecoreVersion}"
         compile project(':language-model')
-        mwe2 "org.eclipse.emf:org.eclipse.emf.mwe2.launch:${mwe2Version}"
         mwe2 "org.eclipse.xtext:org.eclipse.xtext.common.types:${xtextVersion}"
         mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}"
         mwe2 "org.eclipse.xtext:xtext-antlr-generator:${xtextAntlrGeneratorVersion}"
         mwe2 project(':language-mwe2')
 }
 
+jar {
+        from(sourceSets.main.allSource) {
+                include '**/*.xtext'
+        }
+}
+
 task generateXtextLanguage(type: JavaExec) {
         main = 'org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher'
         classpath = configurations.mwe2
@@ -43,5 +45,3 @@ test {
 
 generateXtext.dependsOn(generateXtextLanguage)
 clean.dependsOn(cleanGenerateXtextLanguage)
-
-eclipse.classpath.plusConfigurations += [configurations.mwe2]