Merge pull request #14 from jconquet/migration/2022.2

Migration to MPS 2022.2
DSLFoundry · Mar 20, 2024 · 885ec2f · 885ec2f
2 parents 82b2378 + 69da4b9
commit 885ec2f
Show file tree

Hide file tree

Showing 19 changed files with 190 additions and 154 deletions.
diff --git a/.mps/migration.xml b/.mps/migration.xml
@@ -7,6 +7,6 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2019_3.DefaultFacetExplicitPersistence" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2021_2.SplitMPSCoreStub" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
-    <entry key="project.migrated.version" value="213" />
+    <entry key="project.migrated.version" value="222" />
   </component>
 </project>
diff --git a/build.gradle b/build.gradle
@@ -32,8 +32,8 @@ configurations {
 }
 
 dependencies {
-    mps "com.jetbrains:mps:2021.3.+"
-    languageLibs "com.mbeddr:mbeddr:2021.3.+"
+    mps "com.jetbrains:mps:2022.2.+"
+    languageLibs "com.mbeddr:mbeddr:2022.2.+"
     junitAnt 'org.apache.ant:ant-junit:1.10.11'
 }
 

diff --git a/build/languageBuild.xml b/build/languageBuild.xml
diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,3 @@
-dflatVersion = 2021.3
+dflatVersion = 2022.2
 systemProp.org.gradle.internal.http.connectionTimeout=180000
 systemProp.org.gradle.internal.http.socketTimeout=180000
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/languages/com.dslfoundry.dflat.structure/models/com.dslfoundry.dflat.structure.editor.mps b/languages/com.dslfoundry.dflat.structure/models/com.dslfoundry.dflat.structure.editor.mps
@@ -1800,7 +1800,7 @@
   </node>
   <node concept="PKFIW" id="3lo6kbKcb_x">
     <property role="3GE5qa" value="typeDeclaration.modifier" />
-    <property role="TrG5h" value="sealed" />
+    <property role="TrG5h" value="sealeded" />
     <ref role="1XX52x" to="y2ir:3lo6kbKcbyh" resolve="ISealed" />
     <node concept="3EZMnI" id="118wo$oBL3S" role="2wV5jI">
       <node concept="2iRfu4" id="118wo$oBL3T" role="2iSdaV" />

diff --git a/languages/com.dslfoundry.dflat.structure/models/com.dslfoundry.dflat.structure.structure.mps b/languages/com.dslfoundry.dflat.structure/models/com.dslfoundry.dflat.structure.structure.mps
diff --git a/...om.dslfoundry.dflat.buildAllScripts/models/com.dslfoundry.dflat.buildAllScripts.build.mps b/...om.dslfoundry.dflat.buildAllScripts/models/com.dslfoundry.dflat.buildAllScripts.build.mps
@@ -86,6 +86,9 @@
       <concept id="5253498789149585690" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleDependencyOnModule" flags="ng" index="3bR9La">
         <reference id="5253498789149547705" name="module" index="3bR37D" />
       </concept>
+      <concept id="763829979718664966" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleResources" flags="ng" index="3rtmxn">
+        <child id="763829979718664967" name="files" index="3rtmxm" />
+      </concept>
       <concept id="4278635856200817744" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleModelRoot" flags="ng" index="1BupzO">
         <property id="8137134783396907368" name="convert2binary" index="1Hdu6h" />
         <property id="8137134783396676838" name="extracted" index="1HemKv" />
@@ -268,6 +271,22 @@
           <ref role="3bR37D" to="al5i:7Pr7tifzlku" resolve="com.mbeddr.platform" />
         </node>
       </node>
+      <node concept="3rtmxn" id="30MG2PnluXR" role="3bR31x">
+        <node concept="3LXTmp" id="30MG2PnluXS" role="3rtmxm">
+          <node concept="3qWCbU" id="30MG2PnluXT" role="3LXTna">
+            <property role="3qWCbO" value="icons/**, resources/**" />
+          </node>
+          <node concept="398BVA" id="30MG2PnluXU" role="3LXTmr">
+            <ref role="398BVh" node="4FIECQpNJnG" resolve="dflat.home" />
+            <node concept="2Ry0Ak" id="30MG2PnluXV" role="iGT6I">
+              <property role="2Ry0Am" value="solutions" />
+              <node concept="2Ry0Ak" id="30MG2PnluXW" role="2Ry0An">
+                <property role="2Ry0Am" value="com.dslfoundry.dflat.build" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
     </node>
   </node>
 </model>

diff --git a/...m.dslfoundry.dflat.expression.test.editor/com.dslfoundry.dflat.expression.test.editor.msd b/...m.dslfoundry.dflat.expression.test.editor/com.dslfoundry.dflat.expression.test.editor.msd
@@ -23,7 +23,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-    <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="5" />
+    <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="6" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>

