Merge branch 'master' into merge/master

sergej-koscejev · web-flow · commit b311a8d246d5 · 2025-06-05T09:18:01.000+02:00
diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -52,6 +52,11 @@
       "matchPackageNames": ["com.jetbrains.jdk:*"],
       "matchBaseBranches": ["!/^master$/"],
       "enabled": false
+    },
+
+    {
+      "matchPackageNames" : ["net.sourceforge.plantuml:plantuml"],
+      "allowedVersions": "< 2000"
     }
   ]
 }
diff --git a/build.gradle b/build.gradle
@@ -6,11 +6,11 @@ plugins {
 }
 
 //MPS version
-ext.mpsMajor = "2025.1"
-ext.mpsBuild = "2025.1"
+ext.mpsMajor = "9999.9"
+ext.mpsBuild = "251.25410.10106"
 
 //MPS-extensions version
-ext.mpsExtensionsVersion = "2025.1.3271.ba313c2"
+ext.mpsExtensionsVersion = "9999.9.3272.46914d6-SNAPSHOT"
 
 ext.artifactsDir = new File(rootDir, 'artifacts')
 
diff --git a/subprojects/com.mbeddr/build.gradle b/subprojects/com.mbeddr/build.gradle
@@ -11,7 +11,9 @@ configurations {
 }
 
 dependencies {
-    mps "com.jetbrains:mps:$mpsBuild"
+    // For a release version of MPS, use this dependency:
+    //mps "com.jetbrains:mps:$mpsBuild"
+    mps "com.jetbrains.mps:mps-prerelease:$mpsBuild"
 }
 
 // path variables

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,11 @@`
`52`	`52`	`"matchPackageNames": ["com.jetbrains.jdk:*"],`
`53`	`53`	`"matchBaseBranches": ["!/^master$/"],`
`54`	`54`	`"enabled": false`
	`55`	`+ },`
	`56`	`+`
	`57`	`+ {`
	`58`	`+ "matchPackageNames" : ["net.sourceforge.plantuml:plantuml"],`
	`59`	`+ "allowedVersions": "< 2000"`
`55`	`60`	`}`
`56`	`61`	`]`
`57`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,9 @@ configurations {`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`dependencies {`
`14`		`- mps "com.jetbrains:mps:$mpsBuild"`
	`14`	`+ // For a release version of MPS, use this dependency:`
	`15`	`+ //mps "com.jetbrains:mps:$mpsBuild"`
	`16`	`+ mps "com.jetbrains.mps:mps-prerelease:$mpsBuild"`
`15`	`17`	`}`
`16`	`18`
`17`	`19`	`// path variables`