Skip to content

Commit

Permalink
Merge pull request #2549 from mbeddr/merge/mps20223
Browse files Browse the repository at this point in the history 
Merge maintenance/mps20223 into master
  • Loading branch information
@sergej-koscejev
sergej-koscejev authored Oct 9, 2024
2 parents aca21e0 + 2b2b490 commit ee1a481
Show file tree
Hide file tree
Showing 32 changed files with 1,672 additions and 366 deletions.
4 changes: 2 additions & 2 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import de.itemis.mps.gradle.RunAntScript


plugins {
id 'de.itemis.mps.gradle.common' version '1.22.+'
id 'download-jbr' version '1.22.+'
id 'de.itemis.mps.gradle.common' version '1.28.+'
id 'download-jbr' version '1.28.+'
}

repositories {
Expand Down
8 changes: 0 additions & 8 deletions code/languages/com.mbeddr.build/.mps/libraries.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,6 @@
<component name="ProjectLibraryManager">
<option name="libraries">
<map>
<entry key="mbeddr.core">
<value>
<Library>
<option name="name" value="mbeddr.core" />
<option name="path" value="${mbeddr.github.core.home}/code/languages" />
</Library>
</value>
</entry>
<entry key="mps.extensions">
<value>
<Library>
Expand Down
2 changes: 1 addition & 1 deletion code/languages/com.mbeddr.build/.mps/vcs.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$mbeddr.github.core.home$" vcs="Git" />
<mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
</component>
</project>
14 changes: 7 additions & 7 deletions ....build/solutions/com.mbeddr.core.tests.build/models/com/mbeddr/core/tests/build/build.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1051,16 +1051,16 @@
<ref role="3bR37D" node="5Z2CJwRopt8" resolve="test.assessments.testlang" />
</node>
</node>
<node concept="3rtmxn" id="4mvQA9n$oM$" role="3bR31x">
<node concept="3LXTmp" id="4mvQA9n$oM_" role="3rtmxm">
<node concept="3qWCbU" id="4mvQA9n$oMA" role="3LXTna">
<node concept="3rtmxn" id="3xUpIvHHZkn" role="3bR31x">
<node concept="3LXTmp" id="3xUpIvHHZko" role="3rtmxm">
<node concept="3qWCbU" id="3xUpIvHHZkp" role="3LXTna">
<property role="3qWCbO" value="icons/**, resources/**" />
</node>
<node concept="398BVA" id="4mvQA9n$oMB" role="3LXTmr">
<node concept="398BVA" id="3xUpIvHHZkq" role="3LXTmr">
<ref role="398BVh" node="7eF9rfAuuux" resolve="mbeddr.core" />
<node concept="2Ry0Ak" id="4mvQA9n$oMC" role="iGT6I">
<node concept="2Ry0Ak" id="3xUpIvHHZkr" role="iGT6I">
<property role="2Ry0Am" value="tests" />
<node concept="2Ry0Ak" id="4mvQA9n$oMD" role="2Ry0An">
<node concept="2Ry0Ak" id="3xUpIvHHZks" role="2Ry0An">
<property role="2Ry0Am" value="test.assessments" />
</node>
</node>
Expand Down Expand Up @@ -1174,10 +1174,10 @@
</node>
<node concept="22LTRH" id="7eF9rfAuuvf" role="1hWBAP">
<property role="TrG5h" value="com.mbeddr.core.tests" />
<node concept="24cAiW" id="76N1O$Kj6vr" role="24cAkG" />
<node concept="22LTRF" id="5Z2CJwRoMT1" role="22LTRK">
<ref role="22LTRG" node="7eF9rfAuutn" resolve="com.mbeddr.core.tests" />
</node>
<node concept="24cAiW" id="76N1O$Kj6vr" role="24cAkG" />
</node>
</node>
<node concept="1l3spW" id="58DJDcMhr5Y">
Expand Down
1,319 changes: 1,319 additions & 0 deletions ...uild/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps
View file

Large diffs are not rendered by default.

176 changes: 158 additions & 18 deletions ...uages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1790,12 +1790,6 @@
</node>
</node>
</node>
<node concept="1SiIV0" id="46XBvPMFwgD" role="3bR37C">
<node concept="3bR9La" id="46XBvPMFwgE" role="1SiIV1">
<property role="3bR36h" value="true" />
<ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
</node>
</node>
<node concept="1BupzO" id="4PRpvcZJN7E" role="3bR31x">
<property role="3ZfqAx" value="models" />
<property role="1Hdu6h" value="true" />
Expand All @@ -1818,6 +1812,12 @@
</node>
</node>
</node>
<node concept="1SiIV0" id="46XBvPMFwgD" role="3bR37C">
<node concept="3bR9La" id="46XBvPMFwgE" role="1SiIV1">
<property role="3bR36h" value="true" />
<ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
</node>
</node>
</node>
<node concept="1E1JtA" id="vOGyTeKzbV" role="2G$12L">
<property role="BnDLt" value="true" />
Expand Down Expand Up @@ -17497,6 +17497,130 @@
</node>
</node>
</node>
<node concept="1E1JtD" id="4WMvu6msufV" role="2G$12L">
<property role="BnDLt" value="true" />
<property role="TrG5h" value="com.mbeddr.slides" />
<property role="3LESm3" value="94daa6eb-e6a4-4b9f-90b6-4b23682ca120" />
<node concept="398BVA" id="4WMvu6msuzA" role="3LF7KH">
<ref role="398BVh" node="1m4fy7Kxwst" resolve="mbeddr.doc" />
<node concept="2Ry0Ak" id="4WMvu6mswpk" role="iGT6I">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="4WMvu6msx0_" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.slides" />
<node concept="2Ry0Ak" id="4WMvu6msxBQ" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.slides.mpl" />
</node>
</node>
</node>
</node>
<node concept="1SiIV0" id="4WMvu6msyJw" role="3bR37C">
<node concept="3bR9La" id="4WMvu6msyJx" role="1SiIV1">
<ref role="3bR37D" node="$bJ0jguQfr" resolve="com.mbeddr.core.base" />
</node>
</node>
<node concept="1SiIV0" id="4WMvu6msyJy" role="3bR37C">
<node concept="3bR9La" id="4WMvu6msyJz" role="1SiIV1">
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
</node>
</node>
<node concept="1SiIV0" id="4WMvu6msyJ$" role="3bR37C">
<node concept="3bR9La" id="4WMvu6msyJ_" role="1SiIV1">
<ref role="3bR37D" node="1YMM4SJ2m0" resolve="com.mbeddr.doc" />
</node>
</node>
<node concept="1SiIV0" id="4WMvu6msyJA" role="3bR37C">
<node concept="3bR9La" id="4WMvu6msyJB" role="1SiIV1">
<ref role="3bR37D" node="5A_Zlt6CRir" resolve="com.mbeddr.mpsutil.hyperlink" />
</node>
</node>
<node concept="1SiIV0" id="4WMvu6msyJC" role="3bR37C">
<node concept="3bR9La" id="4WMvu6msyJD" role="1SiIV1">
<ref role="3bR37D" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
</node>
</node>
<node concept="1BupzO" id="4WMvu6msyJP" role="3bR31x">
<property role="3ZfqAx" value="languageModels" />
<property role="1Hdu6h" value="true" />
<property role="1HemKv" value="true" />
<node concept="3LXTmp" id="4WMvu6msyJQ" role="1HemKq">
<node concept="398BVA" id="4WMvu6msyJE" role="3LXTmr">
<ref role="398BVh" node="1m4fy7Kxwst" resolve="mbeddr.doc" />
<node concept="2Ry0Ak" id="4WMvu6msyJF" role="iGT6I">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="4WMvu6msyJG" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.slides" />
<node concept="2Ry0Ak" id="4WMvu6msyJH" role="2Ry0An">
<property role="2Ry0Am" value="languageModels" />
</node>
</node>
</node>
</node>
<node concept="3qWCbU" id="4WMvu6msyJR" role="3LXTna">
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
</node>
</node>
</node>
<node concept="1SiIV0" id="4WMvu6msyJS" role="3bR37C">
<node concept="1Busua" id="4WMvu6msyJT" role="1SiIV1">
<ref role="1Busuk" node="1YMM4SJ2m0" resolve="com.mbeddr.doc" />
</node>
</node>
<node concept="1SiIV0" id="4WMvu6msyJU" role="3bR37C">
<node concept="1Busua" id="4WMvu6msyJV" role="1SiIV1">
<ref role="1Busuk" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
</node>
</node>
<node concept="1SiIV0" id="4WMvu6msyJW" role="3bR37C">
<node concept="1Busua" id="4WMvu6msyJX" role="1SiIV1">
<ref role="1Busuk" to="ffeo:568PkTlOK5Q" resolve="jetbrains.mps.core.xml" />
</node>
</node>
<node concept="1yeLz9" id="4WMvu6msyJY" role="1TViLv">
<property role="TrG5h" value="com.mbeddr.slides#5455967284188432063" />
<property role="3LESm3" value="7276fe27-ac58-4bed-89ee-66e00d2b7581" />
<node concept="1BupzO" id="4WMvu6msyKc" role="3bR31x">
<property role="3ZfqAx" value="generator/template" />
<property role="1Hdu6h" value="true" />
<property role="1HemKv" value="true" />
<node concept="3LXTmp" id="4WMvu6msyKd" role="1HemKq">
<node concept="398BVA" id="4WMvu6msyJZ" role="3LXTmr">
<ref role="398BVh" node="1m4fy7Kxwst" resolve="mbeddr.doc" />
<node concept="2Ry0Ak" id="4WMvu6msyK0" role="iGT6I">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="4WMvu6msyK1" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.slides" />
<node concept="2Ry0Ak" id="4WMvu6msyK2" role="2Ry0An">
<property role="2Ry0Am" value="generator" />
<node concept="2Ry0Ak" id="4WMvu6msyK3" role="2Ry0An">
<property role="2Ry0Am" value="template" />
</node>
</node>
</node>
</node>
</node>
<node concept="3qWCbU" id="4WMvu6msyKe" role="3LXTna">
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
</node>
</node>
</node>
</node>
<node concept="3rtmxn" id="4WMvu6msz8e" role="3bR31x">
<node concept="3LXTmp" id="4WMvu6msz8f" role="3rtmxm">
<node concept="398BVA" id="4WMvu6msz8g" role="3LXTmr">
<ref role="398BVh" node="1m4fy7Kxwst" resolve="mbeddr.doc" />
<node concept="2Ry0Ak" id="4WMvu6msz8h" role="iGT6I">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="4WMvu6msz8i" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.slides" />
</node>
</node>
</node>
<node concept="3qWCbU" id="4WMvu6msz8k" role="3LXTna">
<property role="3qWCbO" value="icons/**, resources/**" />
</node>
</node>
</node>
</node>
<node concept="1E1JtD" id="5NpY9mnqa74" role="2G$12L">
<property role="BnDLt" value="true" />
<property role="TrG5h" value="com.mbeddr.doc.aspect" />
Expand Down Expand Up @@ -20253,16 +20377,16 @@
</node>
</node>
</node>
<node concept="3rtmxn" id="4mvQA9n$oN8" role="3bR31x">
<node concept="3LXTmp" id="4mvQA9n$oN9" role="3rtmxm">
<node concept="3qWCbU" id="4mvQA9n$oNa" role="3LXTna">
<node concept="3rtmxn" id="3xUpIvHHZl6" role="3bR31x">
<node concept="3LXTmp" id="3xUpIvHHZl7" role="3rtmxm">
<node concept="3qWCbU" id="3xUpIvHHZl8" role="3LXTna">
<property role="3qWCbO" value="icons/**, resources/**" />
</node>
<node concept="398BVA" id="4mvQA9n$oNb" role="3LXTmr">
<node concept="398BVA" id="3xUpIvHHZl9" role="3LXTmr">
<ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
<node concept="2Ry0Ak" id="4mvQA9n$oNc" role="iGT6I">
<node concept="2Ry0Ak" id="3xUpIvHHZla" role="iGT6I">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="4mvQA9n$oNd" role="2Ry0An">
<node concept="2Ry0Ak" id="3xUpIvHHZlb" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.mpsutil.editor.displayControl" />
</node>
</node>
Expand Down Expand Up @@ -20349,16 +20473,16 @@
</node>
</node>
</node>
<node concept="3rtmxn" id="4mvQA9n$oNf" role="3bR31x">
<node concept="3LXTmp" id="4mvQA9n$oNg" role="3rtmxm">
<node concept="3qWCbU" id="4mvQA9n$oNh" role="3LXTna">
<node concept="3rtmxn" id="3xUpIvHHZld" role="3bR31x">
<node concept="3LXTmp" id="3xUpIvHHZle" role="3rtmxm">
<node concept="3qWCbU" id="3xUpIvHHZlf" role="3LXTna">
<property role="3qWCbO" value="icons/**, resources/**" />
</node>
<node concept="398BVA" id="4mvQA9n$oNi" role="3LXTmr">
<node concept="398BVA" id="3xUpIvHHZlg" role="3LXTmr">
<ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
<node concept="2Ry0Ak" id="4mvQA9n$oNj" role="iGT6I">
<node concept="2Ry0Ak" id="3xUpIvHHZlh" role="iGT6I">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="4mvQA9n$oNk" role="2Ry0An">
<node concept="2Ry0Ak" id="3xUpIvHHZli" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.mpsutil.logicalChild" />
</node>
</node>
Expand Down Expand Up @@ -20476,6 +20600,22 @@
<ref role="3bR37D" to="ffeo:1ACpgrwmP7U" resolve="jetbrains.mps.kotlin.stdlib" />
</node>
</node>
<node concept="3rtmxn" id="3xUpIvHHZkZ" role="3bR31x">
<node concept="3LXTmp" id="3xUpIvHHZl0" role="3rtmxm">
<node concept="3qWCbU" id="3xUpIvHHZl1" role="3LXTna">
<property role="3qWCbO" value="icons/**, resources/**" />
</node>
<node concept="398BVA" id="3xUpIvHHZl2" role="3LXTmr">
<ref role="398BVh" node="7uZw0yZ2_Lj" resolve="mpsutil" />
<node concept="2Ry0Ak" id="3xUpIvHHZl3" role="iGT6I">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="3xUpIvHHZl4" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.mpsutil.checkinHandler" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="m$_wf" id="2hNr1jFzOYG" role="3989C9">
Expand Down
8 changes: 0 additions & 8 deletions code/languages/com.mbeddr.mpsutil/.mps/libraries.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,6 @@
<component name="ProjectLibraryManager">
<option name="libraries">
<map>
<entry key="mbeddr">
<value>
<Library>
<option name="name" value="mbeddr" />
<option name="path" value="${mbeddr.github.core.home}/code" />
</Library>
</value>
</entry>
<entry key="mps.extensions">
<value>
<Library>
Expand Down
13 changes: 6 additions & 7 deletions ....mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/generator/template/[email protected]
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,6 @@
<concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
<child id="1237721435807" name="elementType" index="HW$YZ" />
</concept>
<concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
<concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
<child id="1205679832066" name="ascending" index="2S7zOq" />
</concept>
Expand Down Expand Up @@ -1019,7 +1018,7 @@
<node concept="3clFbF" id="7zBzSouOEvw" role="3cqZAp">
<node concept="2OqwBi" id="7zBzSouOEL9" role="3clFbG">
<node concept="37vLTw" id="7zBzSouOEvv" role="2Oq$k0">
<ref role="3cqZAo" node="7zBzSouOEen" resolve="it" />
<ref role="3cqZAo" node="2K_c977ZBYY" resolve="it" />
</node>
<node concept="liA8E" id="7zBzSouOF8u" role="2OqNvi">
<ref role="37wK5l" to="ykkq:2jUI4_LRtLD" resolve="canBeActivatedByDefault" />
Expand All @@ -1031,9 +1030,9 @@
</node>
</node>
</node>
<node concept="Rh6nW" id="7zBzSouOEen" role="1bW2Oz">
<node concept="gl6BB" id="2K_c977ZBYY" role="1bW2Oz">
<property role="TrG5h" value="it" />
<node concept="2jxLKc" id="7zBzSouOEeo" role="1tU5fm" />
<node concept="2jxLKc" id="2K_c977ZBYZ" role="1tU5fm" />
</node>
</node>
</node>
Expand All @@ -1044,17 +1043,17 @@
<node concept="3clFbF" id="7zBzSouOHvg" role="3cqZAp">
<node concept="2OqwBi" id="7zBzSouOHHy" role="3clFbG">
<node concept="37vLTw" id="7zBzSouOHvf" role="2Oq$k0">
<ref role="3cqZAo" node="7zBzSouOHd_" resolve="it" />
<ref role="3cqZAo" node="2K_c977ZBZ0" resolve="it" />
</node>
<node concept="2OwXpG" id="7zBzSouOI49" role="2OqNvi">
<ref role="2Oxat5" to="ykkq:7zBzSouMwxo" resolve="myDefaultPriority" />
</node>
</node>
</node>
</node>
<node concept="Rh6nW" id="7zBzSouOHd_" role="1bW2Oz">
<node concept="gl6BB" id="2K_c977ZBZ0" role="1bW2Oz">
<property role="TrG5h" value="it" />
<node concept="2jxLKc" id="7zBzSouOHdA" role="1tU5fm" />
<node concept="2jxLKc" id="2K_c977ZBZ1" role="1tU5fm" />
</node>
</node>
<node concept="1nlBCl" id="7zBzSouOHdB" role="2S7zOq">
Expand Down
8 changes: 4 additions & 4 deletions ...ges/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.asynccell.sandbox/models/behavior.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@
<ref role="3cqZAo" node="2YOONxNStSE" resolve="exception" />
</node>
<node concept="liA8E" id="2YOONxNSz1I" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~Throwable.getMessage():java.lang.String" resolve="getMessage" />
<ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
</node>
</node>
</node>
Expand Down Expand Up @@ -475,7 +475,7 @@
</node>
</node>
<node concept="liA8E" id="2YOONxNRGtC" role="2OqNvi">
<ref role="37wK5l" to="dxuu:~Timer.stop():void" resolve="stop" />
<ref role="37wK5l" to="dxuu:~Timer.stop()" resolve="stop" />
</node>
</node>
</node>
Expand Down Expand Up @@ -518,7 +518,7 @@
<ref role="3cqZAo" node="17HIJlL0Ew$" resolve="timer" />
</node>
<node concept="liA8E" id="2YOONxNRGu7" role="2OqNvi">
<ref role="37wK5l" to="dxuu:~Timer.setRepeats(boolean):void" resolve="setRepeats" />
<ref role="37wK5l" to="dxuu:~Timer.setRepeats(boolean)" resolve="setRepeats" />
<node concept="3clFbT" id="2YOONxNRGu8" role="37wK5m">
<property role="3clFbU" value="false" />
</node>
Expand All @@ -531,7 +531,7 @@
<ref role="3cqZAo" node="17HIJlL0Ew$" resolve="timer" />
</node>
<node concept="liA8E" id="2YOONxNRGuc" role="2OqNvi">
<ref role="37wK5l" to="dxuu:~Timer.start():void" resolve="start" />
<ref role="37wK5l" to="dxuu:~Timer.start()" resolve="start" />
</node>
</node>
</node>
Expand Down
Loading

0 comments on commit ee1a481

Please sign in to comment.