Merge remote-tracking branch 'origin/merge/mps20243' into maintenance…

…/mps20243
mbeddr · Jan 14, 2025 · 390aeb0 · 390aeb0
2 parents 7147b4e + ee4f72d
commit 390aeb0
Show file tree

Hide file tree

Showing 27 changed files with 2,012 additions and 330 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). The project does _not_ follow
 Semantic Versioning and the changes are simply documented in reverse chronological order, grouped by calendar month.
 
+# January 2025
+
+## com.mbeddr.mpsutil
+
+### Fixed
+
+- The text generator output of `com.mbeddr.mpsutil.json` was improved and escaping of special characters was implemented. The output options and JSON parsing can now also be configured through the extension point `json` in the method JsonConfig#getFactory. For more information read: https://github.com/fasterxml/jackson-core/wiki/JsonFactory-Features, https://github.com/fasterxml/jackson-core/wiki/JsonGenerator-Features and https://github.com/fasterxml/jackson-core/wiki/JsonParser-Features.
+
 # December 2024
 
 ## com.mbeddr.core.base

diff --git a/build-logic/.gitignore b/build-logic/.gitignore
@@ -0,0 +1,3 @@
+/.gradle/
+/build/
+/.kotlin/
diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
@@ -0,0 +1,14 @@
+plugins {
+    `kotlin-dsl`
+}
+
+dependencies {
+    fun plugin(alias: Provider<PluginDependency>) = alias.map { "${it.pluginId}:${it.pluginId}.gradle.plugin:${it.version}" }
+    implementation(plugin(libs.plugins.common))
+    implementation(plugin(libs.plugins.jbr.toolchain))
+}
+
+repositories {
+    maven("https://artifacts.itemis.cloud/repository/maven-mps")
+    gradlePluginPortal()
+}
diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
@@ -0,0 +1,7 @@
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}
diff --git a/build-logic/src/main/kotlin/LazyString.kt b/build-logic/src/main/kotlin/LazyString.kt
@@ -0,0 +1,13 @@
+import org.gradle.api.provider.Provider
+import java.io.Serializable
+
+/**
+ * Allow using a Provider for properties that accept an Object and call toString() on it,
+ * such as [de.itemis.mps.gradle.RunAntScript.executable].
+ */
+class LazyString(private val source: Lazy<String>) : Serializable {
+    constructor(source: () -> String) : this(lazy(source))
+    constructor(source: Provider<String>) : this(source::get)
+
+    override fun toString() = source.value
+}
diff --git a/build-logic/src/main/kotlin/buildlogic.mps-conventions.gradle.kts b/build-logic/src/main/kotlin/buildlogic.mps-conventions.gradle.kts
@@ -0,0 +1,16 @@
+import de.itemis.mps.gradle.RunAntScript
+
+plugins {
+    id("com.specificlanguages.jbr-toolchain")
+    id("de.itemis.mps.gradle.common")
+}
+
+// Use the JBR dependency from the version catalog
+dependencies {
+    jbr(versionCatalogs.named("libs").findLibrary("jbr").get())
+}
+
+// Use the specified JBR for all RunAntScript tasks
+tasks.withType<RunAntScript>().configureEach {
+    executable = LazyString(jbrToolchain.javaLauncher.map { it.executablePath.toString() })
+}
diff --git a/build.gradle b/build.gradle
@@ -1,14 +1,8 @@
 import de.itemis.mps.gradle.GitBasedVersioning
-import de.itemis.mps.gradle.RunAntScript
 
 
 plugins {
     id 'de.itemis.mps.gradle.common' version '1.28.+'
-    id 'download-jbr' version '1.28.+'
-}
-
-downloadJbr {
-    jbrVersion = '21.0.5-b631.8'
 }
 
 //MPS version
@@ -22,10 +16,6 @@ ext.artifactsDir = new File(rootDir, 'artifacts')
 
 ext.ciBuild = project.hasProperty("forceCI") || project.hasProperty("teamcity")
 
