Skip to content

Commit

Permalink
Merge pull request #1024 from JetBrains/merge/mps20232
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexanderpann
alexanderpann authored Nov 18, 2024
2 parents 112d5a5 + 836ced2 commit 45b3af8
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 43 deletions.
79 changes: 38 additions & 41 deletions .../build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9968,9 +9968,6 @@
<node concept="m$_yC" id="6bkzxtWP$P1" role="m$_yJ">
<ref role="m$_y1" to="ffeo:4k71ibbKLe8" resolve="jetbrains.mps.core" />
</node>
<node concept="m$_yC" id="2sSK94l$GmE" role="m$_yJ">
<ref role="m$_y1" node="2sSK94l$Fo0" resolve="de.itemis.stubs.xml" />
</node>
<node concept="2iUeEo" id="6bkzxtWP$P2" role="2iVFfd">
<property role="2iUeEt" value="itemis AG" />
<property role="2iUeEu" value="https://www.itemis.com/en/it-services/methods-and-tools/mps" />
Expand All @@ -9980,6 +9977,9 @@
<property role="3MwjfP" value="JARs and their stubs for using the Apache Batik SVGGen and Dom Library in MPS." />
</node>
</node>
<node concept="m$_yC" id="2sSK94l$GmE" role="m$_yJ">
<ref role="m$_y1" node="2sSK94l$Fo0" resolve="de.itemis.stubs.xml" />
</node>
</node>
<node concept="m$_wf" id="2sSK94l$Fo0" role="3989C9">
<property role="m$_wk" value="de.itemis.stubs.xml" />
Expand Down Expand Up @@ -12717,25 +12717,6 @@
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
</node>
</node>
<node concept="3rtmxn" id="5py4VqXmLJW" role="3bR31x">
<node concept="3LXTmp" id="5py4VqXmLJX" role="3rtmxm">
<node concept="3qWCbU" id="5py4VqXmLJY" role="3LXTna">
<property role="3qWCbO" value="icons/**, resources/**" />
</node>
<node concept="398BVA" id="5py4VqXmLJZ" role="3LXTmr">
<ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
<node concept="2Ry0Ak" id="5py4VqXmLK0" role="iGT6I">
<property role="2Ry0Am" value="shadowmodels" />
<node concept="2Ry0Ak" id="5py4VqXmLK1" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="42yR2aTci7R" role="2Ry0An">
<property role="2Ry0Am" value="de.q60.mps.collections.libs" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1SiIV0" id="42yR2aTbzPQ" role="3bR37C">
<node concept="1BurEX" id="42yR2aTbzPR" role="1SiIV1">
<node concept="398BVA" id="42yR2aTbzPD" role="1BurEY">
Expand Down Expand Up @@ -12824,6 +12805,25 @@
</node>
</node>
</node>
<node concept="3rtmxn" id="7ej5dvGAnw" role="3bR31x">
<node concept="3LXTmp" id="7ej5dvGAnx" role="3rtmxm">
<node concept="3qWCbU" id="7ej5dvGAny" role="3LXTna">
<property role="3qWCbO" value="icons/**, resources/**" />
</node>
<node concept="398BVA" id="7ej5dvGAnz" role="3LXTmr">
<ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
<node concept="2Ry0Ak" id="7ej5dvGAn$" role="iGT6I">
<property role="2Ry0Am" value="shadowmodels" />
<node concept="2Ry0Ak" id="7ej5dvGAn_" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="7ej5dvGAnA" role="2Ry0An">
<property role="2Ry0Am" value="de.q60.mps.collections.libs" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2G$12M" id="6bkzxtWPDx0" role="3989C9">
Expand All @@ -12848,25 +12848,6 @@
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
</node>
</node>
<node concept="3rtmxn" id="6bkzxtWPDx9" role="3bR31x">
<node concept="3LXTmp" id="6bkzxtWPDxa" role="3rtmxm">
<node concept="3qWCbU" id="6bkzxtWPDxb" role="3LXTna">
<property role="3qWCbO" value="icons/**, resources/**" />
</node>
<node concept="398BVA" id="6bkzxtWPDxc" role="3LXTmr">
<ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
<node concept="2Ry0Ak" id="6bkzxtWPDxd" role="iGT6I">
<property role="2Ry0Am" value="shadowmodels" />
<node concept="2Ry0Ak" id="6bkzxtWPDxe" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="6bkzxtWPDxf" role="2Ry0An">
<property role="2Ry0Am" value="de.q60.mps.collections.libs" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1SiIV0" id="6bkzxtWPIqj" role="3bR37C">
<node concept="1BurEX" id="6bkzxtWPIqk" role="1SiIV1">
<node concept="398BVA" id="6bkzxtWPIq8" role="1BurEY">
Expand All @@ -12886,6 +12867,22 @@
</node>
</node>
</node>
<node concept="3rtmxn" id="7ej5dvGAnC" role="3bR31x">
<node concept="3LXTmp" id="7ej5dvGAnD" role="3rtmxm">
<node concept="3qWCbU" id="7ej5dvGAnE" role="3LXTna">
<property role="3qWCbO" value="icons/**, resources/**" />
</node>
<node concept="398BVA" id="7ej5dvGAnF" role="3LXTmr">
<ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
<node concept="2Ry0Ak" id="7ej5dvGAnG" role="iGT6I">
<property role="2Ry0Am" value="batik" />
<node concept="2Ry0Ak" id="7ej5dvGAnH" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
</node>
</node>
</node>
</node>
</node>
<node concept="1SiIV0" id="3uj04QfIluv" role="3bR37C">
<node concept="1BurEX" id="3uj04QfIluw" role="1SiIV1">
<node concept="398BVA" id="3uj04QfIluk" role="1BurEY">
Expand Down
3 changes: 1 addition & 2 deletions code/shadowmodels/solutions/de.q60.mps.collections.libs/de.q60.mps.collections.libs.msd
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<solution name="de.q60.mps.collections.libs" uuid="ecfb9949-7433-4db5-85de-0f84d172e4ce" moduleVersion="0">
<models>
<modelRoot contentPath="${module}" type="default" />
<modelRoot contentPath="${module}/lib" type="java_classes">
<modelRoot type="java_classes" contentPath="${module}/lib">
<sourceRoot location="trove4j-3.0.3.jar" />
<sourceRoot location="vavr-0.9.3.jar" />
<sourceRoot location="guava-27.1-jre.jar" />
Expand Down

0 comments on commit 45b3af8

Please sign in to comment.