Bug 547956 - Use xtext-dev-bom for gradle build
Change-Id: I46121688cf8245f49246b6bb527ad15d85f3b6bf
diff --git a/gradle/versions.gradle b/gradle/versions.gradle
index f687bcd..eddc830 100644
--- a/gradle/versions.gradle
+++ b/gradle/versions.gradle
@@ -1,8 +1,5 @@
ext.versions = [
- 'guava' : '21.0',
- 'xtext' : '2.15.0',
- 'core_runtime' : '3.12.0',
- 'core_resources' : '3.12.0',
- 'commons_io' : '2.5'
+ 'xtext' : '2.18.0',
+ 'commons_io' : '2.5',
]
\ No newline at end of file
diff --git a/plugins/build.gradle b/plugins/build.gradle
index 1d936e2..eac112c 100644
--- a/plugins/build.gradle
+++ b/plugins/build.gradle
@@ -17,6 +17,10 @@
apply from: "$rootDir/gradle/publish.gradle"
+ dependencies {
+ api platform(group: 'org.eclipse.xtext', name: 'xtext-dev-bom', version: versions.xtext)
+ }
+
sourceSets {
main {
java {
@@ -37,6 +41,10 @@
}
configure(xtextProjects) {
+ dependencies {
+ api group: 'org.eclipse.xtext', name: 'org.eclipse.xtext', version: versions.xtext
+ }
+
sourceSets {
main {
java {
diff --git a/plugins/org.eclipse.etrice.abstractexec.behavior/build.gradle b/plugins/org.eclipse.etrice.abstractexec.behavior/build.gradle
index 2c10021..206aa75 100644
--- a/plugins/org.eclipse.etrice.abstractexec.behavior/build.gradle
+++ b/plugins/org.eclipse.etrice.abstractexec.behavior/build.gradle
@@ -3,7 +3,4 @@
api project(':plugins:org.eclipse.etrice.core.fsm')
api project(':plugins:org.eclipse.etrice.core.genmodel.fsm')
api project(':plugins:org.eclipse.etrice.generator.fsm')
-
- api "org.eclipse.platform:org.eclipse.core.runtime:$versions.core_runtime"
- api "org.eclipse.xtext:org.eclipse.xtext:$versions.xtext"
}
\ No newline at end of file
diff --git a/plugins/org.eclipse.etrice.core.common/build.gradle b/plugins/org.eclipse.etrice.core.common/build.gradle
index 4364d3c..eba5a74 100644
--- a/plugins/org.eclipse.etrice.core.common/build.gradle
+++ b/plugins/org.eclipse.etrice.core.common/build.gradle
@@ -1,9 +1,5 @@
dependencies {
- api "org.eclipse.xtend:org.eclipse.xtend.lib:$versions.xtext"
- api "org.eclipse.platform:org.eclipse.core.runtime:$versions.core_runtime"
- api "org.eclipse.platform:org.eclipse.core.resources:$versions.core_resources"
- api "org.eclipse.xtext:org.eclipse.xtext:$versions.xtext"
- api "com.google.guava:guava:$versions.guava"
+ api "org.eclipse.platform:org.eclipse.core.resources"
api project(':plugins:org.eclipse.etrice.generator.base')
}
\ No newline at end of file
diff --git a/plugins/org.eclipse.etrice.core.config/build.gradle b/plugins/org.eclipse.etrice.core.config/build.gradle
index b12dffb..f3ec769 100644
--- a/plugins/org.eclipse.etrice.core.config/build.gradle
+++ b/plugins/org.eclipse.etrice.core.config/build.gradle
@@ -1,6 +1,3 @@
dependencies {
- api project(':plugins:org.eclipse.etrice.core.common')
api project(':plugins:org.eclipse.etrice.core.room')
-
- api "org.eclipse.xtend:org.eclipse.xtend.lib:$versions.xtext"
}
\ No newline at end of file
diff --git a/plugins/org.eclipse.etrice.core.etmap/build.gradle b/plugins/org.eclipse.etrice.core.etmap/build.gradle
index 6cb692c..a30d0bb 100644
--- a/plugins/org.eclipse.etrice.core.etmap/build.gradle
+++ b/plugins/org.eclipse.etrice.core.etmap/build.gradle
@@ -1,9 +1,5 @@
dependencies {
- api project(':plugins:org.eclipse.etrice.core.common')
api project(':plugins:org.eclipse.etrice.core.etphys')
api project(':plugins:org.eclipse.etrice.core.room')
api project(':plugins:org.eclipse.etrice.core.genmodel')
-
- api "org.eclipse.xtend:org.eclipse.xtend.lib:$versions.xtext"
- api "org.eclipse.xtext:org.eclipse.xtext:$versions.xtext"
}
\ No newline at end of file
diff --git a/plugins/org.eclipse.etrice.core.etphys/build.gradle b/plugins/org.eclipse.etrice.core.etphys/build.gradle
index e7a8e4c..6bdb7bb 100644
--- a/plugins/org.eclipse.etrice.core.etphys/build.gradle
+++ b/plugins/org.eclipse.etrice.core.etphys/build.gradle
@@ -1,5 +1,3 @@
dependencies {
api project(':plugins:org.eclipse.etrice.core.common')
-
- api "org.eclipse.xtend:org.eclipse.xtend.lib:$versions.xtext"
}
\ No newline at end of file
diff --git a/plugins/org.eclipse.etrice.core.fsm/build.gradle b/plugins/org.eclipse.etrice.core.fsm/build.gradle
index 5e224b6..6bdb7bb 100644
--- a/plugins/org.eclipse.etrice.core.fsm/build.gradle
+++ b/plugins/org.eclipse.etrice.core.fsm/build.gradle
@@ -1,6 +1,3 @@
dependencies {
api project(':plugins:org.eclipse.etrice.core.common')
-
- api "org.eclipse.xtend:org.eclipse.xtend.lib:$versions.xtext"
- api "org.eclipse.xtext:org.eclipse.xtext:$versions.xtext"
}
\ No newline at end of file
diff --git a/plugins/org.eclipse.etrice.core.genmodel.fsm/build.gradle b/plugins/org.eclipse.etrice.core.genmodel.fsm/build.gradle
index 4ecd84c..6e3df00 100644
--- a/plugins/org.eclipse.etrice.core.genmodel.fsm/build.gradle
+++ b/plugins/org.eclipse.etrice.core.genmodel.fsm/build.gradle
@@ -1,8 +1,6 @@
dependencies {
api project(':plugins:org.eclipse.etrice.core.fsm')
api project(':plugins:org.eclipse.etrice.generator.base')
-
- api "org.eclipse.xtext:org.eclipse.xtext:$versions.xtext"
}
sourceSets {
diff --git a/plugins/org.eclipse.etrice.core.genmodel/build.gradle b/plugins/org.eclipse.etrice.core.genmodel/build.gradle
index 89fe587..c6f0507 100644
--- a/plugins/org.eclipse.etrice.core.genmodel/build.gradle
+++ b/plugins/org.eclipse.etrice.core.genmodel/build.gradle
@@ -1,5 +1,4 @@
dependencies {
- api project(':plugins:org.eclipse.etrice.core.common')
api project(':plugins:org.eclipse.etrice.core.room')
api project(':plugins:org.eclipse.etrice.core.genmodel.fsm')
}
\ No newline at end of file
diff --git a/plugins/org.eclipse.etrice.core.room/build.gradle b/plugins/org.eclipse.etrice.core.room/build.gradle
index 2fd72d8..da3571a 100644
--- a/plugins/org.eclipse.etrice.core.room/build.gradle
+++ b/plugins/org.eclipse.etrice.core.room/build.gradle
@@ -1,10 +1,5 @@
dependencies {
- api project(':plugins:org.eclipse.etrice.core.common')
api project(':plugins:org.eclipse.etrice.core.fsm')
api project(':plugins:org.eclipse.etrice.core.genmodel.fsm')
runtimeOnly project(':plugins:org.eclipse.etrice.abstractexec.behavior')
-
- api "org.eclipse.xtend:org.eclipse.xtend.lib:$versions.xtext"
- api "org.eclipse.platform:org.eclipse.core.runtime:$versions.core_runtime"
- api "org.eclipse.xtext:org.eclipse.xtext:$versions.xtext"
}
\ No newline at end of file
diff --git a/plugins/org.eclipse.etrice.etunit.converter/build.gradle b/plugins/org.eclipse.etrice.etunit.converter/build.gradle
index ee6e648..b3ac0dd 100644
--- a/plugins/org.eclipse.etrice.etunit.converter/build.gradle
+++ b/plugins/org.eclipse.etrice.etunit.converter/build.gradle
@@ -1,9 +1,9 @@
apply plugin: 'application'
dependencies {
- implementation "org.eclipse.emf:org.eclipse.emf.common:$versions.xtext"
- implementation "org.eclipse.emf:org.eclipse.emf.ecore:$versions.xtext"
- implementation "org.eclipse.emf:org.eclipse.emf.ecore.xmi:$versions.xtext"
+ implementation "org.eclipse.emf:org.eclipse.emf.common"
+ implementation "org.eclipse.emf:org.eclipse.emf.ecore"
+ implementation "org.eclipse.emf:org.eclipse.emf.ecore.xmi"
}
ext.classpath = sourceSets.main.runtimeClasspath
diff --git a/plugins/org.eclipse.etrice.generator.c/build.gradle b/plugins/org.eclipse.etrice.generator.c/build.gradle
index 0b785a6..a369662 100644
--- a/plugins/org.eclipse.etrice.generator.c/build.gradle
+++ b/plugins/org.eclipse.etrice.generator.c/build.gradle
@@ -13,9 +13,6 @@
api project(':plugins:org.eclipse.etrice.generator')
api project(':plugins:org.eclipse.etrice.generator.fsm')
api project(':plugins:org.eclipse.etrice.generator.config')
-
- api "org.eclipse.xtend:org.eclipse.xtend.lib:$versions.xtext"
- api "org.eclipse.xtext:org.eclipse.xtext:$versions.xtext"
}
artifacts {
diff --git a/plugins/org.eclipse.etrice.generator.config/build.gradle b/plugins/org.eclipse.etrice.generator.config/build.gradle
index 3753fe5..00ad2cd 100644
--- a/plugins/org.eclipse.etrice.generator.config/build.gradle
+++ b/plugins/org.eclipse.etrice.generator.config/build.gradle
@@ -1,11 +1,7 @@
dependencies {
- api project(':plugins:org.eclipse.etrice.core.common')
api project(':plugins:org.eclipse.etrice.core.room')
api project(':plugins:org.eclipse.etrice.core.genmodel')
api project(':plugins:org.eclipse.etrice.core.genmodel.fsm')
api project(':plugins:org.eclipse.etrice.core.config')
api project(':plugins:org.eclipse.etrice.generator')
-
- api "org.eclipse.xtend:org.eclipse.xtend.lib:$versions.xtext"
- api "org.eclipse.xtext:org.eclipse.xtext:$versions.xtext"
}
\ No newline at end of file
diff --git a/plugins/org.eclipse.etrice.generator.cpp/build.gradle b/plugins/org.eclipse.etrice.generator.cpp/build.gradle
index 6572670..c980ce3 100644
--- a/plugins/org.eclipse.etrice.generator.cpp/build.gradle
+++ b/plugins/org.eclipse.etrice.generator.cpp/build.gradle
@@ -13,9 +13,6 @@
api project(':plugins:org.eclipse.etrice.generator')
api project(':plugins:org.eclipse.etrice.generator.fsm')
api project(':plugins:org.eclipse.etrice.generator.config')
-
- api "org.eclipse.xtend:org.eclipse.xtend.lib:$versions.xtext"
- api "org.eclipse.xtext:org.eclipse.xtext:$versions.xtext"
}
artifacts {
diff --git a/plugins/org.eclipse.etrice.generator.doc/build.gradle b/plugins/org.eclipse.etrice.generator.doc/build.gradle
index 7b33f73..2390e4f 100644
--- a/plugins/org.eclipse.etrice.generator.doc/build.gradle
+++ b/plugins/org.eclipse.etrice.generator.doc/build.gradle
@@ -10,8 +10,6 @@
api project(':plugins:org.eclipse.etrice.core.genmodel.fsm')
api project(':plugins:org.eclipse.etrice.generator')
api project(':plugins:org.eclipse.etrice.generator.fsm')
-
- api "org.eclipse.xtend:org.eclipse.xtend.lib:$versions.xtext"
}
artifacts {
diff --git a/plugins/org.eclipse.etrice.generator.fsm/build.gradle b/plugins/org.eclipse.etrice.generator.fsm/build.gradle
index 1a4638d..027775f 100644
--- a/plugins/org.eclipse.etrice.generator.fsm/build.gradle
+++ b/plugins/org.eclipse.etrice.generator.fsm/build.gradle
@@ -1,8 +1,4 @@
dependencies {
api project(':plugins:org.eclipse.etrice.core.fsm')
api project(':plugins:org.eclipse.etrice.core.genmodel.fsm')
-
- api "org.eclipse.xtend:org.eclipse.xtend.lib:$versions.xtext"
- api "org.eclipse.platform:org.eclipse.core.runtime:$versions.core_runtime"
- api "org.eclipse.platform:org.eclipse.core.resources:$versions.core_resources"
}
\ No newline at end of file
diff --git a/plugins/org.eclipse.etrice.generator.java/build.gradle b/plugins/org.eclipse.etrice.generator.java/build.gradle
index ea55f19..b93f1bc 100644
--- a/plugins/org.eclipse.etrice.generator.java/build.gradle
+++ b/plugins/org.eclipse.etrice.generator.java/build.gradle
@@ -13,9 +13,6 @@
api project(':plugins:org.eclipse.etrice.generator')
api project(':plugins:org.eclipse.etrice.generator.fsm')
api project(':plugins:org.eclipse.etrice.generator.config')
-
- api "org.eclipse.xtend:org.eclipse.xtend.lib:$versions.xtext"
- api "org.eclipse.xtext:org.eclipse.xtext:$versions.xtext"
}
artifacts {
diff --git a/plugins/org.eclipse.etrice.generator/build.gradle b/plugins/org.eclipse.etrice.generator/build.gradle
index 63aece9..e7c0029 100644
--- a/plugins/org.eclipse.etrice.generator/build.gradle
+++ b/plugins/org.eclipse.etrice.generator/build.gradle
@@ -1,14 +1,9 @@
dependencies {
- api project(':plugins:org.eclipse.etrice.core.common')
api project(':plugins:org.eclipse.etrice.core.config')
api project(':plugins:org.eclipse.etrice.core.fsm')
api project(':plugins:org.eclipse.etrice.core.genmodel')
api project(':plugins:org.eclipse.etrice.core.room')
api project(':plugins:org.eclipse.etrice.core.etphys')
api project(':plugins:org.eclipse.etrice.core.etmap')
- api project(':plugins:org.eclipse.etrice.generator.base')
api project(':plugins:org.eclipse.etrice.generator.fsm')
-
- api "org.eclipse.xtend:org.eclipse.xtend.lib:$versions.xtext"
- api "org.eclipse.xtext:org.eclipse.xtext:$versions.xtext"
}
\ No newline at end of file
