From ea23f58fd5192e934848d73b9bd058b93f7f7ac6 Mon Sep 17 00:00:00 2001 From: Alexander Pann Date: Wed, 12 Jun 2024 19:17:51 +0200 Subject: [PATCH] editor.diagram: remove the dependency to de.q60.mps.collections.libs + cleanup dependencies (#858) --- CHANGELOG.md | 1 + .../models/de.itemis.mps.extensions.build.mps | 8 ---- .../itemis/mps/editor/celllayout/layout.mps | 22 +++++----- .../de.itemis.mps.editor.diagram.demo.elk.mpl | 5 --- .../de.itemis.mps.editor.diagram.runtime.msd | 2 - .../mps/editor/diagram/runtime/jgraph.mps | 14 ++---- .../mps/editor/diagram/runtime/model.mps | 1 + .../de.itemis.mps.extensions.changelog.mps | 43 +++++++++++++++++++ 8 files changed, 59 insertions(+), 37 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bdf51e1a7..1ec30317b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/e ### Fixed - *de.itemis.mps.editor.diagram.runtime*: Diagrams can now be used in an headless environment (e.g. for rendering documentation). +- *de.itemis.mps.editor.diagram.runtime*: The dependency to *de.q60.mps.collections.libs* was removed. ## May 2024 diff --git a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps index f762ba2c2..389738197 100644 --- a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps +++ b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps @@ -5043,9 +5043,6 @@ - - - @@ -5235,11 +5232,6 @@ - - - - - diff --git a/code/celllayout/solutions/de.slisson.mps.editor.celllayout.runtime/models/de/itemis/mps/editor/celllayout/layout.mps b/code/celllayout/solutions/de.slisson.mps.editor.celllayout.runtime/models/de/itemis/mps/editor/celllayout/layout.mps index d6c955f12..54a9f38a4 100644 --- a/code/celllayout/solutions/de.slisson.mps.editor.celllayout.runtime/models/de/itemis/mps/editor/celllayout/layout.mps +++ b/code/celllayout/solutions/de.slisson.mps.editor.celllayout.runtime/models/de/itemis/mps/editor/celllayout/layout.mps @@ -9404,9 +9404,6 @@ - - - @@ -9423,6 +9420,9 @@ + + + @@ -11120,6 +11120,14 @@ + + + + + + + + @@ -11131,14 +11139,6 @@ - - - - - - - - diff --git a/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/de.itemis.mps.editor.diagram.demo.elk.mpl b/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/de.itemis.mps.editor.diagram.demo.elk.mpl index c1ebd74ca..c368f53c2 100644 --- a/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/de.itemis.mps.editor.diagram.demo.elk.mpl +++ b/code/diagram/languages/de.itemis.mps.editor.diagram.demo.elk/de.itemis.mps.editor.diagram.demo.elk.mpl @@ -50,8 +50,6 @@ - - @@ -67,11 +65,9 @@ - - @@ -79,7 +75,6 @@ - diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/de.itemis.mps.editor.diagram.runtime.msd b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/de.itemis.mps.editor.diagram.runtime.msd index ee32f3fd0..714078a24 100644 --- a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/de.itemis.mps.editor.diagram.runtime.msd +++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/de.itemis.mps.editor.diagram.runtime.msd @@ -61,7 +61,6 @@ 848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime) 24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles) c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure) - ecfb9949-7433-4db5-85de-0f84d172e4ce(de.q60.mps.collections.libs) fa13cc63-c476-4d46-9c96-d53670abe7bc(de.itemis.mps.editor.diagram) dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime) @@ -108,7 +107,6 @@ - diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps index dd1812d0c..b93efb888 100644 --- a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps +++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps @@ -78,7 +78,6 @@ - @@ -105,23 +104,15 @@ - - - - - - - - @@ -136,6 +127,7 @@ + @@ -33716,7 +33708,7 @@ - + @@ -33743,7 +33735,7 @@ - + diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/model.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/model.mps index d8744809b..8ce5780c3 100644 --- a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/model.mps +++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/model.mps @@ -51,6 +51,7 @@ + diff --git a/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps b/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps index 6033a2d18..c5da0b2ce 100644 --- a/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps +++ b/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps @@ -291,6 +291,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +