sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-15 08:18:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[build] Fixed trace file inclusion, updated Xtend plugin to 1.0.15

Browse source
This commit is contained in:
Miro Spönemann 2017-01-11 15:53:40 +01:00
parent 6761c499cc
commit c65b348e92
4 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -9,7 +9,7 @@ buildscript {
apply from: "${rootDir}/gradle/versions.gradle" apply from: "${rootDir}/gradle/versions.gradle"
repositories.jcenter() repositories.jcenter()
dependencies { 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" classpath "io.typefox.gradle:gradle-p2gen:$versions.gradle_plugins"
} }
} }

2
gradle/bootstrap-setup.gradle
View file

@ -32,5 +32,5 @@ configurations {
dependencies { dependencies {
xtendCompiler "org.eclipse.xtend:org.eclipse.xtend.core:$bootstrapXtendVersion" xtendCompiler "org.eclipse.xtend:org.eclipse.xtend.core:$bootstrapXtendVersion"
xtendCompiler "org.eclipse.xtext:org.eclipse.xtext.smap:$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"
} }

2
gradle/versions.gradle
View file

@ -8,7 +8,7 @@ ext.versions = [
'xtext': version, 'xtext': version,
'xtext_bootstrap': '2.11.0.beta2', 'xtext_bootstrap': '2.11.0.beta2',
'gradle_plugins': '0.1.0', 'gradle_plugins': '0.1.0',
'xtend_plugin': '1.0.14', 'xtext_gradle_plugin': '1.0.15',
'lsp4j': '0.1.0-SNAPSHOT', 'lsp4j': '0.1.0-SNAPSHOT',
'log4j': '1.2.16', 'log4j': '1.2.16',
'equinoxCommon' : '3.8.0', 'equinoxCommon' : '3.8.0',

15
gradle/xtend-compiler-settings.gradle
View file

@ -7,14 +7,17 @@ if (findProperty('compileXtend') == 'true') {
gen.xtextClasspath = rootProject.configurations.getByName('xtendCompiler') gen.xtextClasspath = rootProject.configurations.getByName('xtendCompiler')
} }
sourcesJar { // Defer the sources jar configuration to later when the source sets are set up completely
from (sourceSets.main.xtendOutputDir) { afterEvaluate {
include '**/*._trace' sourcesJar {
} from (sourceSets.main.xtendOutputDir) {
if (name.endsWith('tests')) {
from (sourceSets.test.xtendOutputDir) {
include '**/*._trace' include '**/*._trace'
} }
if (name.endsWith('tests')) {
from (sourceSets.test.xtendOutputDir) {
include '**/*._trace'
}
}
} }
} }
} }