diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ec30317b..041aa6bac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/e
### Fixed
- *de.itemis.mps.editor.diagram.runtime*: Diagrams can now be used in an headless environment (e.g. for rendering documentation).
+- *de.slisson.mps.editor.multiline.runtime*: A bug was fixed where the multiline cell got a wrong background color set.
- *de.itemis.mps.editor.diagram.runtime*: The dependency to *de.q60.mps.collections.libs* was removed.
## May 2024
diff --git a/README.md b/README.md
index 90b84187a..71e0f5c9f 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,8 @@
# MPS Extensions
-/statusIcon)
-
+/statusIcon)
+
+[](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
The MPS extensions aim to ease language development within MPS. They are maintained by itemis, JetBrains, and the open source community, and its development is closely aligned with the development of MPS.
diff --git a/build.allScripts/build.xml b/build.allScripts/build.xml
index 15ab94bc1..e3395046b 100644
--- a/build.allScripts/build.xml
+++ b/build.allScripts/build.xml
@@ -157,6 +157,7 @@
+
diff --git a/build.gradle b/build.gradle
index 16a6cc9c8..35506cc64 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ import java.time.LocalDateTime
apply plugin: 'download-jbr'
downloadJbr {
- jbrVersion = '17.0.6-b469.82'
+ jbrVersion = '17.0.6-b653.34'
}
// detect if we are in a CI build
@@ -41,9 +41,9 @@ logger.info 'Repository username: {}', project.nexusUsername
// Dependency versions
// major version, e.g. '2021.1', '2021.2'
-ext.mpsMajor = '2022.2'
+ext.mpsMajor = '2022.3'
// optional minor/bugfix number (not added to the final build version)
-ext.mpsMinor = '3'
+ext.mpsMinor = '1'
// e.g. Beta, EAP, RC
ext.mpsReleaseType = ''
@@ -234,7 +234,7 @@ ext.extensions_home = '-Dextensions.home=' + rootDir
// ___________________ utilities ___________________
File scriptFile(String relativePath) {
- new File("$rootDir/build/generated/$relativePath")
+ new File("$rootDir/build/patched/$relativePath")
}
def defaultScriptArgs = [mps_home, build_dir, artifacts_dir, ext.buildDate, ext.pluginVersion]
@@ -277,22 +277,37 @@ task resolved_diagram_dependencies(type: Copy) {
}
}
-task build_allScripts(type: BuildLanguages, dependsOn: [
- 'downloadJbr',
- resolveMps,
- resolved_diagram_dependencies,
- copyModelApi,
-]) {
+def build_allScripts_unpatched = tasks.register('build_allScripts_unpatched', BuildLanguages) {
+ dependsOn 'downloadJbr', resolveMps, copyModelApi, resolved_diagram_dependencies
script "$rootDir/scripts/build.xml"
}
+// Patch JNA path in generated build scripts until https://github.com/JetBrains/MPS/pull/71 is fixed
+def patch_allScripts = tasks.register('patch_allScripts', Copy) {
+ dependsOn build_allScripts_unpatched
+ from 'build/generated'
+ into 'build/patched'
+
+ def isAarch64 = System.getProperty('os.arch') == 'aarch64'
+ def jnaArch = isAarch64 ? 'aarch64' : 'amd64'
+
+ filter {
+ it.replace('"-Djna.boot.library.path=${artifacts.mps}/lib/jna"',
+ '"-Djna.boot.library.path=${artifacts.mps}/lib/jna/' + jnaArch + '"')
+ }
+}
+
+task build_allScripts {
+ dependsOn patch_allScripts
+}
+
task copyChangelog(type: Copy) {
from "$rootDir/code/solutions/de.itemis.mps.extensions.changelog/source_gen/de/itemis/mps/extensions/changelog"
into "$rootDir"
include "*.md"
}
-task build_languages(type: BuildLanguages, dependsOn: [build_allScripts, copyChangelog]) {
+task build_languages(type: BuildLanguages, dependsOn: [build_allScripts]) {
script scriptFile('languages/build.xml')
}
diff --git a/code/.mps/migration.xml b/code/.mps/migration.xml
index 345bfc32f..1710be715 100644
--- a/code/.mps/migration.xml
+++ b/code/.mps/migration.xml
@@ -8,6 +8,8 @@
-
+
+
+
\ No newline at end of file
diff --git a/code/apache-commons/solutions/org.apache.commons/org.apache.commons.msd b/code/apache-commons/solutions/org.apache.commons/org.apache.commons.msd
index 2ba17feb8..292568925 100644
--- a/code/apache-commons/solutions/org.apache.commons/org.apache.commons.msd
+++ b/code/apache-commons/solutions/org.apache.commons/org.apache.commons.msd
@@ -12,7 +12,7 @@
-
+
diff --git a/code/blutil/languages/com.mbeddr.mpsutil.blutil.genutil/com.mbeddr.mpsutil.blutil.genutil.mpl b/code/blutil/languages/com.mbeddr.mpsutil.blutil.genutil/com.mbeddr.mpsutil.blutil.genutil.mpl
index e7534a281..089020ccb 100644
--- a/code/blutil/languages/com.mbeddr.mpsutil.blutil.genutil/com.mbeddr.mpsutil.blutil.genutil.mpl
+++ b/code/blutil/languages/com.mbeddr.mpsutil.blutil.genutil/com.mbeddr.mpsutil.blutil.genutil.mpl
@@ -6,7 +6,7 @@
-
+
@@ -19,7 +19,7 @@
-
+
@@ -56,7 +56,6 @@
-
diff --git a/code/blutil/languages/com.mbeddr.mpsutil.blutil/blutil.mpl b/code/blutil/languages/com.mbeddr.mpsutil.blutil/blutil.mpl
index ca15ce16f..9cc4bc07c 100644
--- a/code/blutil/languages/com.mbeddr.mpsutil.blutil/blutil.mpl
+++ b/code/blutil/languages/com.mbeddr.mpsutil.blutil/blutil.mpl
@@ -6,7 +6,7 @@
-
+
@@ -19,7 +19,7 @@
-
+
@@ -40,6 +40,7 @@
+
@@ -53,7 +54,6 @@
-
@@ -64,8 +64,6 @@
-
-
@@ -74,12 +72,9 @@
-
-
-
diff --git a/code/blutil/languages/com.mbeddr.mpsutil.blutil/solutions/com.mbeddr.mpsutil.blutil.rt.msd b/code/blutil/languages/com.mbeddr.mpsutil.blutil/solutions/com.mbeddr.mpsutil.blutil.rt.msd
index 23aaeb456..df793d9ae 100644
--- a/code/blutil/languages/com.mbeddr.mpsutil.blutil/solutions/com.mbeddr.mpsutil.blutil.rt.msd
+++ b/code/blutil/languages/com.mbeddr.mpsutil.blutil/solutions/com.mbeddr.mpsutil.blutil.rt.msd
@@ -6,7 +6,7 @@
-
+
diff --git a/code/blutil/solutions/com.mbeddr.mpsutil.blutil.genutil.rt/com.mbeddr.mpsutil.blutil.genutil.rt.msd b/code/blutil/solutions/com.mbeddr.mpsutil.blutil.genutil.rt/com.mbeddr.mpsutil.blutil.genutil.rt.msd
index 297f9c4e9..9a7d289d1 100644
--- a/code/blutil/solutions/com.mbeddr.mpsutil.blutil.genutil.rt/com.mbeddr.mpsutil.blutil.genutil.rt.msd
+++ b/code/blutil/solutions/com.mbeddr.mpsutil.blutil.genutil.rt/com.mbeddr.mpsutil.blutil.genutil.rt.msd
@@ -6,7 +6,7 @@
-
+
diff --git a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/test.com.mbeddr.mpsutil.blutil.doc.msd b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/test.com.mbeddr.mpsutil.blutil.doc.msd
index 89acb4a40..b63684c97 100644
--- a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/test.com.mbeddr.mpsutil.blutil.doc.msd
+++ b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.doc/test.com.mbeddr.mpsutil.blutil.doc.msd
@@ -6,7 +6,7 @@
-
+
diff --git a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.genutil.lang/test.com.mbeddr.mpsutil.blutil.genutil.lang.mpl b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.genutil.lang/test.com.mbeddr.mpsutil.blutil.genutil.lang.mpl
index bc6dc535e..45b1a20c8 100644
--- a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.genutil.lang/test.com.mbeddr.mpsutil.blutil.genutil.lang.mpl
+++ b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.genutil.lang/test.com.mbeddr.mpsutil.blutil.genutil.lang.mpl
@@ -6,7 +6,7 @@
-
+
@@ -19,7 +19,7 @@
-
+
@@ -52,7 +52,6 @@
-
diff --git a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.genutil/test.com.mbeddr.mpsutil.blutil.genutil.msd b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.genutil/test.com.mbeddr.mpsutil.blutil.genutil.msd
index 394bef17a..23ac98aa5 100644
--- a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.genutil/test.com.mbeddr.mpsutil.blutil.genutil.msd
+++ b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil.genutil/test.com.mbeddr.mpsutil.blutil.genutil.msd
@@ -6,7 +6,7 @@
-
+
diff --git a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/test.com.mbeddr.mpsutil.blutil.msd b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/test.com.mbeddr.mpsutil.blutil.msd
index 734e8bb18..cb6beae50 100644
--- a/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/test.com.mbeddr.mpsutil.blutil.msd
+++ b/code/blutil/tests/test.com.mbeddr.mpsutil.blutil/test.com.mbeddr.mpsutil.blutil.msd
@@ -6,7 +6,7 @@
-
+
diff --git a/code/blutil/tests/test.ts.conceptswitch/test.ts.conceptswitch.msd b/code/blutil/tests/test.ts.conceptswitch/test.ts.conceptswitch.msd
index 2150576c1..ece202db8 100644
--- a/code/blutil/tests/test.ts.conceptswitch/test.ts.conceptswitch.msd
+++ b/code/blutil/tests/test.ts.conceptswitch/test.ts.conceptswitch.msd
@@ -6,7 +6,7 @@
-
+
diff --git a/code/blutil/tests/test.ts.match/match.msd b/code/blutil/tests/test.ts.match/match.msd
index fa336b49f..c3648cb67 100644
--- a/code/blutil/tests/test.ts.match/match.msd
+++ b/code/blutil/tests/test.ts.match/match.msd
@@ -6,7 +6,7 @@
-
+
diff --git a/code/build/solutions/allScripts/allScripts.msd b/code/build/solutions/allScripts/allScripts.msd
index 8f8c68dfc..9d2426793 100644
--- a/code/build/solutions/allScripts/allScripts.msd
+++ b/code/build/solutions/allScripts/allScripts.msd
@@ -6,7 +6,7 @@
-
+
diff --git a/code/build/solutions/de.itemis.mps.extensions.build/de.itemis.mps.extensions.build.msd b/code/build/solutions/de.itemis.mps.extensions.build/de.itemis.mps.extensions.build.msd
index 215edae8c..35437cb7d 100644
--- a/code/build/solutions/de.itemis.mps.extensions.build/de.itemis.mps.extensions.build.msd
+++ b/code/build/solutions/de.itemis.mps.extensions.build/de.itemis.mps.extensions.build.msd
@@ -6,7 +6,7 @@
-
+
diff --git a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
index 389738197..5068cb314 100644
--- a/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
+++ b/code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
@@ -14260,6 +14260,11 @@