Merge branch 'master' into merge/master

Author: sergej-koscejev

.github/renovate.json5

@@ -4,15 +4,101 @@
     "config:best-practices"
   ],
 
+  // Renovate master and recent maintenance branches. When updating the maintenance branch pattern, update the rule
+  // for dashboard approvals for all but the earliest maintenance branch.
+  "baseBranchPatterns": ["master", "/^maintenance/mps202[4-9][0-9]/"],
+
   "packageRules": [
     {
       "matchPackageNames": ["download-jbr:download-jbr.gradle.plugin", "de.itemis.mps.gradle.common:de.itemis.mps.gradle.common.gradle.plugin"],
       "groupName": "mps-gradle-plugin",
       "allowedVersions": "< 2.0"
     },
+
+    {
+      "matchPackageNames": [ "com.google.guava:guava" ],
+      "allowedVersions": "/^.*-jre$/"
+    },
+
+    {
+      // Allow 'unstable' versions for itemis Gradle plugins. Gradle versioning treats commit hashes with 'a' or 'b' as
+      // pre-releases but they are stable versions.
+      "matchPackageNames": ["de.itemis.mps*"],
+      "ignoreUnstable": false,
+    },
+
+    {
+      // MPS: separate minor and patch updates in order to disable minor but leave patch updates enabled
+      "matchPackageNames": ["com.jetbrains:mps"],
+      "separateMinorPatch": true,
+    },
+
+    {
+      // MPS: disable major and minor updates, only enable patch updates
+      "matchPackageNames": ["com.jetbrains:mps"],
+      "matchUpdateTypes": ["major", "minor"],
+      "enabled": false
+    },
+
+    {
+      // MPS: merge PRs on Wednesday morning
+      "matchPackageNames": ["com.jetbrains:mps"],
+      "automerge": true,
+      "platformAutomerge": false,
+      "automergeSchedule": "* 4-6 * * 3"
+    },
+
+    {
+      // Disable JBR updates on maintenance branches
+      "matchPackageNames": ["com.jetbrains.jdk:*"],
+      "matchBaseBranches": ["!master"],
+      "enabled": false
+    },
+
+    {
+      // Disable Python updates on maintenance branches
+      "matchManagers": "pip_requirements",
+      "matchBaseBranches": ["!master"],
+      "enabled": false,
+    },
+
+    {
+      // Disable modelix model-api upgrades (until we get rid of the dependency)
+      "matchPackageNames": ["org.modelix:model-api"],
+      "enabled": false
+    },
+
     {
       "matchPackageNames": ["org.eclipse*"],
       "groupName": "eclipse"
     },
+
+    {
+      "matchPackageNames": ["com.miglayout*"],
+      "groupName": "miglayout"
+    },
+
+    {
+      // Group all minor/patch third-party dependencies together (overrides the grouping above for minor and patch updates)
+      "matchManagers": ["gradle"],
+      "matchDepTypes": ["dependencies"], // Exclude plugins
+      "matchPackageNames": ["!com.jetbrains*"], // Exclude MPS and JBR
+      "matchUpdateTypes": ["minor", "patch"],
+      "groupName": "third-party-minor",
+    },
+
+    {
+      // Schedule dependency updates once a month
+      "matchJsonata": ["(manager = 'pip_requirements') or (depType = 'dependencies')"],
+      "schedule": "* 0-3 1 * *" // Only check for new versions once a month on the 1st, before 4 AM.
+    },
+
+    // Updates to all maintenance branches except the earliest one need approval. Updates to mps-prerelease are
+    // an exception because we want to see those right away.
+    {
+      "matchBaseBranches": ["!maintenance/mps20241"],
+      "matchPackageNames": ["!com.jetbrains.mps:mps-prerelease"],
+      "dependencyDashboardApproval": true
+    }
   ]
 }

CHANGELOG.md

@@ -49,6 +49,14 @@ The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/e
 
 - *de.itemis.mps.extensions.build* The version number property was renamed from `versionNumber` to `version`.
 
+### Removed
+
+- MPS.ThirdParty has been removed completely. MPS.IDEA or MPS.IDEA.Modules to be used instead. 
+
+### Deprecated
+
+- MPS.Kotlin is deprecated.
+
 ## September 2025
 
 ### Added
@@ -177,7 +185,7 @@ The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/e
 
 ### Changed
 
-- combine multiple elements without spaces  Reduced from Errors to Warning checks that force policies for all concepts in a language. In this way one can prototype with small set of merge policies. Use Partial police flag in your MergingPolicy to deactivate runtime checks as well.
+- '''combine multiple elements without spaces'''  Reduced from Errors to Warning checks that force policies for all concepts in a language. In this way one can prototype with small set of merge policies. Use Partial police flag in your MergingPolicy to deactivate runtime checks as well.
 
 ### Added
 

build.gradle.kts

@@ -32,7 +32,7 @@ val ciBuild = project.hasProperty("forceCI") ||
 val mpsVersion = libs.mps.get().version!!
 
 // major version, e.g. '2021.1', '2021.2'
