Skip to content

Commit ab71ee5

Browse files
author
Alexander Pann
committed
Merge remote-tracking branch 'refs/remotes/origin/master' into merge/mps20232
# Conflicts: # code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/org.iets3.analysis.base.mpl # code/languages/org.iets3.opensource/languages/org.iets3.components.core/org.iets3.components.core.mpl # code/languages/org.iets3.opensource/languages/org.iets3.components.req/org.iets3.components.req.mpl # code/languages/org.iets3.opensource/languages/org.iets3.core.assessment/org.iets3.core.assessment.mpl # code/languages/org.iets3.opensource/languages/org.iets3.core.expr.adt/org.iets3.core.expr.adt.mpl # code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/plugin.mps # code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/org.iets3.core.expr.base.mpl # code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/org.iets3.core.expr.collections.mpl # code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/org.iets3.core.expr.lambda.mpl # code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lookup/org.iets3.core.expr.lookup.mpl # code/languages/org.iets3.opensource/languages/org.iets3.core.expr.messages/org.iets3.core.expr.messages.mpl # code/languages/org.iets3.opensource/languages/org.iets3.core.expr.natlang/org.iets3.core.expr.natlang.mpl # code/languages/org.iets3.opensource/languages/org.iets3.core.expr.query/org.iets3.core.expr.query.mpl # code/languages/org.iets3.opensource/languages/org.iets3.core.expr.repl/org.iets3.core.expr.repl.mpl # code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes.tests/org.iets3.core.expr.simpleTypes.tests.mpl # code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/org.iets3.core.expr.simpleTypes.mpl # code/languages/org.iets3.opensource/languages/org.iets3.core.expr.temporal/org.iets3.core.expr.temporal.mpl # code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/org.iets3.core.expr.tests.mpl # code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/org.iets3.core.expr.toplevel.mpl # code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.bindingtime/org.iets3.core.expr.typetags.bindingtime.mpl # code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.lib/org.iets3.core.expr.typetags.lib.mpl # code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.physunits/org.iets3.core.expr.typetags.physunits.mpl # code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags.units.quantity/org.iets3.core.expr.typetags.units.quantity.mpl # code/languages/org.iets3.opensource/languages/org.iets3.core.expr.typetags/org.iets3.core.expr.typetags.mpl # code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/org.iets3.core.expr.util.mpl # code/languages/org.iets3.opensource/languages/org.iets3.core.trace.sandbox/org.iets3.core.trace.test.mpl # code/languages/org.iets3.opensource/languages/org.iets3.core.users/org.iets3.core.users.mpl # code/languages/org.iets3.opensource/languages/org.iets3.req.core/org.iets3.req.core.mpl # code/languages/org.iets3.opensource/languages/test.ts.expr.os.validNameConcept/test.ts.expr.os.validNameConcept.mpl # code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.adt.interpreter/org.iets3.core.expr.adt.interpreter.msd # code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.interpreter/org.iets3.core.expr.base.interpreter.msd # code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.query.interpreter/org.iets3.core.expr.query.interpreter.msd # code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.simpleTypes.interpreter/org.iets3.core.expr.simpleTypes.interpreter.msd # code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.temporal.interpreter/org.iets3.core.expr.temporal.interpreter.msd # code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps # code/languages/org.iets3.opensource/solutions/org.iets3.opensource.linters/models/org.iets3.opensource.linters.mps # code/languages/org.iets3.opensource/solutions/org.iets3.opensource.linters/org.iets3.opensource.linters.msd
2 parents ec732d3 + 12c6ac8 commit ab71ee5

File tree

226 files changed

+1755
-1913
lines changed

Some content is hidden

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

226 files changed

+1755
-1913
lines changed

