diff options
author | 2024-07-07 20:35:13 +0200 | |
---|---|---|
committer | 2024-07-07 20:35:13 +0200 | |
commit | 527ef1c6bbafbbccc58014697f66495286cf8db5 (patch) | |
tree | 3ba49d2adc29f5703978ed02dae3e923e48a62d0 | |
parent | build: MWE2 logging (diff) | |
download | refinery-527ef1c6bbafbbccc58014697f66495286cf8db5.tar.gz refinery-527ef1c6bbafbbccc58014697f66495286cf8db5.tar.zst refinery-527ef1c6bbafbbccc58014697f66495286cf8db5.zip |
build(deps): drop Xtext BOM dependence
We already manage all dependencies by version number.
Also be more conservative with dependencies and do not depend on milestone
versions.
-rw-r--r-- | buildSrc/src/main/kotlin/tools/refinery/gradle/internal/java-conventions.gradle.kts | 2 | ||||
-rw-r--r-- | gradle/libs.versions.toml | 10 | ||||
-rw-r--r-- | subprojects/language/build.gradle.kts | 1 |
3 files changed, 6 insertions, 7 deletions
diff --git a/buildSrc/src/main/kotlin/tools/refinery/gradle/internal/java-conventions.gradle.kts b/buildSrc/src/main/kotlin/tools/refinery/gradle/internal/java-conventions.gradle.kts index bed2bfdc..a1d8f8f3 100644 --- a/buildSrc/src/main/kotlin/tools/refinery/gradle/internal/java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/tools/refinery/gradle/internal/java-conventions.gradle.kts | |||
@@ -36,7 +36,7 @@ dependencies { | |||
36 | testImplementation(libs.hamcrest) | 36 | testImplementation(libs.hamcrest) |
37 | testImplementation(libs.junit.api) | 37 | testImplementation(libs.junit.api) |
38 | testRuntimeOnly(libs.junit.engine) | 38 | testRuntimeOnly(libs.junit.engine) |
39 | testRuntimeOnly("org.junit.platform:junit-platform-launcher") | 39 | testRuntimeOnly(libs.junit.launcher) |
40 | testImplementation(libs.junit.params) | 40 | testImplementation(libs.junit.params) |
41 | testImplementation(libs.mockito.core) | 41 | testImplementation(libs.mockito.core) |
42 | testImplementation(libs.mockito.junit) | 42 | testImplementation(libs.mockito.junit) |
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 60ce0679..347ee29a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml | |||
@@ -3,12 +3,12 @@ | |||
3 | # SPDX-License-Identifier: EPL-2.0 | 3 | # SPDX-License-Identifier: EPL-2.0 |
4 | 4 | ||
5 | [versions] | 5 | [versions] |
6 | eclipseCollections = "12.0.0.M3" | 6 | eclipseCollections = "11.1.0" |
7 | jetty = "12.0.11" | 7 | jetty = "12.0.11" |
8 | jmh = "1.37" | 8 | jmh = "1.37" |
9 | junit = "5.11.0-M2" | 9 | junit = "5.10.3" |
10 | mockito = "5.12.0" | 10 | mockito = "5.12.0" |
11 | mwe2 = "2.19.0.M1" | 11 | mwe2 = "2.18.0" |
12 | slf4j = "2.0.13" | 12 | slf4j = "2.0.13" |
13 | xtext = "2.35.0" | 13 | xtext = "2.35.0" |
14 | 14 | ||
@@ -34,10 +34,11 @@ jmh-core = { group = "org.openjdk.jmh", name = "jmh-core", version.ref = "jmh" } | |||
34 | jmh-annprocess = { group = "org.openjdk.jmh", name = "jmh-generator-annprocess", version.ref = "jmh" } | 34 | jmh-annprocess = { group = "org.openjdk.jmh", name = "jmh-generator-annprocess", version.ref = "jmh" } |
35 | junit-api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "junit" } | 35 | junit-api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "junit" } |
36 | junit-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "junit" } | 36 | junit-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "junit" } |
37 | junit-launcher = { group = "org.junit.platform", name = "junit-platform-launcher", version = "1.10.3" } | ||
37 | junit-params = { group = "org.junit.jupiter", name = "junit-jupiter-params", version.ref = "junit" } | 38 | junit-params = { group = "org.junit.jupiter", name = "junit-jupiter-params", version.ref = "junit" } |
38 | mockito-core = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" } | 39 | mockito-core = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" } |
39 | mockito-junit = { group = "org.mockito", name = "mockito-junit-jupiter", version.ref = "mockito" } | 40 | mockito-junit = { group = "org.mockito", name = "mockito-junit-jupiter", version.ref = "mockito" } |
40 | mwe-utils = { group = "org.eclipse.emf", name = "org.eclipse.emf.mwe.utils", version = "1.13.0.M1" } | 41 | mwe-utils = { group = "org.eclipse.emf", name = "org.eclipse.emf.mwe.utils", version = "1.12.0" } |
41 | mwe2-launch = { group = "org.eclipse.emf", name = "org.eclipse.emf.mwe2.launch", version.ref = "mwe2" } | 42 | mwe2-launch = { group = "org.eclipse.emf", name = "org.eclipse.emf.mwe2.launch", version.ref = "mwe2" } |
42 | mwe2-lib = { group = "org.eclipse.emf", name = "org.eclipse.emf.mwe2.lib", version.ref = "mwe2" } | 43 | mwe2-lib = { group = "org.eclipse.emf", name = "org.eclipse.emf.mwe2.lib", version.ref = "mwe2" } |
43 | ortools = { group = "com.google.ortools", name = "ortools-java", version = "9.10.4067" } | 44 | ortools = { group = "com.google.ortools", name = "ortools-java", version = "9.10.4067" } |
@@ -45,7 +46,6 @@ refinery-z3 = { group = "tools.refinery.z3", name = "refinery-z3-solver", versio | |||
45 | slf4j-api = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j" } | 46 | slf4j-api = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j" } |
46 | slf4j-simple = { group = "org.slf4j", name = "slf4j-simple", version.ref = "slf4j" } | 47 | slf4j-simple = { group = "org.slf4j", name = "slf4j-simple", version.ref = "slf4j" } |
47 | slf4j-log4j = { group = "org.slf4j", name = "log4j-over-slf4j", version.ref = "slf4j" } | 48 | slf4j-log4j = { group = "org.slf4j", name = "log4j-over-slf4j", version.ref = "slf4j" } |
48 | xtext-bom = { group = "org.eclipse.xtext", name = "xtext-dev-bom", version.ref = "xtext" } | ||
49 | xtext-core = { group = "org.eclipse.xtext", name = "org.eclipse.xtext", version.ref = "xtext" } | 49 | xtext-core = { group = "org.eclipse.xtext", name = "org.eclipse.xtext", version.ref = "xtext" } |
50 | xtext-generator-antlr = { group = "org.eclipse.xtext", name = "xtext-antlr-generator", version = "2.1.1" } | 50 | xtext-generator-antlr = { group = "org.eclipse.xtext", name = "xtext-antlr-generator", version = "2.1.1" } |
51 | xtext-generator = { group = "org.eclipse.xtext", name = "org.eclipse.xtext.xtext.generator", version.ref = "xtext" } | 51 | xtext-generator = { group = "org.eclipse.xtext", name = "org.eclipse.xtext.xtext.generator", version.ref = "xtext" } |
diff --git a/subprojects/language/build.gradle.kts b/subprojects/language/build.gradle.kts index d70d4c6e..dc338686 100644 --- a/subprojects/language/build.gradle.kts +++ b/subprojects/language/build.gradle.kts | |||
@@ -29,7 +29,6 @@ val generatedWebSources: Configuration by configurations.creating { | |||
29 | } | 29 | } |
30 | 30 | ||
31 | dependencies { | 31 | dependencies { |
32 | api(platform(libs.xtext.bom)) | ||
33 | api(libs.ecore) | 32 | api(libs.ecore) |
34 | api(libs.xtext.core) | 33 | api(libs.xtext.core) |
35 | api(libs.xtext.xbase) | 34 | api(libs.xtext.xbase) |