-val mpsMajor = mpsVersion.substring(0, 6) // 2024.1.x-RCy -> 2024.1
+val mpsMajor = "9999.9"
 
 if (ciBuild) {
     val branch = GitBasedVersioning.getGitBranch()
@@ -439,6 +439,8 @@ tasks.register<Remigrate>("remigrate") {
 
     // diagram migration from version 0 is currently not rerunnable, although it claims to be
     excludeModuleMigration("de.itemis.mps.editor.diagram", 0)
+    // not rerunnable until MPS-39315 is fixed
+    excludeModuleMigration("jetbrains.mps.baseLanguage.javadoc", 0)
 }
 
 val generateChangelog by tasks.registering(MpsGenerate::class) {

code/.mps/migration.xml

@@ -14,6 +14,6 @@
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2023_3.CleanStubForeignMethodIds" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v_2024_3.LangResourceImport4Migration" value="executed" />
-    <entry key="project.migrated.version" value="251" />
+    <entry key="project.migrated.version" value="253" />
   </component>
 </project>

code/.mps/modules.xml

@@ -118,7 +118,6 @@
       <modulePath path="$PROJECT_DIR$/modellisteners/com.mbeddr.mpsutil.modellisteners.sandbox/com.mbeddr.mpsutil.modellisteners.sandbox.msd" folder="modellisteners" />
       <modulePath path="$PROJECT_DIR$/modellisteners/com.mbeddr.mpsutil.modellisteners.sandboxlang/com.mbeddr.mpsutil.modellisteners.sandboxlang.mpl" folder="modellisteners" />
       <modulePath path="$PROJECT_DIR$/modellisteners/com.mbeddr.mpsutil.modellisteners/com.mbeddr.mpsutil.modellisteners.mpl" folder="modellisteners" />
-      <modulePath path="$PROJECT_DIR$/modellisteners/test.com.mbeddr.mpsutil.modellisteners/test.com.mbeddr.mpsutil.modellisteners.msd" folder="modellisteners" />
       <modulePath path="$PROJECT_DIR$/modelmerger/languages/de.itemis.mps.modelmerger/de.itemis.mps.modelmerger.mpl" folder="modelmerger_deprecated" />
       <modulePath path="$PROJECT_DIR$/modelmerger/languages/de.itemis.mps.modelmerger/sandbox/de.itemis.mps.modelmerger.testhelper.msd" folder="modelmerger_deprecated" />
       <modulePath path="$PROJECT_DIR$/modelmerger/languages/test.de.itemis.mps.modelmerger.testlanguage/test.de.itemis.mps.modelmerger.testlanguage.mpl" folder="modelmerger.test.language" />
@@ -230,8 +229,6 @@
       <modulePath path="$PROJECT_DIR$/testing/languages/nl.f1re.testing/nl.f1re.testing.mpl" folder="testing" />
       <modulePath path="$PROJECT_DIR$/testing/solutions/nl.f1re.testing.examples/nl.f1re.testing.examples.msd" folder="testing" />
       <modulePath path="$PROJECT_DIR$/testing/solutions/nl.f1re.testing.runtime/nl.f1re.testing.runtime.msd" folder="testing" />
-      <modulePath path="$PROJECT_DIR$/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd" folder="3rd-party" />
-      <modulePath path="$PROJECT_DIR$/third-party/solutions/third.party.usage.test/third.party.usage.test.msd" folder="3rd-party" />
       <modulePath path="$PROJECT_DIR$/tooltips/solutions/de.itemis.mps.tooltips.runtime/de.itemis.mps.tooltips.runtime.msd" folder="tooltips" />
       <modulePath path="$PROJECT_DIR$/treenotation/com.mbeddr.mpsutil.treenotation.runtime/com.mbeddr.mpsutil.treenotation.runtime.msd" folder="treenotation" />
       <modulePath path="$PROJECT_DIR$/treenotation/com.mbeddr.mpsutil.treenotation.sandbox/com.mbeddr.mpsutil.treenotation.sandbox.msd" folder="treenotation" />

code/alias-customization/languages/test.nl.f1re.mps.aliascustomization.demolang/models/test.nl.f1re.mps.aliascustomization.demolang.plugin.mps

@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:f7e6b5a4-d821-40cc-be56-7edd61c4a361(test.nl.f1re.mps.aliascustomization.demolang.plugin)">
+<model ref="r:16e0e06f-9e0b-4c67-b1e0-b7bdb58a8945(de.slisson.mps.conditionalEditor.demolang.plugin)">
   <persistence version="9" />
+  <attribute name="doNotGenerate" value="false" />
   <languages>
     <use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="2" />
     <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
-    <import index="94uq" ref="r:4aa258f9-2a58-4453-8509-17aa4bd105d2(nl.f1re.mps.aliascustomization.plugin)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
+    <import index="94uq" ref="r:4aa258f9-2a58-4453-8509-17aa4bd105d2(nl.f1re.mps.aliascustomization.plugin)" />
     <import index="90d" ref="r:421d64ed-8024-497f-aeab-8bddeb389dd2(jetbrains.mps.lang.extension.methods)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="hx4v" ref="r:143d8fbb-9206-40d4-9eea-833943255ba9(test.nl.f1re.mps.aliascustomization.demolang.structure)" implicit="true" />

code/alias-customization/languages/test.nl.f1re.mps.aliascustomization.demolang/test.nl.f1re.mps.aliascustomization.demolang.mpl

@@ -19,7 +19,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
     <language slang="l:c7d5b9dd-a05f-4be2-bc73-f2e16994cc67:jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -30,7 +30,7 @@
     <language slang="l:c0080a47-7e37-4558-bee9-9ae18e690549:jetbrains.mps.lang.extension" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
-    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
+    <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="4" />
     <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:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />