diff options
-rw-r--r-- | build.gradle | 11 | ||||
-rw-r--r-- | gradle.properties | 10 | ||||
-rw-r--r-- | language-model/build.gradle | 11 | ||||
-rw-r--r-- | language-web/build.gradle | 6 | ||||
-rw-r--r-- | language/build.gradle | 10 |
5 files changed, 27 insertions, 21 deletions
diff --git a/build.gradle b/build.gradle index 521ad7ff..e1d31ecc 100644 --- a/build.gradle +++ b/build.gradle | |||
@@ -13,13 +13,10 @@ plugins { | |||
13 | } | 13 | } |
14 | 14 | ||
15 | subprojects { | 15 | subprojects { |
16 | ext.xtextVersion = '2.26.0.M1' | ||
17 | ext.hamcrestVersion = '2.2' | ||
18 | |||
19 | repositories { | 16 | repositories { |
20 | mavenCentral() | 17 | mavenCentral() |
21 | } | 18 | } |
22 | 19 | ||
23 | apply plugin: 'java' | 20 | apply plugin: 'java' |
24 | dependencies { | 21 | dependencies { |
25 | compile platform("org.eclipse.xtext:xtext-dev-bom:${xtextVersion}") | 22 | compile platform("org.eclipse.xtext:xtext-dev-bom:${xtextVersion}") |
@@ -31,14 +28,14 @@ subprojects { | |||
31 | 28 | ||
32 | group = 'org.eclipse.viatra.solver' | 29 | group = 'org.eclipse.viatra.solver' |
33 | version = '1.0.0-SNAPSHOT' | 30 | version = '1.0.0-SNAPSHOT' |
34 | 31 | ||
35 | sourceCompatibility = '11' | 32 | sourceCompatibility = '11' |
36 | targetCompatibility = '11' | 33 | targetCompatibility = '11' |
37 | 34 | ||
38 | configurations.all { | 35 | configurations.all { |
39 | exclude group: 'asm' | 36 | exclude group: 'asm' |
40 | } | 37 | } |
41 | 38 | ||
42 | eclipse.classpath.file.whenMerged { | 39 | eclipse.classpath.file.whenMerged { |
43 | for (entry in entries) { | 40 | for (entry in entries) { |
44 | if (entry.path.endsWith('xtext-gen')) { | 41 | if (entry.path.endsWith('xtext-gen')) { |
diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..499732a1 --- /dev/null +++ b/gradle.properties | |||
@@ -0,0 +1,10 @@ | |||
1 | ecoreVersion=2.24.0 | ||
2 | ecoreCodegenVersion=2.26.0 | ||
3 | hamcrestVersion=2.2 | ||
4 | jettyVersion=9.4.42.v20210604 | ||
5 | junitVersion=5.7.2 | ||
6 | mweVersion=1.6.1 | ||
7 | mwe2Version=2.12.1 | ||
8 | slf4JVersion=1.7.31 | ||
9 | xtextVersion=2.26.0.M1 | ||
10 | xtextAntlrGeneratorVersion=2.1.1 \ No newline at end of file | ||
diff --git a/language-model/build.gradle b/language-model/build.gradle index 51b24134..56ab4a19 100644 --- a/language-model/build.gradle +++ b/language-model/build.gradle | |||
@@ -5,12 +5,11 @@ configurations { | |||
5 | } | 5 | } |
6 | 6 | ||
7 | dependencies { | 7 | dependencies { |
8 | compile 'org.eclipse.emf:org.eclipse.emf.ecore' | 8 | compile "org.eclipse.emf:org.eclipse.emf.ecore:${ecoreVersion}" |
9 | mwe2 'org.eclipse.emf:org.eclipse.emf.codegen.ecore' | 9 | mwe2 "org.eclipse.emf:org.eclipse.emf.codegen.ecore:${ecoreCodegenVersion}" |
10 | mwe2 'org.eclipse.emf:org.eclipse.emf.ecore' | 10 | mwe2 "org.eclipse.emf:org.eclipse.emf.mwe.utils:${mweVersion}" |
11 | mwe2 'org.eclipse.emf:org.eclipse.emf.mwe.utils' | 11 | mwe2 "org.eclipse.emf:org.eclipse.emf.mwe2.launch:${mwe2Version}" |
12 | mwe2 'org.eclipse.emf:org.eclipse.emf.mwe2.launch' | 12 | mwe2 "org.eclipse.emf:org.eclipse.emf.mwe2.lib:${mwe2Version}" |
13 | mwe2 'org.eclipse.emf:org.eclipse.emf.mwe2.lib' | ||
14 | mwe2 "org.eclipse.xtext:org.eclipse.xtext:${xtextVersion}" | 13 | mwe2 "org.eclipse.xtext:org.eclipse.xtext:${xtextVersion}" |
15 | mwe2 "org.eclipse.xtext:org.eclipse.xtext.xbase:${xtextVersion}" | 14 | mwe2 "org.eclipse.xtext:org.eclipse.xtext.xbase:${xtextVersion}" |
16 | } | 15 | } |
diff --git a/language-web/build.gradle b/language-web/build.gradle index 6599d465..5cf7e684 100644 --- a/language-web/build.gradle +++ b/language-web/build.gradle | |||
@@ -4,9 +4,9 @@ dependencies { | |||
4 | compile "org.eclipse.xtext:org.eclipse.xtext.xbase.web:${xtextVersion}" | 4 | compile "org.eclipse.xtext:org.eclipse.xtext.xbase.web:${xtextVersion}" |
5 | compile "org.eclipse.xtext:org.eclipse.xtext.web.servlet:${xtextVersion}" | 5 | compile "org.eclipse.xtext:org.eclipse.xtext.web.servlet:${xtextVersion}" |
6 | compile "org.eclipse.xtend:org.eclipse.xtend.lib:${xtextVersion}" | 6 | compile "org.eclipse.xtend:org.eclipse.xtend.lib:${xtextVersion}" |
7 | compile "org.eclipse.jetty:jetty-server:9.4.42.v20210604" | 7 | compile "org.eclipse.jetty:jetty-server:${jettyVersion}" |
8 | compile "org.eclipse.jetty:jetty-annotations:9.4.42.v20210604" | 8 | compile "org.eclipse.jetty:jetty-annotations:${jettyVersion}" |
9 | compile "org.slf4j:slf4j-simple:1.7.31" | 9 | compile "org.slf4j:slf4j-simple:${slf4JVersion}" |
10 | } | 10 | } |
11 | 11 | ||
12 | def webpackOutputDir = "${buildDir}/webpack" | 12 | def webpackOutputDir = "${buildDir}/webpack" |
diff --git a/language/build.gradle b/language/build.gradle index fead1f7c..5b0ab20f 100644 --- a/language/build.gradle +++ b/language/build.gradle | |||
@@ -5,19 +5,19 @@ configurations { | |||
5 | } | 5 | } |
6 | 6 | ||
7 | dependencies { | 7 | dependencies { |
8 | testCompile 'org.junit.jupiter:junit-jupiter-api' | 8 | testCompile "org.junit.jupiter:junit-jupiter-api:${junitVersion}" |
9 | testRuntime 'org.junit.jupiter:junit-jupiter-engine' | 9 | testRuntime "org.junit.jupiter:junit-jupiter-engine:${junitVersion}" |
10 | testCompile "org.eclipse.xtext:org.eclipse.xtext.testing:${xtextVersion}" | 10 | testCompile "org.eclipse.xtext:org.eclipse.xtext.testing:${xtextVersion}" |
11 | testCompile "org.eclipse.xtext:org.eclipse.xtext.xbase.testing:${xtextVersion}" | 11 | testCompile "org.eclipse.xtext:org.eclipse.xtext.xbase.testing:${xtextVersion}" |
12 | testCompile "org.hamcrest:hamcrest:${hamcrestVersion}" | 12 | testCompile "org.hamcrest:hamcrest:${hamcrestVersion}" |
13 | compile "org.eclipse.xtext:org.eclipse.xtext:${xtextVersion}" | 13 | compile "org.eclipse.xtext:org.eclipse.xtext:${xtextVersion}" |
14 | compile "org.eclipse.xtext:org.eclipse.xtext.xbase:${xtextVersion}" | 14 | compile "org.eclipse.xtext:org.eclipse.xtext.xbase:${xtextVersion}" |
15 | compile 'org.eclipse.emf:org.eclipse.emf.ecore' | 15 | compile "org.eclipse.emf:org.eclipse.emf.ecore:${ecoreVersion}" |
16 | compile project(':language-model') | 16 | compile project(':language-model') |
17 | mwe2 'org.eclipse.emf:org.eclipse.emf.mwe2.launch' | 17 | mwe2 "org.eclipse.emf:org.eclipse.emf.mwe2.launch:${mwe2Version}" |
18 | mwe2 "org.eclipse.xtext:org.eclipse.xtext.common.types:${xtextVersion}" | 18 | mwe2 "org.eclipse.xtext:org.eclipse.xtext.common.types:${xtextVersion}" |
19 | mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}" | 19 | mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}" |
20 | mwe2 'org.eclipse.xtext:xtext-antlr-generator' | 20 | mwe2 "org.eclipse.xtext:xtext-antlr-generator:${xtextAntlrGeneratorVersion}" |
21 | mwe2 project(':language-mwe2') | 21 | mwe2 project(':language-mwe2') |
22 | } | 22 | } |
23 | 23 | ||