Merge pull request mbeddr#70 from mbeddr/feature/mps-2023.3

Upgrade MPS to 2023.3
lunatech-labs · Apr 12, 2024 · 0187c13 · 0187c13
2 parents f551464 + 8f6fd77
commit 0187c13
Show file tree

Hide file tree

Showing 31 changed files with 3,538 additions and 3,519 deletions.
diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,7 @@ plugins {
     id 'maven-publish'
     id 'co.riiid.gradle' version '0.4.2'
 
-    id 'de.itemis.mps.gradle.launcher' version '2.2.0.+'
+    id 'de.itemis.mps.gradle.launcher' version '2.3.0.+'
 }
 
 ext.jbrVers = '17.0.8.1-b1000.32'
@@ -60,11 +60,11 @@ ext.dependencyRepositories = [
 ]
 
 // Dependency versions
-ext.mpsVersion =  '2023.2'
+ext.mpsVersion =  '2023.3'
 
 // Project versions
 ext.major = '2023'
-ext.minor = '2'
+ext.minor = '3'
 
 if (ciBuild) {
     String branch = GitBasedVersioning.gitBranch
@@ -381,7 +381,7 @@ configurations {
 }
 
 dependencies {
-    rerunMigrationsBackend("de.itemis.mps.build-backends:rerun-migrations:0.0.2.+")
+    rerunMigrationsBackend("de.itemis.mps.build-backends:rerun-migrations:0.0.3.+")
 }
 
 tasks.register('rerunMigrations', JavaExec) {
@@ -394,17 +394,29 @@ tasks.register('rerunMigrations', JavaExec) {
             .withJavaExecutable(tasks.named('downloadJbr', DownloadJbrForPlatform).map { it.javaExecutable.path })
             .configure(it)
 
-    classpath(configurations.rerunMigrationsBackend)
     classpath(fileTree(mpsHomeDir) {
         include("lib/**/*.jar")
     })
+    classpath(configurations.rerunMigrationsBackend)
     mainClass = 'de.itemis.mps.gradle.migrate.MainKt'
 
     for (dir in allProjectDirectories()) {
         args("--project=$dir")
     }
 
     args("--macro=mpsqa.home::${rootDir}")
+
+    // rerun-migrations needs its own jar added as a plugin
+    argumentProviders.add(new CommandLineArgumentProvider() {
+        @Override
+        Iterable<String> asArguments() {
+            def config = configurations.rerunMigrationsBackend
+
+            ["--plugin=de.itemis.mps.buildbackends.rerun-migrations::" +
+                     configurations.rerunMigrationsBackend.files(config.dependencies.first()).first()]
+        }
+    })
+
     args("--plugin=jetbrains.mps.console::mps-console")
     args("--plugin=jetbrains.mps.trove::mps-trove")
     args("--plugin=jetbrains.mps.ide.modelchecker::mps-modelchecker")

diff --git a/build/scripts/build_all_scripts.xml b/build/scripts/build_all_scripts.xml
@@ -64,8 +64,8 @@
     <echo message="generating" />
     <generate fork="true" logLevel="${mps.ant.log}">      
       <settings refid="m2m-defaults" />
-      <plugin path="${artifacts.mps}/plugins/mps-build" />
-      <plugin path="${artifacts.mps}/plugins/mps-core" />
+      <plugin path="${artifacts.mps}/plugins/mps-build" id="jetbrains.mps.build" />
+      <plugin path="${artifacts.mps}/plugins/mps-core" id="jetbrains.mps.core" />
       <library file="${artifacts.mps}/languages/baseLanguage/closures.runtime.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/collections.runtime.jar" />
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
@@ -85,7 +85,6 @@
       <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguageInternal.jar" />
       <library file="${artifacts.mps}/languages/editor/jetbrains.mps.editing.runtime.jar" />
       <library file="${artifacts.mps}/languages/editor/jetbrains.mps.editor.runtime.jar" />
-      <library file="${artifacts.mps}/languages/editor/jetbrains.mps.editorlang.runtime.jar" />
       <library file="${artifacts.mps}/languages/editor/jetbrains.mps.ide.editor.jar" />
       <library file="${artifacts.mps}/languages/editor/typesystemIntegration.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.baseLanguage.lightweightdsl.jar" />
@@ -98,6 +97,7 @@
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.constraints.rules.skeleton.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.context.defs.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.context.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.doc.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.dataFlow.jar" />
       <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
@@ -142,6 +142,7 @@
       <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.feedback.problem.legacy-constraints.jar" />
       <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.feedback.problem.rt.jar" />
       <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.migration.runtime.jar" />
+      <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.script.rt.jar" />
       <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.smodel.query.runtime.jar" />
       <library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.refactoring.runtime.jar" />
       <library file="${artifacts.mps}/languages/text/jetbrains.mps.lang.text.jar" />

diff --git a/code/languages/org.mpsqa.arch/.mps/inspectionProfiles/Project_Default.xml b/code/languages/org.mpsqa.arch/.mps/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="CheckDtdRefs" enabled="true" level="ERROR" enabled_by_default="true" />
+  </profile>
+</component>
diff --git a/code/languages/org.mpsqa.arch/.mps/migration.xml b/code/languages/org.mpsqa.arch/.mps/migration.xml
@@ -11,6 +11,7 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
-    <entry key="project.migrated.version" value="232" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_3.CleanStubForeignMethodIds" value="executed" />
+    <entry key="project.migrated.version" value="233" />
   </component>
 </project>
diff --git a/code/languages/org.mpsqa.base/.mps/migration.xml b/code/languages/org.mpsqa.base/.mps/migration.xml
@@ -11,6 +11,7 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
-    <entry key="project.migrated.version" value="232" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_3.CleanStubForeignMethodIds" value="executed" />
+    <entry key="project.migrated.version" value="233" />
   </component>
 </project>
diff --git a/code/languages/org.mpsqa.build/.mps/inspectionProfiles/Project_Default.xml b/code/languages/org.mpsqa.build/.mps/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="CheckDtdRefs" enabled="true" level="ERROR" enabled_by_default="true" />
+  </profile>
+</component>
diff --git a/code/languages/org.mpsqa.build/.mps/migration.xml b/code/languages/org.mpsqa.build/.mps/migration.xml
@@ -11,6 +11,7 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
-    <entry key="project.migrated.version" value="232" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_3.CleanStubForeignMethodIds" value="executed" />
+    <entry key="project.migrated.version" value="233" />
   </component>
 </project>
diff --git a/.../org.mpsqa.build/solutions/org.mpsqa.build.sandboxes/models/org.mpsqa.build.sandboxes.mps b/.../org.mpsqa.build/solutions/org.mpsqa.build.sandboxes/models/org.mpsqa.build.sandboxes.mps
@@ -8,7 +8,7 @@
   <imports>
     <import index="m9y5" ref="r:f769f949-59da-40a3-b1a7-86c225f998f5(org.mpsqa.build._050_unused_build)" />
     <import index="ffeo" ref="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)" />
-    <import index="2tou" ref="r:18bebd8f-6332-4ffd-b628-cc9dad4ef421(org.mpsqa.base.build)" />
+    <import index="2tou" ref="r:18bebd8f-6332-4ffd-b628-cc9dad4ef421(org.mpsqa.build._010_base_build)" />
   </imports>
   <registry>
     <language id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build">

diff --git a/...ages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._060_arch_build.mps b/...ages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._060_arch_build.mps
@@ -394,6 +394,25 @@
             <ref role="3bR37D" node="50Wzfz4shzn" resolve="org.mpsqa.arch" />
           </node>
         </node>
+        <node concept="1SiIV0" id="6ST145H7Ut5" role="3bR37C">
+          <node concept="1BurEX" id="6ST145H7Ut6" role="1SiIV1">
+            <node concept="398BVA" id="6ST145H7UsS" role="1BurEY">
+              <ref role="398BVh" node="50Wzfz4shz5" resolve="mpsqa.arch.home" />
+              <node concept="2Ry0Ak" id="6ST145H7UsT" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="6ST145H7UsU" role="2Ry0An">
+                  <property role="2Ry0Am" value="org.mpsqa.arch.pluginSolution" />
+                  <node concept="2Ry0Ak" id="6ST145H7UsV" role="2Ry0An">
+                    <property role="2Ry0Am" value="lib" />
+                    <node concept="2Ry0Ak" id="7PMJ7UztwOq" role="2Ry0An">
+                      <property role="2Ry0Am" value="plantuml-asl-1.2023.13.jar" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="1BupzO" id="50Wzfz4sh_E" role="3bR31x">
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
@@ -432,25 +451,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="6ST145H7Ut5" role="3bR37C">
-          <node concept="1BurEX" id="6ST145H7Ut6" role="1SiIV1">
-            <node concept="398BVA" id="6ST145H7UsS" role="1BurEY">
-              <ref role="398BVh" node="50Wzfz4shz5" resolve="mpsqa.arch.home" />
-              <node concept="2Ry0Ak" id="6ST145H7UsT" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="6ST145H7UsU" role="2Ry0An">
-                  <property role="2Ry0Am" value="org.mpsqa.arch.pluginSolution" />
-                  <node concept="2Ry0Ak" id="6ST145H7UsV" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="7PMJ7UztwOq" role="2Ry0An">
-                      <property role="2Ry0Am" value="plantuml-asl-1.2023.13.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
       </node>
     </node>
     <node concept="55IIr" id="50Wzfz4shza" role="auvoZ" />

diff --git a/.../org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._100_allInOne_build.mps b/.../org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._100_allInOne_build.mps
@@ -7,8 +7,8 @@
   </languages>
   <imports>
     <import index="ffeo" ref="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)" />
-    <import index="2tou" ref="r:18bebd8f-6332-4ffd-b628-cc9dad4ef421(org.mpsqa.base.build)" />
-    <import index="hx16" ref="r:b207e9c3-ef31-40d7-92fc-7e446d92ce2a(org.mpsqa.testing.build)" />
+    <import index="2tou" ref="r:18bebd8f-6332-4ffd-b628-cc9dad4ef421(org.mpsqa.build._010_base_build)" />
+    <import index="hx16" ref="r:b207e9c3-ef31-40d7-92fc-7e446d92ce2a(org.mpsqa.build._020_testing_build)" />
     <import index="5g2w" ref="r:eecfcc09-6fb4-4fd4-bb99-b3d1712ec5a4(org.mpsqa.build._030_clones_build)" />
     <import index="c8rw" ref="r:2377d435-973d-4687-839a-7353546ffa8d(org.mpsqa.build._040_mutant_build)" />
     <import index="m9y5" ref="r:f769f949-59da-40a3-b1a7-86c225f998f5(org.mpsqa.build._050_unused_build)" />
@@ -129,36 +129,6 @@
     <property role="TrG5h" value="org.mpsqa.allInOne" />
     <property role="2DA0ip" value="../../../../../build/scripts" />
     <property role="turDy" value="build-allInOne-package.xml" />
-    <node concept="m$_wf" id="fm3v0X36My" role="3989C9">
-      <property role="m$_wk" value="org.mpsqa.build" />
-      <node concept="3_J27D" id="fm3v0X36M$" role="m$_yQ">
-        <node concept="3Mxwew" id="fm3v0X36MW" role="3MwsjC">
-          <property role="3MwjfP" value="org.mpsqa.build" />
-        </node>
-      </node>
-      <node concept="3_J27D" id="fm3v0X36MA" role="m_cZH">
-        <node concept="3Mxwew" id="fm3v0X36MY" role="3MwsjC">
-          <property role="3MwjfP" value="org.mpsqa.build" />
-        </node>
-      </node>
-      <node concept="3_J27D" id="fm3v0X36MC" role="m$_w8">
-        <node concept="3Mxwew" id="fm3v0X36N0" role="3MwsjC">
-          <property role="3MwjfP" value="0.1" />
-        </node>
-      </node>
-      <node concept="m$_yC" id="fm3v0X36N4" role="m$_yJ">
-        <ref role="m$_y1" to="ffeo:5HVSRHdVm9a" resolve="jetbrains.mps.build" />
-      </node>
-      <node concept="m$_yC" id="32O483pJM7u" role="m$_yJ">
-        <ref role="m$_y1" to="2tou:32O483pJLpG" resolve="org.mpsqa.base.build" />
-      </node>
-      <node concept="m$_yC" id="3ALipV_2n6_" role="m$_yJ">
-        <ref role="m$_y1" to="hx16:2XCAdv5uaeq" resolve="org.mpsqa.testing.build" />
-      </node>
-      <node concept="m$_yB" id="fm3v0X36N2" role="m$_yh">
-        <ref role="m$_yA" node="5Xjjs0Nf2r4" resolve="org.mpsqa.build" />
-      </node>
-    </node>
     <node concept="2sgV4H" id="3PN66LDqBUy" role="1l3spa">
       <ref role="1l3spb" to="2tou:7C9PHv6FBIG" resolve="org.mpsqa.base" />
       <node concept="398BVA" id="32O483pN5Hx" role="2JcizS">
@@ -260,6 +230,36 @@
       </node>
     </node>
     <node concept="55IIr" id="3PN66LDqBUG" role="auvoZ" />
+    <node concept="m$_wf" id="fm3v0X36My" role="3989C9">
+      <property role="m$_wk" value="org.mpsqa.build" />
+      <node concept="3_J27D" id="fm3v0X36M$" role="m$_yQ">
+        <node concept="3Mxwew" id="fm3v0X36MW" role="3MwsjC">
+          <property role="3MwjfP" value="org.mpsqa.build" />
+        </node>
+      </node>
+      <node concept="3_J27D" id="fm3v0X36MA" role="m_cZH">
+        <node concept="3Mxwew" id="fm3v0X36MY" role="3MwsjC">
+          <property role="3MwjfP" value="org.mpsqa.build" />
+        </node>
+      </node>
+      <node concept="3_J27D" id="fm3v0X36MC" role="m$_w8">
+        <node concept="3Mxwew" id="fm3v0X36N0" role="3MwsjC">
+          <property role="3MwjfP" value="0.1" />
+        </node>
+      </node>
+      <node concept="m$_yB" id="fm3v0X36N2" role="m$_yh">
+        <ref role="m$_yA" node="5Xjjs0Nf2r4" resolve="org.mpsqa.build" />
+      </node>
+      <node concept="m$_yC" id="fm3v0X36N4" role="m$_yJ">
+        <ref role="m$_y1" to="ffeo:5HVSRHdVm9a" resolve="jetbrains.mps.build" />
+      </node>
+      <node concept="m$_yC" id="32O483pJM7u" role="m$_yJ">
+        <ref role="m$_y1" to="2tou:32O483pJLpG" resolve="org.mpsqa.base.build" />
+      </node>
+      <node concept="m$_yC" id="3ALipV_2n6_" role="m$_yJ">
+        <ref role="m$_y1" to="hx16:2XCAdv5uaeq" resolve="org.mpsqa.testing.build" />
+      </node>
+    </node>
     <node concept="1E1JtA" id="5Xjjs0Nf2r4" role="3989C9">
       <property role="TrG5h" value="org.mpsqa.build" />
       <property role="3LESm3" value="11d4368a-a7e8-4dd9-bfc6-c2de268d1994" />

diff --git a/code/languages/org.mpsqa.clones/.mps/inspectionProfiles/Project_Default.xml b/code/languages/org.mpsqa.clones/.mps/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="IncompleteProperty" enabled="true" level="ERROR" enabled_by_default="true" />
+  </profile>
+</component>
diff --git a/code/languages/org.mpsqa.clones/.mps/migration.xml b/code/languages/org.mpsqa.clones/.mps/migration.xml
@@ -11,6 +11,7 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
-    <entry key="project.migrated.version" value="232" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v_2023_3.CleanStubForeignMethodIds" value="executed" />
+    <entry key="project.migrated.version" value="233" />
   </component>
 </project>
diff --git a/...rg.mpsqa.clones/tests/org.mpsqa.clones.config.sandbox/org.mpsqa.clones.config.sandbox.msd b/...rg.mpsqa.clones/tests/org.mpsqa.clones.config.sandbox/org.mpsqa.clones.config.sandbox.msd
@@ -6,7 +6,7 @@
     </modelRoot>
   </models>
   <facets>
-    <facet compile="mps" classes="mps" ext="no" type="java">
+    <facet type="java" compile="mps" classes="mps" ext="no">
       <classes generated="true" path="${module}/classes_gen" />
     </facet>
   </facets>