[build] fixed bootstrap build successfully using xtend compiler

This commit is contained in:
Sven Efftinge 2016-12-22 09:41:33 +01:00 committed by Miro Spönemann
parent 648f51911b
commit 87009ec69b
3 changed files with 4 additions and 12 deletions

View file

@ -16,7 +16,7 @@ buildscript {
}
}
dependencies {
classpath 'org.xtext:xtext-gradle-plugin:1.0.12'
classpath 'org.xtext:xtext-gradle-plugin:1.0.14'
classpath 'io.typefox.gradle:io.typefox.gradle.p2gen:0.1.0'
}
}

View file

@ -7,7 +7,7 @@ version = '2.11.0-SNAPSHOT'
ext.versions = [
'xtext': version,
'xtext_bootstrap': '2.11.0.beta2',
'xtend_plugin': '1.0.12',
'xtend_plugin': '1.0.14',
'lsp4j': '0.1.0-SNAPSHOT',
'log4j': '1.2.16',
'equinoxCommon' : '3.6.0',

View file

@ -1,17 +1,9 @@
// Re-configure the 'main' and 'mwe2' sourceSets as the content of this project's
// source folders need to be compiled before the generator execution.
sourceSets {
main.java.srcDirs = []
main.resources.srcDirs = []
mwe2.java.srcDirs = [ 'src' ]
}
dependencies {
// We cannot use the projects within the workspace, as we would have
// to compile them before generating the code, so we need to stick to the bootstrapping version.
// Buildship, however, links the workspace projects anyway (as yet).
mwe2Compile "org.eclipse.xtext:org.eclipse.xtext:$versions.xtext_bootstrap"
mwe2Compile "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:$versions.xtext_bootstrap"
compile "org.eclipse.xtext:org.eclipse.xtext:$versions.xtext_bootstrap"
compile "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:$versions.xtext_bootstrap"
// Dependencies required for successfully executing the Xtext generation workflow
mwe2Runtime "org.eclipse.emf:org.eclipse.emf.mwe2.launch:$versions.emfMwe2"