diff --git a/build.gradle b/build.gradle index c2dd539d2..c76c38482 100644 --- a/build.gradle +++ b/build.gradle @@ -5,10 +5,8 @@ import java.time.format.DateTimeFormatter import java.time.LocalDateTime -apply from: "${rootDir}/gradle/versions.gradle" -apply from: "${rootDir}/gradle/bootstrap-setup.gradle" - buildscript { + apply from: "${rootDir}/gradle/versions.gradle" repositories { jcenter() maven { @@ -16,12 +14,13 @@ buildscript { } } dependencies { - classpath 'org.xtext:xtext-gradle-plugin:1.0.14' + classpath "org.xtext:xtext-gradle-plugin:$versions.xtend_plugin" classpath 'io.typefox.gradle:io.typefox.gradle.p2gen:0.1.0' } } apply from: "${rootDir}/gradle/versions.gradle" +apply from: "${rootDir}/gradle/bootstrap-setup.gradle" apply from: "${rootDir}/gradle/p2-deployment.gradle" ext.buildTime = DateTimeFormatter.ofPattern('yyyyMMdd-HHmm').format(LocalDateTime.now()) diff --git a/gradle/bootstrap-setup.gradle b/gradle/bootstrap-setup.gradle index 8df4df90a..da81d7f06 100644 --- a/gradle/bootstrap-setup.gradle +++ b/gradle/bootstrap-setup.gradle @@ -2,7 +2,14 @@ * Root project configuration that is reused by subprojects to apply the Xtend compiler. */ -repositories.jcenter() +// The repositories to query when constructing the Xtend compiler classpath +repositories { + jcenter() + maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } +} + +// The Xtend compiler version to use +def bootstrapXtendVersion = versions.xtext configurations { xtendCompiler { @@ -10,7 +17,7 @@ configurations { resolutionStrategy { eachDependency { if (requested.group == 'org.eclipse.xtext' || requested.group == 'org.eclipse.xtend') - useVersion(versions.xtext_bootstrap) + useVersion(bootstrapXtendVersion) if (requested.group == 'com.google.inject' && requested.name == 'guice') useVersion(versions.guice) } @@ -20,6 +27,6 @@ configurations { } dependencies { - xtendCompiler "org.eclipse.xtend:org.eclipse.xtend.core:$versions.xtext_bootstrap" + xtendCompiler "org.eclipse.xtend:org.eclipse.xtend.core:$bootstrapXtendVersion" xtendCompiler "org.xtext:xtext-gradle-builder:$versions.xtend_plugin" } diff --git a/gradle/eclipse-project-layout.gradle b/gradle/eclipse-project-layout.gradle index 746bd6d91..fd4170be0 100644 --- a/gradle/eclipse-project-layout.gradle +++ b/gradle/eclipse-project-layout.gradle @@ -11,12 +11,12 @@ sourceSets { java { srcDirs = sourceDirs include '**/*.java', '**/*.xtend' - xtendOutputDir = 'xtend-gen' } resources { srcDirs = sourceDirs exclude '**/*.java', '**/*.xtend' } + xtendOutputDir = 'xtend-gen' } configure(isTestProject? main : test) { java.srcDirs = [] @@ -36,6 +36,15 @@ sourcesJar { from ('.') { include 'about*.*' } + if (isTestProject) { + from (sourceSets.test.xtendOutputDir) { + include '**/*._trace' + } + } else { + from (sourceSets.main.xtendOutputDir) { + include '**/*._trace' + } + } } if (isTestProject || name.contains('testlanguage')) {