Skip to content

Merge maintenance/mps20241 into maintenance/mps20251 #1616

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mps-ci-buildbot merged 2 commits into from
Oct 3, 2025
Merged

Merge maintenance/mps20241 into maintenance/mps20251 #1616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e778413
diagram.runtime: add new xbase.lib dependency to libraries
sergej-koscejev Oct 3, 2025
8cfab44
Merge pull request #1615 from JetBrains/add-missing-lib
sergej-koscejev Oct 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion .../build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5757,6 +5757,28 @@
<ref role="3bR37D" node="6fQhGuklQWU" resolve="de.q60.mps.collections.libs" />
</node>
</node>
<node concept="1SiIV0" id="2FgaNMi_gr$" role="3bR37C">
<node concept="1BurEX" id="2FgaNMi_gr_" role="1SiIV1">
<node concept="398BVA" id="2FgaNMi_grn" role="1BurEY">
<ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
<node concept="2Ry0Ak" id="2FgaNMi_gro" role="iGT6I">
<property role="2Ry0Am" value="diagram" />
<node concept="2Ry0Ak" id="2FgaNMi_grp" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="2FgaNMi_grq" role="2Ry0An">
<property role="2Ry0Am" value="de.itemis.mps.editor.diagram.runtime" />
<node concept="2Ry0Ak" id="2FgaNMi_grr" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="2FgaNMi_grs" role="2Ry0An">
<property role="2Ry0Am" value="org.eclipse.xtext.xbase.lib.jar" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1E1JtA" id="6wEeo$QJAsB" role="2G$12L">
<property role="BnDLt" value="true" />
Expand Down Expand Up @@ -24567,9 +24589,9 @@
<property role="TrG5h" value="compare" />
<node concept="1E1JtA" id="2cqAxlknq_h" role="2G$12L">
<property role="BnDLt" value="true" />
<property role="TrG5h" value="de.itemis.mps.comparator.diff.tests" />
<property role="3LESm3" value="5fc729b8-2fff-48a5-9bd3-4c1aaad33d23" />
<property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
<property role="TrG5h" value="de.itemis.mps.comparator.diff.tests" />
<node concept="398BVA" id="2cqAxlknq_I" role="3LF7KH">
<ref role="398BVh" node="PE3B26neqW" resolve="extensions.code" />
<node concept="2Ry0Ak" id="2cqAxlknqA$" role="iGT6I">
Expand Down
2 changes: 2 additions & 0 deletions ...m/solutions/de.itemis.mps.editor.diagram.runtime/de.itemis.mps.editor.diagram.runtime.msd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,13 @@
<sourceRoot location="lib/org.eclipse.elk.alg.rectpacking.jar" />
<sourceRoot location="lib/org.eclipse.elk.alg.spore.jar" />
<sourceRoot location="lib/org.eclipse.elk.alg.topdownpacking.jar" />
<sourceRoot location="lib/org.eclipse.xtext.xbase.lib.jar" />
</modelRoot>
</models>
<facets>
<facet type="java" languageLevel="JAVA_8" compile="mps" classes="mps" ext="yes">
<classes generated="true" path="${module}/classes_gen" />
<library location="${module}/lib/org.eclipse.xtext.xbase.lib.jar" />
<library location="${module}/lib/jgraphx.jar" />
<library location="${module}/lib/org.eclipse.elk.alg.common.jar" />
<library location="${module}/lib/org.eclipse.elk.alg.layered.jar" />
Expand Down