diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 2f34093d56..0025249642 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -30,11 +30,11 @@ jobs:
steps:
- uses: actions/checkout@v5
- - name: Set up JDK 21
+ - name: Set up JDK 25
uses: actions/setup-java@v5
with:
distribution: temurin
- java-version: 21
+ java-version: 25
cache: gradle
- name: Install C++ build tools
run: sudo apt-get update && sudo apt-get install -y g++ make xvfb
diff --git a/.github/workflows/publish-maven.yml b/.github/workflows/publish-maven.yml
index 48ad1e8419..186ab4d58d 100644
--- a/.github/workflows/publish-maven.yml
+++ b/.github/workflows/publish-maven.yml
@@ -20,11 +20,11 @@ jobs:
steps:
- uses: actions/checkout@v5
- - name: Set up JDK 21
+ - name: Set up JDK 25
uses: actions/setup-java@v5
with:
distribution: temurin
- java-version: 21
+ java-version: 25
- name: Install C++ build tools
run: sudo apt-get update && sudo apt-get install -y g++ make xvfb
- name: Grant execute permission for gradlew
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3166f45820..52ff4b75b7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,11 +16,11 @@ jobs:
steps:
- uses: actions/checkout@v5
- - name: Set up JDK 21
+ - name: Set up JDK 25
uses: actions/setup-java@v5
with:
distribution: temurin
- java-version: 21
+ java-version: 25
- name: Install C++ build tools
run: sudo apt-get update && sudo apt-get install -y g++ make xvfb
- name: Grant execute permission for gradlew
@@ -33,4 +33,3 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
CI_COMMIT_SHA: ${{ github.sha }}
run: xvfb-run --auto-servernum ./gradlew githubRelease
-
diff --git a/.mps/migration.xml b/.mps/migration.xml
index 3cc82db888..5eac57d301 100644
--- a/.mps/migration.xml
+++ b/.mps/migration.xml
@@ -13,6 +13,7 @@
-
+
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 084ab867c9..21e8b616b3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,7 @@ plugins {
}
downloadJbr {
- jbrVersion = '21.0.6-b895.109'
+ jbrVersion = '25.0.3-b329.124'
}
def incrementalBuild = !project.hasProperty("disableIncrementalBuild")
@@ -41,9 +41,9 @@ configurations {
}
dependencies {
- mps "com.jetbrains:mps:2025.1.+"
- languageLibs "com.mbeddr:mbeddr:2025.1.+"
- languageLibs "de.itemis.mps:extensions:2025.1.+"
+ mps "com.jetbrains:mps:2026.1.+"
+ languageLibs "com.mbeddr:mbeddr:2026.1.+"
+ languageLibs "de.itemis.mps:extensions:2026.1.+"
junitAnt 'org.apache.ant:ant-junit:1.10.17'
}
diff --git a/gradle.properties b/gradle.properties
index 332af77402..bc54652c27 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
-mbeddrCppVersion = 2025.1
+mbeddrCppVersion = 2026.1
systemProp.org.gradle.internal.http.connectionTimeout=180000
systemProp.org.gradle.internal.http.socketTimeout=180000
diff --git a/languages/com.mbeddr.cpp.base/com.mbeddr.cpp.base.mpl b/languages/com.mbeddr.cpp.base/com.mbeddr.cpp.base.mpl
index 899f4e68a5..c26f59f287 100644
--- a/languages/com.mbeddr.cpp.base/com.mbeddr.cpp.base.mpl
+++ b/languages/com.mbeddr.cpp.base/com.mbeddr.cpp.base.mpl
@@ -35,10 +35,10 @@
-
+
-
+
@@ -62,7 +62,7 @@
-
+
diff --git a/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.behavior.mps b/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.behavior.mps
index 3b2e35b594..3f69f073b5 100644
--- a/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.behavior.mps
+++ b/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.behavior.mps
@@ -3,7 +3,7 @@
-
+
@@ -44,6 +44,7 @@
+
@@ -206,7 +207,6 @@
-
@@ -214,11 +214,8 @@
-
-
-
-
-
+
+
@@ -257,7 +254,6 @@
-
@@ -536,9 +532,54 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -630,13 +671,13 @@