Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -33,4 +33,3 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
CI_COMMIT_SHA: ${{ github.sha }}
run: xvfb-run --auto-servernum ./gradlew githubRelease

3 changes: 2 additions & 1 deletion .mps/migration.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
<entry key="jetbrains.mps.ide.mpsmigration.v_2023_3.CleanStubForeignMethodIds" value="executed" />
<entry key="jetbrains.mps.ide.mpsmigration.v_2024_3.LangResourceImport4Migration" value="executed" />
<entry key="project.migrated.version" value="251" />
<entry key="jetbrains.mps.ide.mpsmigration.v_2026_1.UpdateConceptMethodCall" value="executed" />
<entry key="project.migrated.version" value="261" />
</component>
</project>
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ plugins {
}

downloadJbr {
jbrVersion = '21.0.6-b895.109'
jbrVersion = '25.0.3-b329.124'
}

def incrementalBuild = !project.hasProperty("disableIncrementalBuild")
Expand All @@ -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'
}

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
mbeddrCppVersion = 2025.1
mbeddrCppVersion = 2026.1
systemProp.org.gradle.internal.http.connectionTimeout=180000
systemProp.org.gradle.internal.http.socketTimeout=180000
6 changes: 3 additions & 3 deletions languages/com.mbeddr.cpp.base/com.mbeddr.cpp.base.mpl
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
<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:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="3" />
<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:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="1" />
<language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
<language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
<language slang="l:af65afd8-f0dd-4942-87d9-63a55f2a9db1:jetbrains.mps.lang.behavior" version="2" />
Expand All @@ -62,7 +62,7 @@
<language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
<language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
<language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
<language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="4" />
<language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
<language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
<language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
Expand Down
Loading
Loading