Skip to content

Commit 4b53710

Browse files
author
Alexander Pann
committed
Merge remote-tracking branch 'origin/master' into merge/master
# Conflicts: # code/spellcheck/languages/de.itemis.mps.spellcheck/generator/templates/[email protected] # code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/plugin.mps
2 parents 11e4872 + d4ea6b8 commit 4b53710

File tree

251 files changed

+6430
-6836
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

251 files changed

+6430
-6836
lines changed

‎.github/renovate.json5‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,94 @@
44
"config:best-practices"
55
],
66

7+
// Renovate master and recent maintenance branches. When updating the maintenance branch pattern, update the rule
8+
// for dashboard approvals for all but the earliest maintenance branch.
9+
"baseBranchPatterns": ["master", "/^maintenance/mps202[4-9][0-9]/"],
10+
711
"packageRules": [
812
{
913
"matchPackageNames": ["download-jbr:download-jbr.gradle.plugin", "de.itemis.mps.gradle.common:de.itemis.mps.gradle.common.gradle.plugin"],
1014
"groupName": "mps-gradle-plugin",
1115
"allowedVersions": "< 2.0"
1216
},
17+
18+
{
19+
"matchPackageNames": [ "com.google.guava:guava" ],
20+
"allowedVersions": "/^.*-jre$/"
21+
},
22+
23+
{
24+
// MPS: separate minor and patch updates in order to disable minor but leave patch updates enabled
25+
"matchPackageNames": ["com.jetbrains:mps"],
26+
"separateMinorPatch": true,
27+
},
28+
29+
{
30+
// MPS: disable major and minor updates, only enable patch updates
31+
"matchPackageNames": ["com.jetbrains:mps"],
32+
"matchUpdateTypes": ["major", "minor"],
33+
"enabled": false
34+
},
35+
36+
{
37+
// MPS: merge PRs on Wednesday morning
38+
"matchPackageNames": ["com.jetbrains:mps"],
39+
"automerge": true,
40+
"platformAutomerge": false,
41+
"automergeSchedule": "* 4-6 * * 3"
42+
},
43+
44+
{
45+
// Disable JBR updates on maintenance branches
46+
"matchPackageNames": ["com.jetbrains.jdk:*"],
47+
"matchBaseBranches": ["!master"],
48+
"enabled": false
49+
},
50+
51+
{
52+
// Disable Python updates on maintenance branches
53+
"matchManagers": "pip_requirements",
54+
"matchBaseBranches": ["!master"],
55+
"enabled": false,
56+
},
57+
58+
{
59+
// Disable modelix model-api upgrades (until we get rid of the dependency)
60+
"matchPackageNames": ["org.modelix:model-api"],
61+
"enabled": false
62+
},
63+
1364
{
1465
"matchPackageNames": ["org.eclipse*"],
1566
"groupName": "eclipse"
1667
},
68+
69+
{
70+
"matchPackageNames": ["com.miglayout*"],
71+
"groupName": "miglayout"
72+
},
73+
74+
{
75+
// Group all minor/patch third-party dependencies together (overrides the grouping above for minor and patch updates)
76+
"matchManagers": ["gradle"],
77+
"matchDepTypes": ["dependencies"], // Exclude plugins
78+
"matchPackageNames": ["!com.jetbrains*"], // Exclude MPS and JBR
79+
"matchUpdateTypes": ["minor", "patch"],
80+
"groupName": "third-party-minor",
81+
},
82+
83+
{
84+
// Schedule dependency updates once a month
85+
"matchJsonata": ["(manager = 'pip_requirements') or (depType = 'dependencies')"],
86+
"schedule": "* 0-3 1 * *" // Only check for new versions once a month on the 1st, before 4 AM.
87+
},
88+
89+
// Updates to all maintenance branches except the earliest one need approval. Updates to mps-prerelease are
90+
// an exception because we want to see those right away.
91+
{
92+
"matchBaseBranches": ["!maintenance/mps20241"],
93+
"matchPackageNames": ["!com.jetbrains.mps:mps-prerelease"],
94+
"dependencyDashboardApproval": true
95+
}
1796
]
1897
}

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ val ciBuild = project.hasProperty("forceCI") ||
3030
val mpsVersion = libs.mps.get().version!!
3131

3232
// major version, e.g. '2021.1', '2021.2'
33-
val mpsMajor = mpsVersion.substring(0, 6) // 2024.1.x-RCy -> 2024.1
33+
val mpsMajor = "9999.9"
3434