-afterEvaluate {
-    ext["itemis.mps.gradle.ant.defaultJavaExecutable"] = tasks.getByName('downloadJbr').javaExecutable
-}
-
 def hasNonEmptyProperty(property) {
     return project.hasProperty(property) && !project.getProperty(property).empty
 }
@@ -85,13 +75,16 @@ subprojects {
         // TODO: not clear why this has been added - makes local builds from any branch to behave like a master build
         //ext.mbeddrBuild = "master"
     }
+
+    // Enable mbeddr to be assigned a different version number than mbeddr platform,
+    // as well as mbeddr to be built against a specified existing mbeddr platform version
     ext.mbeddrPlatformBuildNumber = findNonEmptyProperty('mbeddrPlatformVersion') ?: mbeddrBuildNumber
+
     if (ciBuild) {
         // Coerce TeamCity build number to mbeddrBuildNumber by default
         // (see https://octopus.com/blog/teamcity-version-numbers-based-on-branches for details)
         println "##teamcity[buildNumber '${mbeddrBuildNumber}']"
     } else {
         println "Local build detected. mbeddr version $ext.mbeddrBuildNumber, mbeddr platform version $ext.mbeddrPlatformBuildNumber"
     }
-    tasks.withType(RunAntScript).configureEach(task -> { task.dependsOn(':downloadJbr') })
- }
+}
diff --git a/...uild/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps b/...uild/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps
@@ -455,11 +455,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="75qFqB43eJz" role="3bR37C">
-          <node concept="3bR9La" id="75qFqB43eJ$" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="75qFqB43eJ_" role="3bR37C">
           <node concept="3bR9La" id="75qFqB43eJA" role="1SiIV1">
             <ref role="3bR37D" to="al5i:6o5cjw5gEyi" resolve="com.mbeddr.mpsutil.json" />
@@ -524,6 +519,16 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="3PmL$ALj5Nt" role="3bR37C">
+          <node concept="3bR9La" id="3PmL$ALj5Nu" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="3PmL$ALj5Nv" role="3bR37C">
+          <node concept="3bR9La" id="3PmL$ALj5Nw" role="1SiIV1">
+            <ref role="3bR37D" to="90a9:3$A0JaN5bpX" resolve="MPS.ThirdParty" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="4BxzwLdy2a8" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -1560,16 +1565,17 @@
             <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
           </node>
         </node>
-        <node concept="1SiIV0" id="bHMJKhDDf7" role="3bR37C">
-          <node concept="3bR9La" id="bHMJKhDDf8" role="1SiIV1">
-            <ref role="3bR37D" to="al5i:776vT$mQZbf" resolve="com.mbeddr.mpsutil.comparator" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="bHMJKhDDf9" role="3bR37C">
           <node concept="3bR9La" id="bHMJKhDDfa" role="1SiIV1">
             <ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
           </node>
         </node>
+        <node concept="1SiIV0" id="2SeJqc6Ohp2" role="3bR37C">
+          <node concept="3bR9La" id="2SeJqc6Ohp3" role="1SiIV1">
+            <property role="3bR36h" value="true" />
+            <ref role="3bR37D" to="al5i:776vT$mQZbf" resolve="com.mbeddr.mpsutil.comparator" />
+          </node>
+        </node>
         <node concept="398BVA" id="bHMJKhDAXY" role="3LF7KH">
           <ref role="398BVh" node="7hVsScEQJ6E" resolve="mbeddr.mpsutil" />
           <node concept="2Ry0Ak" id="bHMJKhDAYF" role="iGT6I">
@@ -1620,21 +1626,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="bHMJKhDDfb" role="3bR37C">
-          <node concept="3bR9La" id="bHMJKhDDfc" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6L9O" resolve="jetbrains.mps.lang.smodel" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="bHMJKhDDfd" role="3bR37C">
-          <node concept="3bR9La" id="bHMJKhDDfe" role="1SiIV1">
-            <ref role="3bR37D" to="al5i:vOGyTeKPEA" resolve="com.mbeddr.mpsutil.ecore.testing" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="bHMJKhDDff" role="3bR37C">
-          <node concept="3bR9La" id="bHMJKhDDfg" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:7Kfy9QB6LaO" resolve="jetbrains.mps.lang.structure" />
-          </node>
-        </node>
       </node>
       <node concept="1E1JtD" id="4JHJliM0jp_" role="2G$12L">
         <property role="BnDLt" value="true" />

