diff --git a/.github/workflows/PR-into-next-version.yml b/.github/workflows/PR-into-next-version.yml
new file mode 100644
index 000000000..0945cb9a4
--- /dev/null
+++ b/.github/workflows/PR-into-next-version.yml
@@ -0,0 +1,18 @@
+name: PR to merge into the next version
+
+on:
+ push:
+ branches:
+ - 'maintenance/MPS-*'
+
+jobs:
+ create-pr:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Create PR
+ uses: specificlanguages/cascading-merge@v2
+ with:
+ branch_prefix: maintenance/MPS-
+ merge_prefix: merge/MPS-
+ default_merge_prefix: merge/
+ token: ${{ secrets.MPS_CI_BUILD_BOT_ACCESS_TOKEN }}
diff --git a/build.gradle.kts b/build.gradle.kts
index 1e603d723..047d60ecc 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -15,7 +15,7 @@ plugins {
id("de.itemis.mps.gradle.common") version "1.20.+"
}
-val jbrVers = "17.0.6-b653.34"
+val jbrVers = "17.0.6-b469.82"
downloadJbr {
jbrVersion = jbrVers
@@ -41,7 +41,7 @@ val bugfix = "1"
fun appendOpt(str:String, pre:String) = if(!str.isEmpty()) "${pre}${str}" else ""
-val mpsVersion = "$major.$minor" + appendOpt(bugfix, ".")
+val mpsVersion = "2022.3" + appendOpt(bugfix, ".")
// Dependency versions
val platformVersion = "$major.$minor.+"
@@ -175,13 +175,26 @@ tasks {
destination = file("code/languages/com.mbeddr.formal.nusmv/.mps/libraries.xml")
}
+ // "com.fasten.safety.rcp.pluginSolution" makes use of the mbeddr actionsfilter plugin.
+ // The "actionsfilter" plugin and dependencies must be copied to "MPS\plugins" folder in order to load properly.
+ val copy_mbeddr_actionsfilter by registering(Copy::class) {
+ dependsOn(resolveLanguageLibs)
+ description="Installs 'com.mbeddr.mpsutil.actionsfilter' plugin and its dependencies into 'MPS\\plugins' directory."
+ from("$dependenciesDir/com.mbeddr.platform")
+ include("com.mbeddr.mpsutil.actionsfilter/",
+ "de.itemis.mps.editor.widgets/",
+ "de.slisson.mps.hacks/",
+ "de.itemis.mps.tooltips/")
+ into("$mpsHomeDir/plugins")
+ }
+
val setup by registering {
dependsOn(generateLibrariesXml)
description = "Set up MPS project libraries. Libraries are read in from projectlibraries.properties file."
}
val build_allScripts by registering(BuildLanguages::class) {
- dependsOn(resolveMps, resolveLanguageLibs)
+ dependsOn(resolveMps, resolveLanguageLibs, copy_mbeddr_actionsfilter)
script = "$buildDir/scripts/build_all_scripts.xml"
}
diff --git a/build/scripts/build_all_scripts.xml b/build/scripts/build_all_scripts.xml
index 67fd808cf..72716eadd 100644
--- a/build/scripts/build_all_scripts.xml
+++ b/build/scripts/build_all_scripts.xml
@@ -39,6 +39,7 @@
+
@@ -167,6 +168,7 @@
+
@@ -252,7 +254,6 @@
-
diff --git a/code/languages/com.fasten.symo/.mps/vcs.xml b/code/languages/com.fasten.symo/.mps/vcs.xml
index 3f84d8c4c..ea27c914f 100644
--- a/code/languages/com.fasten.symo/.mps/vcs.xml
+++ b/code/languages/com.fasten.symo/.mps/vcs.xml
@@ -1,6 +1,7 @@
+
\ No newline at end of file
diff --git a/code/languages/com.fasten.symo/solutions/com.fasten.symo.hw.sandbox/models/com.fasten.symo.hw.sandbox._010_simple_hw_architecture.mps b/code/languages/com.fasten.symo/solutions/com.fasten.symo.hw.sandbox/models/com.fasten.symo.hw.sandbox._010_simple_hw_architecture.mps
index ba5c068d9..bb96c00cb 100644
--- a/code/languages/com.fasten.symo/solutions/com.fasten.symo.hw.sandbox/models/com.fasten.symo.hw.sandbox._010_simple_hw_architecture.mps
+++ b/code/languages/com.fasten.symo/solutions/com.fasten.symo.hw.sandbox/models/com.fasten.symo.hw.sandbox._010_simple_hw_architecture.mps
@@ -89,12 +89,12 @@
-