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

[eclipse/xtext#1231] fixed jdt and platform versions

Browse source 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
This commit is contained in:
Christian Dietrich 2018-07-03 10:50:33 +02:00
parent d43c5b15df
commit 0277b89235
5 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gradle/bootstrap-setup.gradle
View file

@ -23,6 +23,8 @@ configurations {
useVersion(bootstrapXtendVersion)
if (requested.group == 'com.google.inject' && requested.name == 'guice')
useVersion(versions.guice)
if (requested.group == 'org.eclipse.jdt' && requested.name == 'org.eclipse.jdt.core')
useVersion(versions.jdtCore)
}
}
exclude group: 'asm'

8
gradle/versions.gradle
View file

@ -11,10 +11,10 @@ ext.versions = [
'xtext_gradle_plugin': '1.0.21',
'lsp4j': '0.4.0', // dont forget to adapt IdeProjectDescriptor + Tests
'log4j': '1.2.16',
'equinoxCommon' : '3.8.0',
'equinoxRegistry' : '3.6.100',
'eclipseCore': '3.12.0',
'eclipseOSGI' : '3.11.2',
'equinoxCommon' : '3.9.0',
'equinoxRegistry' : '3.7.0',
'eclipseCore': '3.13.0',
'eclipseOSGI' : '3.12.100',
'emfCommon': '[2.10.1,3)',
'emfEcore': '[2.10.2,3)',
'emfChange': '[2.10.0,3)',

5
org.eclipse.xtext.testlanguages/build.gradle
View file

@ -3,7 +3,10 @@ apply from: "${rootDir}/gradle/mwe2-workflows.gradle"
dependencies {
compile project(':org.eclipse.xtext')
compile project(':org.eclipse.xtext.testing')
compile "org.eclipse.platform:org.eclipse.core.runtime:$versions.eclipseCore"
compile "org.eclipse.platform:org.eclipse.equinox.common:$versions.equinoxCommon"
compile("org.eclipse.platform:org.eclipse.core.runtime:$versions.eclipseCore") {
exclude group: "org.eclipse.platform", module: "org.eclipse.equinox.common"
}
compile "org.eclipse.emf:org.eclipse.emf.mwe2.runtime:$versions.emfMwe2"
}

9
org.eclipse.xtext.xtext.generator/build.gradle
View file

@ -8,5 +8,12 @@ dependencies {
compile "org.eclipse.emf:org.eclipse.emf.mwe.utils:$versions.emfMwe"
compile "org.eclipse.emf:org.eclipse.emf.mwe2.lib:$versions.emfMwe2"
compile "com.ibm.icu:icu4j:$versions.icu"
optional "org.eclipse.jdt:org.eclipse.jdt.core:$versions.jdtCore"
compile "org.eclipse.platform:org.eclipse.equinox.common:$versions.equinoxCommon"
optional("org.eclipse.platform:org.eclipse.core.runtime:$versions.eclipseCore") {
exclude group: "org.eclipse.platform", module: "org.eclipse.equinox.common"
}
optional("org.eclipse.jdt:org.eclipse.jdt.core:$versions.jdtCore") {
exclude group: "org.eclipse.platform", module: "org.eclipse.equinox.common"
exclude group: "org.eclipse.platform", module: "org.eclipse.core.runtime"
}
}

4
org.eclipse.xtext/build.gradle
View file

@ -12,7 +12,9 @@ dependencies {
compile "org.eclipse.emf:org.eclipse.emf.ecore.xmi:$versions.emfEcore"
compile "com.google.inject:guice:$versions.guice"
compile "org.antlr:antlr-runtime:$versions.antlr"
optional "org.eclipse.platform:org.eclipse.core.runtime:$versions.eclipseCore"
optional("org.eclipse.platform:org.eclipse.core.runtime:$versions.eclipseCore") {
exclude group: "org.eclipse.platform", module: "org.eclipse.equinox.common"
}
optional "org.eclipse.platform:org.eclipse.equinox.registry:$versions.equinoxRegistry"
optional "org.eclipse.emf:org.eclipse.emf.mwe.utils:$versions.emfMwe"
optional "org.eclipse.xpand:org.eclipse.xtend:$versions.xpand"