Skip to content

Merge maintenance/MPS-2025.1 into master #371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 25 commits into
base: master
Choose a base branch
from
Open

Merge maintenance/MPS-2025.1 into master #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
872313b
added jetbrains.mps.junit5 and jetbrains.mps.testing as depedency to …
btakim Jun 10, 2025
a42e2ce
added jetbrains.mps.trove and jetbrains.mps.editor.tooltips to variou…
btakim Jun 10, 2025
440462c
modified models_with_non_devkits_as_used_languages to have whitelist …
btakim Jun 11, 2025
7760804
added https://artifacts.itemis.cloud/repository/maven-mps/ to plugin …
btakim Jun 11, 2025
8cc1bf8
force-save-all + migrate
btakim Jun 11, 2025
1bfab90
move to MPS bugfix release 2024.1.4
btakim Jun 11, 2025
c819037
Revert "modified models_with_non_devkits_as_used_languages to have wh…
btakim Jun 11, 2025
76bd277
Reverted settings.gradle changes
btakim Jun 12, 2025
5b4187f
Merge pull request #359 from mbeddr/feature/migrate_to_MPS_2024_1_4
sergej-koscejev Jun 12, 2025
11da9fc
Merge branch 'maintenance/MPS-2024.3' into merge/MPS-2024.3
sergej-koscejev Jun 12, 2025
b28fde3
Merge pull request #360 from mbeddr/merge/MPS-2024.3
mps-ci-buildbot Jun 12, 2025
ab284d4
bugfix/fix models_in_same_project_with_same_IDs linter, add a linter …
danielratiu Aug 12, 2025
96d9414
Merge pull request #366 from mbeddr/merge/MPS-2024.3
mps-ci-buildbot Aug 12, 2025
a456f46
lint: mini fix of the linter models_in_same_project_with_same_IDs to …
danielratiu Aug 12, 2025
0e8647b
Merge pull request #369 from mbeddr/merge/MPS-2024.3
mps-ci-buildbot Aug 12, 2025
da078b6
Merge remote-tracking branch 'origin/merge/MPS-2025.1' into maintenan…
Aug 26, 2025
10cb47a
Merge pull request #361 from mbeddr/merge/MPS-2025.1
mps-ci-buildbot Aug 26, 2025
3218ad8
build: convert to Kotlin (#374)
sergej-koscejev Sep 18, 2025
cc0c0f9
Merge remote-tracking branch 'origin/merge/MPS-2024.3' into maintenan…
sergej-koscejev Sep 24, 2025
581a51b
Merge pull request #376 from mbeddr/merge/MPS-2024.3
mps-ci-buildbot Sep 24, 2025
41c8a5a
Merge remote-tracking branch 'origin/merge/MPS-2025.1' into maintenan…
sergej-koscejev Sep 24, 2025
0e41c34
Merge pull request #379 from mbeddr/merge/MPS-2025.1
mps-ci-buildbot Sep 24, 2025
2f6b75d
lint: stable error messages for linter modules in same project with s…
danielratiu Sep 25, 2025
cc8ceaf
Merge pull request #381 from mbeddr/merge/MPS-2024.3
mps-ci-buildbot Sep 25, 2025
e0963c6
Merge pull request #382 from mbeddr/merge/MPS-2025.1
mps-ci-buildbot Sep 25, 2025
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
437 changes: 0 additions & 437 deletions build.gradle
View file
Open in desktop

This file was deleted.

448 changes: 448 additions & 0 deletions build.gradle.kts
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions ...es/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._040_mutant_build.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,9 @@
<node concept="m$_yC" id="3PN66LDqBZ8" role="m$_yJ">
<ref role="m$_y1" to="2tou:7C9PHv6FBIO" resolve="org.mpsqa.base" />
</node>
<node concept="m$_yC" id="22xRGj_xpyr" role="m$_yJ">
<ref role="m$_y1" to="ffeo:4O0hKJpmtq1" resolve="jetbrains.mps.trove" />
</node>
<node concept="3_J27D" id="3PN66LDqBZ9" role="m_cZH">
<node concept="3Mxwew" id="3PN66LDqBZl" role="3MwsjC">
<property role="3MwjfP" value="org.mpsqa.mutant" />
Expand Down
6 changes: 6 additions & 0 deletions ...es/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._050_unused_build.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,12 @@
<node concept="m$_yC" id="1YSnQiVh0xn" role="m$_yJ">
<ref role="m$_y1" to="2tou:7C9PHv6FBIO" resolve="org.mpsqa.base" />
</node>
<node concept="m$_yC" id="22xRGj_xpys" role="m$_yJ">
<ref role="m$_y1" to="ffeo:6Hpa5co69BH" resolve="jetbrains.mps.editor.tooltips" />
</node>
<node concept="m$_yC" id="22xRGj_xujh" role="m$_yJ">
<ref role="m$_y1" to="ffeo:4O0hKJpmtq1" resolve="jetbrains.mps.trove" />
</node>
<node concept="3_J27D" id="1YSnQiVh0xo" role="m_cZH">
<node concept="3Mxwew" id="1YSnQiVh0xz" role="3MwsjC">
<property role="3MwjfP" value="org.mpsqa.unused" />
Expand Down
5 changes: 4 additions & 1 deletion ...ages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._060_arch_build.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,10 @@
<node concept="m$_yC" id="7DAiGQdnG_C" role="m$_yJ">
<ref role="m$_y1" to="ffeo:5HVSRHdVm9a" resolve="jetbrains.mps.build" />
</node>
<node concept="m$_yC" id="4UYQrPl1MZe" role="m$_yJ">
<node concept="m$_yC" id="22xRGj_xpyE" role="m$_yJ">
<ref role="m$_y1" to="ffeo:4O0hKJpmtq1" resolve="jetbrains.mps.trove" />
</node>
<node concept="m$_yC" id="22xRGj_xzB8" role="m$_yJ">
<ref role="m$_y1" to="ffeo:6Hpa5co69BH" resolve="jetbrains.mps.editor.tooltips" />
</node>
</node>
Expand Down
3 changes: 3 additions & 0 deletions ...s/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._090_profile_build.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,9 @@
<node concept="m$_yC" id="6ueixcLDsQA" role="m$_yJ">
<ref role="m$_y1" to="ffeo:4k71ibbLe59" resolve="com.intellij.modules.mps" />
</node>
<node concept="m$_yC" id="22xRGj_xEd9" role="m$_yJ">
<ref role="m$_y1" to="ffeo:4O0hKJpmtq1" resolve="jetbrains.mps.trove" />
</node>
<node concept="3_J27D" id="6Z3QA_yyZNb" role="m_cZH">
<node concept="3Mxwew" id="6Z3QA_yyZNm" role="3MwsjC">
<property role="3MwjfP" value="org.mpsqa.profile" />
Expand Down
249 changes: 249 additions & 0 deletions ...mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.meta.mps
View file
Open in desktop

Large diffs are not rendered by default.

193 changes: 182 additions & 11 deletions ...sqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.models.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1867,6 +1867,165 @@
</node>
</node>
<node concept="3clFbS" id="3jiJ$OUE9Dt" role="3clFbx">
<node concept="3cpWs8" id="2Wh5DQ1xT1n" role="3cqZAp">
<node concept="3cpWsn" id="2Wh5DQ1xT1o" role="3cpWs9">
<property role="TrG5h" value="path1" />
<node concept="17QB3L" id="2Wh5DQ1xU$1" role="1tU5fm" />
<node concept="3cpWs3" id="2Wh5DQ1yRp1" role="33vP2m">
<node concept="Xl_RD" id="2Wh5DQ1yS$$" role="3uHU7B">
<property role="Xl_RC" value="PROJECT_DIR" />
</node>
<node concept="2OqwBi" id="2Wh5DQ1y67i" role="3uHU7w">
<node concept="2OqwBi" id="2Wh5DQ1y1qr" role="2Oq$k0">
<node concept="2GrUjf" id="2Wh5DQ1xT1p" role="2Oq$k0">
<ref role="2Gs0qQ" node="61xqYhG05ur" resolve="modelFile" />
</node>
<node concept="liA8E" id="2Wh5DQ1y4qy" role="2OqNvi">
<ref role="37wK5l" to="guwi:~File.getAbsolutePath()" resolve="getAbsolutePath" />
</node>
</node>
<node concept="liA8E" id="2Wh5DQ1y9yD" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.substring(int)" resolve="substring" />
<node concept="2OqwBi" id="2Wh5DQ1yi40" role="37wK5m">
<node concept="2OqwBi" id="2Wh5DQ1ydpC" role="2Oq$k0">
<node concept="37vLTw" id="2Wh5DQ1ybb7" role="2Oq$k0">
<ref role="3cqZAo" node="3$9W3co3cMq" resolve="projectDir" />
</node>
<node concept="liA8E" id="2Wh5DQ1yfvC" role="2OqNvi">
<ref role="37wK5l" to="guwi:~File.getAbsolutePath()" resolve="getAbsolutePath" />
</node>
</node>
<node concept="liA8E" id="2Wh5DQ1yjCb" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3cpWs8" id="2Wh5DQ1yl7W" role="3cqZAp">
<node concept="3cpWsn" id="2Wh5DQ1yl7X" role="3cpWs9">
<property role="TrG5h" value="path2" />
<node concept="17QB3L" id="2Wh5DQ1yl7Y" role="1tU5fm" />
<node concept="3cpWs3" id="2Wh5DQ1yXSO" role="33vP2m">
<node concept="2OqwBi" id="2Wh5DQ1yl7Z" role="3uHU7w">
<node concept="2OqwBi" id="2Wh5DQ1yl80" role="2Oq$k0">
<node concept="liA8E" id="2Wh5DQ1yl82" role="2OqNvi">
<ref role="37wK5l" to="guwi:~File.getAbsolutePath()" resolve="getAbsolutePath" />
</node>
<node concept="3EllGN" id="2Wh5DQ1ynZo" role="2Oq$k0">
<node concept="37vLTw" id="2Wh5DQ1ynZp" role="3ElVtu">
<ref role="3cqZAo" node="3jiJ$OUEe4u" resolve="currentModelId" />
</node>
<node concept="37vLTw" id="2Wh5DQ1ynZq" role="3ElQJh">
<ref role="3cqZAo" node="3jiJ$OUBO$F" resolve="alreadyCollectedIDs2ModelFiles" />
</node>
</node>
</node>
<node concept="liA8E" id="2Wh5DQ1yl83" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.substring(int)" resolve="substring" />
<node concept="2OqwBi" id="2Wh5DQ1yl84" role="37wK5m">
<node concept="2OqwBi" id="2Wh5DQ1yl85" role="2Oq$k0">
<node concept="37vLTw" id="2Wh5DQ1yl86" role="2Oq$k0">
<ref role="3cqZAo" node="3$9W3co3cMq" resolve="projectDir" />
</node>
<node concept="liA8E" id="2Wh5DQ1yl87" role="2OqNvi">
<ref role="37wK5l" to="guwi:~File.getAbsolutePath()" resolve="getAbsolutePath" />
</node>
</node>
<node concept="liA8E" id="2Wh5DQ1yl88" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
</node>
</node>
</node>
</node>
<node concept="Xl_RD" id="2Wh5DQ1yZ59" role="3uHU7B">
<property role="Xl_RC" value="PROJECT_DIR" />
</node>
</node>
</node>
</node>
<node concept="3clFbJ" id="4otXw3$lnXn" role="3cqZAp">
<node concept="3clFbS" id="4otXw3$lnXp" role="3clFbx">
<node concept="3SKdUt" id="4otXw3$m2Yh" role="3cqZAp">
<node concept="1PaTwC" id="4otXw3$m2Yi" role="1aUNEU">
<node concept="3oM_SD" id="4otXw3$m2Yj" role="1PaTwD">
<property role="3oM_SC" value="stable" />
</node>
<node concept="3oM_SD" id="4otXw3$m4I3" role="1PaTwD">
<property role="3oM_SC" value="linter" />
</node>
<node concept="3oM_SD" id="4otXw3$m4Mg" role="1PaTwD">
<property role="3oM_SC" value="message" />
</node>
<node concept="3oM_SD" id="4otXw3$m4RZ" role="1PaTwD">
<property role="3oM_SC" value="independent" />
</node>
<node concept="3oM_SD" id="4otXw3$m4WY" role="1PaTwD">
<property role="3oM_SC" value="on" />
</node>
<node concept="3oM_SD" id="4otXw3$m4Z0" role="1PaTwD">
<property role="3oM_SC" value="the" />
</node>
<node concept="3oM_SD" id="4otXw3$m51n" role="1PaTwD">
<property role="3oM_SC" value="directory" />
</node>
<node concept="3oM_SD" id="4otXw3$m5bz" role="1PaTwD">
<property role="3oM_SC" value="traversal" />
</node>
<node concept="3oM_SD" id="4otXw3$m5cV" role="1PaTwD">
<property role="3oM_SC" value="strategy" />
</node>
</node>
</node>
<node concept="3cpWs8" id="4otXw3$lBQ1" role="3cqZAp">
<node concept="3cpWsn" id="4otXw3$lBQ4" role="3cpWs9">
<property role="TrG5h" value="tmp" />
<node concept="17QB3L" id="4otXw3$lBPZ" role="1tU5fm" />
<node concept="37vLTw" id="4otXw3$lEGq" role="33vP2m">
<ref role="3cqZAo" node="2Wh5DQ1xT1o" resolve="path1" />
</node>
</node>
</node>
<node concept="3clFbF" id="4otXw3$lGXI" role="3cqZAp">
<node concept="37vLTI" id="4otXw3$lJcv" role="3clFbG">
<node concept="37vLTw" id="4otXw3$lL4f" role="37vLTx">
<ref role="3cqZAo" node="2Wh5DQ1yl7X" resolve="path2" />
</node>
<node concept="37vLTw" id="4otXw3$lGXG" role="37vLTJ">
<ref role="3cqZAo" node="2Wh5DQ1xT1o" resolve="path1" />
</node>
</node>
</node>
<node concept="3clFbF" id="4otXw3$lNUA" role="3cqZAp">
<node concept="37vLTI" id="4otXw3$lQ9z" role="3clFbG">
<node concept="37vLTw" id="4otXw3$lR3s" role="37vLTx">
<ref role="3cqZAo" node="4otXw3$lBQ4" resolve="tmp" />
</node>
<node concept="37vLTw" id="4otXw3$lNU$" role="37vLTJ">
<ref role="3cqZAo" node="2Wh5DQ1yl7X" resolve="path2" />
</node>
</node>
</node>
</node>
<node concept="3eOSWO" id="4otXw3$my4O" role="3clFbw">
<node concept="2OqwBi" id="4otXw3$lrEI" role="3uHU7B">
<node concept="37vLTw" id="4otXw3$lpzA" role="2Oq$k0">
<ref role="3cqZAo" node="2Wh5DQ1xT1o" resolve="path1" />
</node>
<node concept="liA8E" id="4otXw3$lw8$" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.compareTo(java.lang.String)" resolve="compareTo" />
<node concept="37vLTw" id="4otXw3$lxCE" role="37wK5m">
<ref role="3cqZAo" node="2Wh5DQ1yl7X" resolve="path2" />
</node>
</node>
</node>
<node concept="3cmrfG" id="4otXw3$lAcX" role="3uHU7w">
<property role="3cmrfH" value="0" />
</node>
</node>
</node>
<node concept="3clFbF" id="3jiJ$OUDXw4" role="3cqZAp">
<node concept="2OqwBi" id="3jiJ$OUDXw5" role="3clFbG">
<node concept="37vLTw" id="3jiJ$OUDXw6" role="2Oq$k0">
Expand All @@ -1888,8 +2047,19 @@
<node concept="Xl_RD" id="3jiJ$OUDXwc" role="3uHU7B">
<property role="Xl_RC" value="Model from file '" />
</node>
<node concept="2GrUjf" id="61xqYhG0YAi" role="3uHU7w">
<ref role="2Gs0qQ" node="61xqYhG05ur" resolve="modelFile" />
<node concept="2OqwBi" id="1EJX3sM71SW" role="3uHU7w">
<node concept="37vLTw" id="2Wh5DQ1xT1q" role="2Oq$k0">
<ref role="3cqZAo" node="2Wh5DQ1xT1o" resolve="path1" />
</node>
<node concept="liA8E" id="1EJX3sM75YW" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.replaceAll(java.lang.String,java.lang.String)" resolve="replaceAll" />
<node concept="Xl_RD" id="1EJX3sM77uW" role="37wK5m">
<property role="Xl_RC" value="\\\\" />
</node>
<node concept="Xl_RD" id="1EJX3sM7bbQ" role="37wK5m">
<property role="Xl_RC" value="/" />
</node>
</node>
</node>
</node>
<node concept="Xl_RD" id="3jiJ$OUDXwg" role="3uHU7w">
Expand All @@ -1901,18 +2071,19 @@
</node>
</node>
</node>
<node concept="2OqwBi" id="3jiJ$OUFZeC" role="3uHU7w">
<node concept="3EllGN" id="3jiJ$OUE_R8" role="2Oq$k0">
<node concept="37vLTw" id="3jiJ$OUEA1j" role="3ElVtu">
<ref role="3cqZAo" node="3jiJ$OUEe4u" resolve="currentModelId" />
<node concept="2OqwBi" id="1EJX3sM7eyJ" role="3uHU7w">
<node concept="37vLTw" id="2Wh5DQ1yqA1" role="2Oq$k0">
<ref role="3cqZAo" node="2Wh5DQ1yl7X" resolve="path2" />
</node>
<node concept="liA8E" id="1EJX3sM7g39" role="2OqNvi">
<ref role="37wK5l" to="wyt6:~String.replaceAll(java.lang.String,java.lang.String)" resolve="replaceAll" />
<node concept="Xl_RD" id="1EJX3sM7g3a" role="37wK5m">
<property role="Xl_RC" value="\\\\" />
</node>
<node concept="37vLTw" id="3jiJ$OUDXw9" role="3ElQJh">
<ref role="3cqZAo" node="3jiJ$OUBO$F" resolve="alreadyCollectedIDs2ModelFiles" />
<node concept="Xl_RD" id="1EJX3sM7g3b" role="37wK5m">
<property role="Xl_RC" value="/" />
</node>
</node>
<node concept="liA8E" id="61xqYhG1dpa" role="2OqNvi">
<ref role="37wK5l" to="guwi:~File.getAbsolutePath()" resolve="getAbsolutePath" />
</node>
</node>
</node>
</node>
Expand Down
Loading