Skip to content

Commit

Permalink
Merge pull request #2626 from mbeddr/merge/mps20241
Browse files Browse the repository at this point in the history 
Merge maintenance/mps20232 into maintenance/mps20241
  • Loading branch information
@mps-ci-buildbot
mps-ci-buildbot authored Nov 27, 2024
2 parents 0c0cedd + 97f3c4f commit c707a9e
Show file tree
Hide file tree
Showing 100 changed files with 872 additions and 448 deletions.
2 changes: 2 additions & 0 deletions ...plications/tutorial/solutions/com.mbeddr.tutorial.startup/com.mbeddr.tutorial.startup.msd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<dependency reexport="false">67506b1e-43ad-47fe-a8e6-bc7837e9e11f(com.mbeddr.mpsutil.editingGuide)</dependency>
<dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
<dependency reexport="false">cc99dce1-49f3-4392-8dbf-e22ca47bd0af(org.modelix.model.api)</dependency>
<dependency reexport="false">39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty)</dependency>
</dependencies>
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
Expand Down Expand Up @@ -52,6 +53,7 @@
<module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
<module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
<module reference="39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty)" version="0" />
<module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="3" />
<module reference="44ce4404-473f-43bf-a54c-40d7c6f01639(com.mbeddr.editingGuide)" version="0" />
<module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
Expand Down
Binary file removed code/applications/tutorial/solutions/com.mbeddr.tutorial.startup/icons/play.png
View file
Binary file not shown.
4 changes: 4 additions & 0 deletions code/applications/tutorial/solutions/com.mbeddr.tutorial.startup/icons/task.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions ...applications/tutorial/solutions/com.mbeddr.tutorial.startup/icons/task_dark.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 11 additions & 9 deletions ...orial/solutions/com.mbeddr.tutorial.startup/models/com/mbeddr/tutorial/startup/plugin.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
<import index="dush" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.persistence(MPS.OpenAPI/)" />
<import index="v18h" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:kotlin(MPS.IDEA/)" />
<import index="ksrs" ref="cc99dce1-49f3-4392-8dbf-e22ca47bd0af/java:kotlin.coroutines(org.modelix.model.api/)" />
<import index="jz16" ref="39983771-4e9b-401b-a1a9-1da6c777c843/java:icons(MPS.ThirdParty/)" />
<import index="z2i8" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.icons(MPS.IDEA/)" />
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
<import index="tprs" ref="r:00000000-0000-4000-0000-011c895904a4(jetbrains.mps.ide.actions)" implicit="true" />
</imports>
Expand Down Expand Up @@ -68,7 +70,7 @@
<reference id="1217252646389" name="key" index="1DUlNI" />
</concept>
<concept id="1217252428768" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterReferenceOperation" flags="nn" index="1DTwFV" />
<concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ngI" index="1NuADB">
<concept id="1217413147516" name="jetbrains.mps.lang.plugin.structure.ActionParameter" flags="ng" index="1NuADB">
<child id="5538333046911298738" name="condition" index="1oa70y" />
</concept>
</language>
Expand Down Expand Up @@ -97,7 +99,7 @@
<concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
<reference id="1188208074048" name="annotation" index="2AI5Lk" />
</concept>
<concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
<concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
<child id="1188208488637" name="annotation" index="2AJF6D" />
</concept>
<concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
Expand Down Expand Up @@ -168,7 +170,7 @@
<child id="1154542793668" name="componentType" index="3g7fb8" />
<child id="1154542803372" name="initValue" index="3g7hyw" />
</concept>
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
<child id="1068499141038" name="actualArgument" index="37wK5m" />
</concept>
Expand All @@ -188,7 +190,7 @@
<child id="1081773367580" name="leftExpression" index="3uHU7B" />
</concept>
<concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
<child id="1178549979242" name="visibility" index="1B3o_S" />
</concept>
<concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
Expand All @@ -215,7 +217,7 @@
<concept id="1213999088275" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldDeclaration" flags="ig" index="2BZ0e9" />
<concept id="1213999117680" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldAccessOperation" flags="nn" index="2BZ7hE" />
<concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
<concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
<concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
<reference id="1205756909548" name="member" index="2WH_rO" />
</concept>
</language>
Expand Down Expand Up @@ -246,7 +248,7 @@
<concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
<child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
</concept>
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
<property id="1169194664001" name="name" index="TrG5h" />
</concept>
<concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7">
Expand Down Expand Up @@ -769,12 +771,12 @@
<ref role="1DUlNI" to="qq03:~MPSCommonDataKeys.MPS_PROJECT" resolve="MPS_PROJECT" />
<node concept="1oajcY" id="2QDtwSqDi2V" role="1oa70y" />
</node>
<node concept="1QGGSu" id="2QDtwSqDi2W" role="3Uehp1">
<property role="1iqoE4" value="${module}/icons/play.png" />
<node concept="1QGGSu" id="frftTv53d3" role="3Uehp1">
<property role="1iqoE4" value="${module}/icons/task.svg" />
</node>
</node>
<node concept="sE7Ow" id="2NmTaRWDjVL">
<property role="TrG5h" value="openUserGUide" />
<property role="TrG5h" value="openUserGuide" />
<property role="2uzpH1" value="mbeddr User Guide" />
<property role="1rBW0U" value="true" />
<node concept="tnohg" id="2NmTaRWDjZk" role="tncku">
Expand Down
15 changes: 0 additions & 15 deletions code/languages/com.mbeddr.build/solutions/com.mbeddr.build/models/com/mbeddr/build/build.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11300,21 +11300,6 @@
</node>
</node>
</node>
<node concept="398rNT" id="7eF9rfAuDUw" role="1l3spd">
<property role="TrG5h" value="mbeddr.analyses" />
<node concept="398BVA" id="7eF9rfAuDUx" role="398pKh">
<ref role="398BVh" node="7uZw0yZ2_Jf" resolve="mbeddr.github.core.home" />
<node concept="2Ry0Ak" id="7eF9rfAuDUy" role="iGT6I">
<property role="2Ry0Am" value="code" />
<node concept="2Ry0Ak" id="7eF9rfAuDUz" role="2Ry0An">
<property role="2Ry0Am" value="languages" />
<node concept="2Ry0Ak" id="7eF9rfAuDU$" role="2Ry0An">
<property role="2Ry0Am" value="com.mbeddr.analyses" />
</node>
</node>
</node>
</node>
</node>
<node concept="398rNT" id="4MR$$QmqomQ" role="1l3spd">
<property role="TrG5h" value="artifacts.root" />
</node>
Expand Down
Loading

0 comments on commit c707a9e

Please sign in to comment.