From c65b348e92152b4719b9e9f2e6e05cda10695852 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Spo=CC=88nemann?= Date: Wed, 11 Jan 2017 15:53:40 +0100 Subject: [PATCH] [build] Fixed trace file inclusion, updated Xtend plugin to 1.0.15 --- build.gradle | 2 +- gradle/bootstrap-setup.gradle | 2 +- gradle/versions.gradle | 2 +- gradle/xtend-compiler-settings.gradle | 15 +++++++++------ 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index c10883ee5..f2882c269 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { apply from: "${rootDir}/gradle/versions.gradle" repositories.jcenter() dependencies { - classpath "org.xtext:xtext-gradle-plugin:$versions.xtend_plugin" + classpath "org.xtext:xtext-gradle-plugin:$versions.xtext_gradle_plugin" classpath "io.typefox.gradle:gradle-p2gen:$versions.gradle_plugins" } } diff --git a/gradle/bootstrap-setup.gradle b/gradle/bootstrap-setup.gradle index 410575373..daf065a94 100644 --- a/gradle/bootstrap-setup.gradle +++ b/gradle/bootstrap-setup.gradle @@ -32,5 +32,5 @@ configurations { dependencies { xtendCompiler "org.eclipse.xtend:org.eclipse.xtend.core:$bootstrapXtendVersion" xtendCompiler "org.eclipse.xtext:org.eclipse.xtext.smap:$bootstrapXtendVersion" - xtendCompiler "org.xtext:xtext-gradle-builder:$versions.xtend_plugin" + xtendCompiler "org.xtext:xtext-gradle-builder:$versions.xtext_gradle_plugin" } diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 5a8616844..7a72dc0b5 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -8,7 +8,7 @@ ext.versions = [ 'xtext': version, 'xtext_bootstrap': '2.11.0.beta2', 'gradle_plugins': '0.1.0', - 'xtend_plugin': '1.0.14', + 'xtext_gradle_plugin': '1.0.15', 'lsp4j': '0.1.0-SNAPSHOT', 'log4j': '1.2.16', 'equinoxCommon' : '3.8.0', diff --git a/gradle/xtend-compiler-settings.gradle b/gradle/xtend-compiler-settings.gradle index 37a199a3d..37256421f 100644 --- a/gradle/xtend-compiler-settings.gradle +++ b/gradle/xtend-compiler-settings.gradle @@ -7,14 +7,17 @@ if (findProperty('compileXtend') == 'true') { gen.xtextClasspath = rootProject.configurations.getByName('xtendCompiler') } - sourcesJar { - from (sourceSets.main.xtendOutputDir) { - include '**/*._trace' - } - if (name.endsWith('tests')) { - from (sourceSets.test.xtendOutputDir) { + // Defer the sources jar configuration to later when the source sets are set up completely + afterEvaluate { + sourcesJar { + from (sourceSets.main.xtendOutputDir) { include '**/*._trace' } + if (name.endsWith('tests')) { + from (sourceSets.test.xtendOutputDir) { + include '**/*._trace' + } + } } } }