Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Haug2019-06-05 11:15:57 -0400
committerJuergen Haug2020-06-17 11:05:27 -0400
commit28090823eed141486429c28726de551367482238 (patch)
treead17b6646f4dc386c541f1b0cd7c2c3160f66d33
parent132df3e2d2abd4c07be39837055fad01306ab629 (diff)
downloadorg.eclipse.etrice-change/143374/1.tar.gz
org.eclipse.etrice-change/143374/1.tar.xz
org.eclipse.etrice-change/143374/1.zip
Bug 547956 - Use xtext-dev-bom for gradle buildchange/143374/1
-rw-r--r--gradle/versions.gradle7
-rw-r--r--plugins/build.gradle8
-rw-r--r--plugins/org.eclipse.etrice.abstractexec.behavior/build.gradle3
-rw-r--r--plugins/org.eclipse.etrice.core.common/build.gradle6
-rw-r--r--plugins/org.eclipse.etrice.core.config/build.gradle3
-rw-r--r--plugins/org.eclipse.etrice.core.etmap/build.gradle4
-rw-r--r--plugins/org.eclipse.etrice.core.etphys/build.gradle2
-rw-r--r--plugins/org.eclipse.etrice.core.fsm/build.gradle3
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel.fsm/build.gradle2
-rw-r--r--plugins/org.eclipse.etrice.core.genmodel/build.gradle1
-rw-r--r--plugins/org.eclipse.etrice.core.room/build.gradle5
-rw-r--r--plugins/org.eclipse.etrice.etunit.converter/build.gradle6
-rw-r--r--plugins/org.eclipse.etrice.generator.c/build.gradle3
-rw-r--r--plugins/org.eclipse.etrice.generator.config/build.gradle4
-rw-r--r--plugins/org.eclipse.etrice.generator.cpp/build.gradle3
-rw-r--r--plugins/org.eclipse.etrice.generator.doc/build.gradle2
-rw-r--r--plugins/org.eclipse.etrice.generator.fsm/build.gradle4
-rw-r--r--plugins/org.eclipse.etrice.generator.java/build.gradle3
-rw-r--r--plugins/org.eclipse.etrice.generator/build.gradle5
19 files changed, 14 insertions, 60 deletions
diff --git a/gradle/versions.gradle b/gradle/versions.gradle
index f687bcd45..eddc830f9 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 1d936e2d8..eac112c5b 100644
--- a/plugins/build.gradle
+++ b/plugins/build.gradle
@@ -17,6 +17,10 @@ subprojects {
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 @@ subprojects {
}
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 2c1002108..206aa7521 100644
--- a/plugins/org.eclipse.etrice.abstractexec.behavior/build.gradle
+++ b/plugins/org.eclipse.etrice.abstractexec.behavior/build.gradle
@@ -3,7 +3,4 @@ dependencies {
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 4364d3cb3..eba5a7423 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 b12dffb0d..f3ec76970 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 6cb692c94..a30d0bb72 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 e7a8e4cdb..6bdb7bbad 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 5e224b6a5..6bdb7bbad 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 4ecd84cff..6e3df0097 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 89fe587e4..c6f0507a4 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 2fd72d81a..da3571a11 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 ee6e64833..b3ac0dda7 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 0b785a6fe..a36966202 100644
--- a/plugins/org.eclipse.etrice.generator.c/build.gradle
+++ b/plugins/org.eclipse.etrice.generator.c/build.gradle
@@ -13,9 +13,6 @@ dependencies {
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 3753fe5ea..00ad2cd6e 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 6572670e9..c980ce3ea 100644
--- a/plugins/org.eclipse.etrice.generator.cpp/build.gradle
+++ b/plugins/org.eclipse.etrice.generator.cpp/build.gradle
@@ -13,9 +13,6 @@ dependencies {
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 7b33f7377..2390e4ffa 100644
--- a/plugins/org.eclipse.etrice.generator.doc/build.gradle
+++ b/plugins/org.eclipse.etrice.generator.doc/build.gradle
@@ -10,8 +10,6 @@ dependencies {
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 1a4638da6..027775fc3 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 ea55f19c2..b93f1bc31 100644
--- a/plugins/org.eclipse.etrice.generator.java/build.gradle
+++ b/plugins/org.eclipse.etrice.generator.java/build.gradle
@@ -13,9 +13,6 @@ dependencies {
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 63aece977..e7c00291b 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

Back to the top