diff --git a/....core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps b/....core.base/solutions/pluginSolution/models/com/mbeddr/core/base/pluginSolution/plugin.mps
@@ -21161,7 +21161,7 @@
                 <property role="TrG5h" value="entry" />
               </node>
               <node concept="37vLTw" id="1TN3KbKd26H" role="2GsD0m">
-                <ref role="3cqZAo" node="1TN3KbKdfe_" resolve="map" />
+                <ref role="3cqZAo" node="1TN3KbKdfe_" resolve="modelMap" />
               </node>
               <node concept="3clFbS" id="1TN3KbKcXzk" role="2LFqv$">
                 <node concept="3clFbF" id="26a4BNiQNhF" role="3cqZAp">
@@ -21183,7 +21183,7 @@
                         <node concept="2GrUjf" id="1TN3KbKd74X" role="2Oq$k0">
                           <ref role="2Gs0qQ" node="1TN3KbKcXzg" resolve="entry" />
                         </node>
-                        <node concept="3AV6Ez" id="1TN3KbKefFZ" role="2OqNvi" />
+                        <node concept="3AV6Ez" id="6E9H6NYYY7h" role="2OqNvi" />
                       </node>
                       <node concept="2ShNRf" id="26a4BNiQNhQ" role="37wK5m">
                         <node concept="1pGfFk" id="26a4BNiQNhR" role="2ShVmc">

diff --git a/....core.util/solutions/pluginSolution/models/com/mbeddr/core/util/pluginSolution/plugin.mps b/....core.util/solutions/pluginSolution/models/com/mbeddr/core/util/pluginSolution/plugin.mps
@@ -100,7 +100,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>
@@ -138,7 +138,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="1095950406618" name="jetbrains.mps.baseLanguage.structure.DivExpression" flags="nn" index="FJ1c_" />
@@ -263,7 +263,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>
@@ -294,7 +294,7 @@
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
-      <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="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
@@ -408,7 +408,7 @@
       <concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp">
         <reference id="1218736638915" name="classifier" index="32nkFo" />
       </concept>
-      <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>
@@ -484,7 +484,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <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="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
@@ -507,7 +507,7 @@
       <concept id="8018258162245748350" name="com.mbeddr.mpsutil.smodule.structure.AddSolutionOperation" flags="ng" index="29j_kI">
         <child id="8018258162245748891" name="name" index="29j_Jb" />
       </concept>
-      <concept id="8018258162245800709" name="com.mbeddr.mpsutil.smodule.structure.SolutionType" flags="ig" index="29jK1l" />
+      <concept id="8018258162245800709" name="com.mbeddr.mpsutil.smodule.structure.SolutionType" flags="ng" index="29jK1l" />
       <concept id="386247815699362375" name="com.mbeddr.mpsutil.smodule.structure.SingleFilePersistence" flags="ng" index="2fmWwg" />
       <concept id="3692959419668441282" name="com.mbeddr.mpsutil.smodule.structure.AddModelOperation" flags="ng" index="2o1iZ4">
         <child id="9193920352840482545" name="storageType" index="bRicC" />

diff --git a/...anguages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/com.mbeddr.mpsutil.json.mpl b/...anguages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/com.mbeddr.mpsutil.json.mpl
@@ -20,14 +20,17 @@
     <dependency reexport="true">39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty)</dependency>
   </dependencies>
   <languageVersions>
+    <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
     <language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="2" />
     <language slang="l:b4f35ed8-45af-4efa-abe4-00ac26956e69:com.mbeddr.mpsutil.grammarcells.runtimelang" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
     <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: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:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
@@ -42,6 +45,7 @@
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:f4ad079d-bc71-4ffb-9600-9328705cf998:jetbrains.mps.lang.descriptor" version="0" />
     <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
+    <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:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />