From efeebd5fe86e3bb26aa2e153ff2de6b6c101effc Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Mon, 28 Aug 2023 16:00:54 +0200 Subject: chore(deps): bump frontend dependencies Also downgrade EMF dependencies to be compatible with the Xtext BOM --- gradle/libs.versions.toml | 12 ++++++------ gradle/wrapper/gradle-wrapper.jar | Bin 63282 -> 63375 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 45d3b35f..9971e3f6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,21 +4,21 @@ [versions] eclipseCollections = "12.0.0.M2" -ecore = "2.34.0" +ecore = "2.26.0" jetty = "12.0.0" jmh = "1.37" junit = "5.10.0" -mockito = "5.4.0" -mwe2 = "2.15.0.M2" +mockito = "5.5.0" +mwe2 = "2.15.0" slf4j = "2.0.7" -xtext = "2.32.0.M2" +xtext = "2.32.0" [libraries] jetbrainsAnnotations = { group = "org.jetbrains", name = "annotations", version = "24.0.1" } eclipseCollections = { group = "org.eclipse.collections", name = "eclipse-collections", version.ref = "eclipseCollections" } eclipseCollections-api = { group = "org.eclipse.collections", name = "eclipse-collections-api", version.ref = "eclipseCollections" } ecore = { group = "org.eclipse.emf", name = "org.eclipse.emf.ecore", version.ref = "ecore" } -ecore-xmi = { group = "org.eclipse.emf", name = "org.eclipse.emf.ecore.xmi", version = "2.18.0" } +ecore-xmi = { group = "org.eclipse.emf", name = "org.eclipse.emf.ecore.xmi", version = "2.16.0" } ecore-codegen = { group = "org.eclipse.emf", name = "org.eclipse.emf.codegen.ecore", version.ref = "ecore" } gradlePlugin-frontend = { group = "org.siouan", name = "frontend-gradle-plugin-jdk11", version = "6.0.0" } gradlePlugin-shadow = { group = "com.github.johnrengelman", name = "shadow", version = "8.1.1" } @@ -37,7 +37,7 @@ junit-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", ver junit-params = { group = "org.junit.jupiter", name = "junit-jupiter-params", version.ref = "junit" } mockito-core = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" } mockito-junit = { group = "org.mockito", name = "mockito-junit-jupiter", version.ref = "mockito" } -mwe-utils = { group = "org.eclipse.emf", name = "org.eclipse.emf.mwe.utils", version = "1.9.0.M2" } +mwe-utils = { group = "org.eclipse.emf", name = "org.eclipse.emf.mwe.utils", version = "1.9.0" } mwe2-launch = { group = "org.eclipse.emf", name = "org.eclipse.emf.mwe2.launch", version.ref = "mwe2" } mwe2-lib = { group = "org.eclipse.emf", name = "org.eclipse.emf.mwe2.lib", version.ref = "mwe2" } slf4j-api = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f03f475e..033e24c4 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9f4197d5..ac72c34e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME -- cgit v1.2.3-70-g09d2