diff --git a/....expression.test.editor/models/[email protected] b/....expression.test.editor/models/[email protected]
@@ -2,7 +2,7 @@
 <model ref="r:38e06771-e9cb-4401-af5e-96f3d1a2c098(com.dslfoundry.dflat.expression.test.editor.base@tests)">
   <persistence version="9" />
   <languages>
-    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="5" />
+    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="21717649-bb7f-4964-87cf-78a6930e9801" name="com.dslfoundry.dflat.expression" version="0" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="b4f35ed8-45af-4efa-abe4-00ac26956e69" name="com.mbeddr.mpsutil.grammarcells.runtimelang" version="0" />

diff --git a/...com.dslfoundry.dflat.statement.test.editor/com.dslfoundry.dflat.statement.test.editor.msd b/...com.dslfoundry.dflat.statement.test.editor/com.dslfoundry.dflat.statement.test.editor.msd
@@ -25,7 +25,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-    <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="5" />
+    <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="6" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>

diff --git a/...at.statement.test.editor/models/[email protected] b/...at.statement.test.editor/models/[email protected]
@@ -2,7 +2,7 @@
 <model ref="r:cb6cddfd-96f2-4369-9eb1-ca624d8325e2(com.dslfoundry.dflat.statement.test.editor.base@tests)">
   <persistence version="9" />
   <languages>
-    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="5" />
+    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="c818080e-4a8e-47c4-a83a-59c146991007" name="com.dslfoundry.dflat.statement" version="0" />
     <use id="92d2ea16-5a42-4fdf-a676-c7604efe3504" name="de.slisson.mps.richtext" version="0" />

diff --git a/...com.dslfoundry.dflat.structure.test.editor/com.dslfoundry.dflat.structure.test.editor.msd b/...com.dslfoundry.dflat.structure.test.editor/com.dslfoundry.dflat.structure.test.editor.msd
@@ -32,7 +32,7 @@
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
-    <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="5" />
+    <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="6" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>

diff --git a/...at.structure.test.editor/models/[email protected] b/...at.structure.test.editor/models/[email protected]
@@ -2,7 +2,7 @@
 <model ref="r:e928bf54-a746-4600-9527-214973f2c18a(com.dslfoundry.dflat.structure.test.editor.base@tests)">
   <persistence version="9" />
   <languages>
-    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="5" />
+    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="28617705-0ee4-4b12-80b9-7532ec4a79c9" name="com.dslfoundry.dflat.structure" version="0" />
   </languages>

diff --git a/...ture.test.editor/models/com.dslfoundry.dflat.structure.test.editor.memberaccess@tests.mps b/...ture.test.editor/models/com.dslfoundry.dflat.structure.test.editor.memberaccess@tests.mps
@@ -2,7 +2,7 @@
 <model ref="r:ddb8920f-5c48-4675-8736-66a30167fbb9(com.dslfoundry.dflat.structure.test.editor.memberaccess@tests)">
   <persistence version="9" />
   <languages>
-    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="5" />
+    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <devkit ref="97be3f2e-6ee3-4400-ade4-6b4b2f948d52(com.dslfoundry.dflat)" />
   </languages>

diff --git a/solutions/com.dslfoundry.dflat.type.test.editor/com.dslfoundry.dflat.type.test.editor.msd b/solutions/com.dslfoundry.dflat.type.test.editor/com.dslfoundry.dflat.type.test.editor.msd
@@ -23,7 +23,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-    <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="5" />
+    <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="6" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>

diff --git a/...oundry.dflat.type.test.editor/models/[email protected] b/...oundry.dflat.type.test.editor/models/[email protected]
@@ -2,7 +2,7 @@
 <model ref="r:6fc46e4f-8cf5-49e8-b48b-8c5f155b622d(com.dslfoundry.dflat.type.test.editor.base@tests)">
   <persistence version="9" />
   <languages>
-    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="5" />
+    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="8b8c7b93-8f15-471e-a430-739566f9c25e" name="com.dslfoundry.dflat.type" version="0" />
   </languages>

diff --git a/solutions/grammarcells.playground/grammarcells.playground.msd b/solutions/grammarcells.playground/grammarcells.playground.msd
@@ -21,7 +21,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-    <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="5" />
+    <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="6" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>

diff --git a/solutions/grammarcells.playground/models/[email protected] b/solutions/grammarcells.playground/models/[email protected]
@@ -2,7 +2,7 @@
 <model ref="r:5eedbc06-0862-4f93-8dbc-ff02c4f0407e(grammarcells.playground.editor@tests)">
   <persistence version="9" />
   <languages>
-    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="5" />
+    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="69c9278e-ecc7-4b65-9e37-07cd34038c24" name="grammarcells" version="0" />
   </languages>