‎.github/workflows/vulnerability-scanning.yml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
on: [pull_request]
2+
3+
jobs:
4+
depchecktest:
5+
runs-on: ubuntu-latest
6+
name: depecheck_test
7+
steps:
8+
- name: Checkout
9+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
10+
- name: Setup Java
11+
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4
12+
with:
13+
distribution: temurin
14+
java-version: 17
15+
- name: Setup Gradle
16+
uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4
17+
- name: Call setup
18+
run: ./gradlew dependencies
19+
- name: Dependency Check
20+
uses: dependency-check/Dependency-Check_Action@3102a65fd5f36d0000297576acc56a475b0de98d
21+
env:
22+
# actions/setup-java changes JAVA_HOME, so it needs to be reset to match the depcheck image
23+
JAVA_HOME: /opt/jdk
24+
id: Depcheck
25+
with:
26+
project: 'iets3.opensource'
27+
format: 'HTML'
28+
out: 'reports'
29+
- name: Upload Test results
30+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
31+
with:
32+
name: Dependency Check Report
33+
path: ${{github.workspace}}/reports

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ We take care of porting changes done in older supported MPS versions to the newe
2121
For details see [wiki](https://github.com/IETS3/iets3.opensource/wiki/Supported-MPS-Versions).
2222

2323
### What MPS versions are currently supported?
24-
- MPS 2023.2 (branch: [master](https://github.com/IETS3/iets3.opensource/tree/master))
24+
- MPS 2024.1 (branch: [master](https://github.com/IETS3/iets3.opensource/tree/master))
25+
- MPS 2023.2 (branch: [maintenance/mps20232](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20232))
2526
- MPS 2022.3 (branch: [maintenance/mps20223](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20223))
2627
- MPS 2022.2 (branch: [maintenance/mps20222](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20222))
2728
- MPS 2021.3 (branch: [maintenance/mps20213](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20213))

‎build.gradle‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ apply plugin: 'download-jbr'
4040

4141
// configure jbr download
4242
downloadJbr {
43-
jbrVersion = '17.0.8.1-b1000.32'
43+
jbrVersion = '17.0.11-b1207.30'
4444
}
4545

4646
// detect if we are in a CI build
@@ -53,14 +53,14 @@ if (project.hasProperty("forceCI")) {
5353

5454
def forceLocal = project.hasProperty("forceLocalDependencies")
5555

56-
def major = "2023"
57-
def minor = "2"
56+
def major = "2024"
57+
def minor = "1"
5858

5959
// Dependency versions
6060

61-
ext.mpsVersion = '2023.2.2'
61+
ext.mpsVersion = '2024.1.1'
6262

63-
def mbeddrVersion = "2023.2+"
63+
def mbeddrVersion = "2024.1+"
6464
def mpsQAVersion = "$major.$minor+"
6565

6666
// if building a against a special branch from mbeddr is required add the name here
@@ -196,6 +196,7 @@ task resolveDependencies(dependsOn: ['downloadJbr', resolveMps, resolveLanguageL
196196
def defaultScriptArgs = [
197197
'mps.home' : resolveMps.destinationDir,
198198
'iets3.github.opensource.home' : rootDir,
199+
'mps.test.project.path' : "${rootDir}/code/languages/org.iets3.opensource",
199200
'build.jna.library.path' : new File(resolveMps.destinationDir, "lib/jna/${System.getProperty('os.arch')}"),
200201
'build.dir' : buildDir,
201202
'version' : version
@@ -280,9 +281,11 @@ modelcheck {
280281

281282

282283
afterEvaluate { project ->
284+
/*
283285
check.configure {
284286
dependsOn tasks.named('checkmodels')
285287
}
288+
*/
286289
}
287290

288291
checkmodels {

‎build/scripts/build-allScripts.xml‎

Lines changed: 13 additions & 130 deletions
Large diffs are not rendered by default.

‎code/languages/org.iets3.opensource/.mps/.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Default ignored files
2+
/shelf/
3+
/workspace.xml

‎code/languages/org.iets3.opensource/.mps/migration.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@
2121
<entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
2222
<entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
2323
<entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
24+
<entry key="jetbrains.mps.ide.mpsmigration.v_2023_3.CleanStubForeignMethodIds" value="executed" />
2425
<entry key="jetbrains.mps.javaVersionMigration_JDKDefault" value="executed" />
2526
<entry key="jetbrains.mps.v8_elimination" value="executed" />
26-
<entry key="project.migrated.version" value="232" />
27+
<entry key="project.migrated.version" value="241" />
2728
</component>
2829
</project>

‎code/languages/org.iets3.opensource/.mps/vcs.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
</option>
1212
</component>
1313
<component name="VcsDirectoryMappings">
14-
<mapping directory="$iets3.github.opensource.home$" vcs="Git" />
14+
<mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
1515
</component>
1616
</project>

‎code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/plugin.mps‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
<child id="1068498886297" name="rValue" index="37vLTx" />
125125
<child id="1068498886295" name="lValue" index="37vLTJ" />
126126
</concept>
127-
<concept id="2323553266850475941" name="jetbrains.mps.baseLanguage.structure.IHasModifiers" flags="ngI" index="2frcj7">
127+
<concept id="2323553266850475941" name="jetbrains.mps.baseLanguage.structure.IHasModifiers" flags="ng" index="2frcj7">
128128
<child id="2323553266850475953" name="modifiers" index="2frcjj" />
129129
</concept>
130130
<concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
@@ -142,7 +142,7 @@
142142
<concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
143143
<reference id="1188208074048" name="annotation" index="2AI5Lk" />
144144
</concept>
145-
<concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
145+
<concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
146146
<child id="1188208488637" name="annotation" index="2AJF6D" />
147147
</concept>
148148
<concept id="1095950406618" name="jetbrains.mps.baseLanguage.structure.DivExpression" flags="nn" index="FJ1c_" />
@@ -221,7 +221,7 @@
221221
<property id="1176718929932" name="isFinal" index="3TUv4t" />
222222
<child id="1068431790190" name="initializer" index="33vP2m" />
223223
</concept>
224-
<concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
224+
<concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
225225
<property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
226226
</concept>
227227
<concept id="1109279763828" name="jetbrains.mps.baseLanguage.structure.TypeVariableDeclaration" flags="ng" index="16euLQ" />
@@ -302,7 +302,7 @@
302302
<child id="1160998896846" name="condition" index="1gVkn0" />
303303
<child id="1160998916832" name="message" index="1gVpfI" />
304304
</concept>
305-
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
305+
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
306306
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
307307
<child id="1068499141038" name="actualArgument" index="37wK5m" />
308308
<child id="4972241301747169160" name="typeArgument" index="3PaCim" />
@@ -337,7 +337,7 @@
337337
<child id="8276990574895933172" name="throwable" index="1zc67B" />
338338
</concept>
339339
<concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
340-
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
340+
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
341341
<child id="1178549979242" name="visibility" index="1B3o_S" />
342342
</concept>
343343
<concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
@@ -464,7 +464,7 @@
464464
<concept id="1213999088275" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldDeclaration" flags="ig" index="2BZ0e9" />
465465
<concept id="1213999117680" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierFieldAccessOperation" flags="nn" index="2BZ7hE" />
466466
<concept id="1205752633985" name="jetbrains.mps.baseLanguage.classifiers.structure.ThisClassifierExpression" flags="nn" index="2WthIp" />
467-
<concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
467+
<concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
468468
<reference id="1205756909548" name="member" index="2WH_rO" />
469469
</concept>
470470
</language>
@@ -532,7 +532,7 @@
532532
<property id="1193676396447" name="virtualPackage" index="3GE5qa" />
533533
<child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
534534
</concept>
535-
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
535+
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
536536
<property id="1169194664001" name="name" index="TrG5h" />
537537
</concept>
538538
<concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7">

‎code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/org.iets3.analysis.base.mpl‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@
8989
<module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
9090
<module reference="ecfb9949-7433-4db5-85de-0f84d172e4ce(de.q60.mps.collections.libs)" version="0" />
9191
<module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
92-
<module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
9392
<module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
9493
<module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
9594
<module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />

‎code/languages/org.iets3.opensource/languages/org.iets3.components.core/org.iets3.components.core.mpl‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@
105105
<module reference="cce85e64-7b37-4ad5-b0e6-9d18324cdfb3(de.itemis.mps.selection.runtime)" version="0" />
106106
<module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
107107
<module reference="dc038ceb-b7ea-4fea-ac12-55f7400e97ba(de.slisson.mps.editor.multiline.runtime)" version="0" />
108-
<module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
109108
<module reference="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" version="0" />
110109
<module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
111110
<module reference="443f4c36-fcf5-4eb6-9500-8d06ed259e3e(jetbrains.mps.baseLanguage.classifiers)" version="0" />

0 commit comments

Comments
 (0)