3535
if (ciBuild) {
3636
val branch = GitBasedVersioning.getGitBranch()

‎code/.mps/migration.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
<entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
1515
<entry key="jetbrains.mps.ide.mpsmigration.v_2023_3.CleanStubForeignMethodIds" value="executed" />
1616
<entry key="jetbrains.mps.ide.mpsmigration.v_2024_3.LangResourceImport4Migration" value="executed" />
17-
<entry key="project.migrated.version" value="251" />
17+
<entry key="project.migrated.version" value="253" />
1818
</component>
1919
</project>

‎code/.mps/modules.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@
116116
<modulePath path="$PROJECT_DIR$/modellisteners/com.mbeddr.mpsutil.modellisteners.sandbox/com.mbeddr.mpsutil.modellisteners.sandbox.msd" folder="modellisteners" />
117117
<modulePath path="$PROJECT_DIR$/modellisteners/com.mbeddr.mpsutil.modellisteners.sandboxlang/com.mbeddr.mpsutil.modellisteners.sandboxlang.mpl" folder="modellisteners" />
118118
<modulePath path="$PROJECT_DIR$/modellisteners/com.mbeddr.mpsutil.modellisteners/com.mbeddr.mpsutil.modellisteners.mpl" folder="modellisteners" />
119-
<modulePath path="$PROJECT_DIR$/modellisteners/test.com.mbeddr.mpsutil.modellisteners/test.com.mbeddr.mpsutil.modellisteners.msd" folder="modellisteners" />
120119
<modulePath path="$PROJECT_DIR$/modelmerger/languages/de.itemis.mps.modelmerger/de.itemis.mps.modelmerger.mpl" folder="modelmerger_deprecated" />
121120
<modulePath path="$PROJECT_DIR$/modelmerger/languages/de.itemis.mps.modelmerger/sandbox/de.itemis.mps.modelmerger.testhelper.msd" folder="modelmerger_deprecated" />
122121
<modulePath path="$PROJECT_DIR$/modelmerger/languages/test.de.itemis.mps.modelmerger.testlanguage/test.de.itemis.mps.modelmerger.testlanguage.mpl" folder="modelmerger.test.language" />
@@ -228,8 +227,6 @@
228227
<modulePath path="$PROJECT_DIR$/testing/languages/nl.f1re.testing/nl.f1re.testing.mpl" folder="testing" />
229228
<modulePath path="$PROJECT_DIR$/testing/solutions/nl.f1re.testing.examples/nl.f1re.testing.examples.msd" folder="testing" />
230229
<modulePath path="$PROJECT_DIR$/testing/solutions/nl.f1re.testing.runtime/nl.f1re.testing.runtime.msd" folder="testing" />
231-
<modulePath path="$PROJECT_DIR$/third-party/solutions/MPS.ThirdParty/MPS.ThirdParty.msd" folder="3rd-party" />
232-
<modulePath path="$PROJECT_DIR$/third-party/solutions/third.party.usage.test/third.party.usage.test.msd" folder="3rd-party" />
233230
<modulePath path="$PROJECT_DIR$/tooltips/solutions/de.itemis.mps.tooltips.runtime/de.itemis.mps.tooltips.runtime.msd" folder="tooltips" />
234231
<modulePath path="$PROJECT_DIR$/treenotation/com.mbeddr.mpsutil.treenotation.runtime/com.mbeddr.mpsutil.treenotation.runtime.msd" folder="treenotation" />
235232
<modulePath path="$PROJECT_DIR$/treenotation/com.mbeddr.mpsutil.treenotation.sandbox/com.mbeddr.mpsutil.treenotation.sandbox.msd" folder="treenotation" />

‎code/blutil/languages/com.mbeddr.mpsutil.blutil.genutil/com.mbeddr.mpsutil.blutil.genutil.mpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
<language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
116116
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
117117
<language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
118-
<language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
118+
<language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="4" />
119119
<language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
120120
<language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
121121
<language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />

‎code/blutil/languages/com.mbeddr.mpsutil.blutil.genutil/models/structure.mps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<model ref="r:c266b17e-13c4-40d1-81f3-e76cbf26809a(com.mbeddr.mpsutil.blutil.genutil.structure)">
33
<persistence version="9" />
44
<languages>
5-
<use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="3" />
5+
<use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="4" />
66
<devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
77
</languages>
88
<imports>

‎code/blutil/languages/com.mbeddr.mpsutil.blutil/blutil.mpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@
175175
<language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
176176
<language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="6" />
177177
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
178-
<language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
178+
<language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="4" />
179179
<language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
180180
<language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
181181
<language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />

‎code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/structure.mps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<model ref="63e0e566-5131-447e-90e3-12ea330e1a00/r:f5bd2ad9-cd54-4408-b815-07f9f306f074(com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.structure)">
33
<persistence version="9" />
44
<languages>
5-
<use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="3" />
5+
<use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="4" />
66
<devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
77
</languages>
88
<imports>

‎code/blutil/tests/test.com.mbeddr.mpsutil.blutil.genutil.lang/models/structure.mps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<persistence version="9" />
44
<languages>
55
<use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="9" />
6-
<use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="3" />
6+
<use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="4" />
77
<devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
88
</languages>
99
<imports>

‎code/blutil/tests/test.com.mbeddr.mpsutil.blutil.genutil.lang/test.com.mbeddr.mpsutil.blutil.genutil.lang.mpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
<language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="2" />
9797
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
9898
<language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
99-
<language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="3" />
99+
<language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="4" />
100100
<language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
101101
<language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
102102
<language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />

0 commit comments

Comments
 (0)