Skip to content

Commit 58d4fb0

Browse files
alexanderpannalexanderpann
authored
Merge pull request #621 from IETS3/feature/mps20213
2 parents f4466e6 + bf255a1 commit 58d4fb0

File tree

237 files changed

+357
-345
lines changed

Some content is hidden

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

237 files changed

+357
-345
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ 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 2021.2 (branch: [master](https://github.com/IETS3/iets3.opensource/tree/master))
24+
- MPS 2021.3 (branch: [master](https://github.com/IETS3/iets3.opensource/tree/master))
25+
- MPS 2021.2 (branch: [maintenance/mps20212](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20212))
2526
- MPS 2021.1 (branch: [maintenance/mps20211](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20211))
2627
- MPS 2020.3 (branch: [maintenance/mps20203](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20203))
27-
- MPS 2020.2 (branch: [maintenance/mps20202](https://github.com/IETS3/iets3.opensource/tree/maintenance/mps20202))
2828

2929
## Community
3030

‎build.gradle‎

100755100644
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ if (project.hasProperty("forceCI")) {
5353
def forceLocal = project.hasProperty("forceLocalDependencies")
5454

5555
def major = "2021"
56-
def minor = "2"
56+
def minor = "3"
5757

5858
// Dependency versions
59-
ext.mpsVersion = '2021.2.6'
59+
ext.mpsVersion = '2021.3.2'
6060

61-
def mbeddrVersion = "2021.2+"
61+
def mbeddrVersion = "2021.3+"
6262

6363
// if building a against a special branch from mbeddr is required add the name here
6464
// the name is enough no trailing "." is required, also the plain name from git can

‎build/scripts/build-allScripts.xml‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,16 @@
3535

3636
<path id="path.mps.ant.path">
3737
<pathelement location="${artifacts.mps}/lib/ant/lib/ant-mps.jar" />
38-
<pathelement location="${artifacts.mps}/lib/util.jar" />
38+
<fileset dir="${artifacts.mps}/lib">
39+
<include name="util.jar" />
40+
<include name="3rd-party-rt.jar" />
41+
</fileset>
3942
</path>
4043

44+
<taskdef resource="jetbrains/mps/build/ant/antlib.xml" classpathref="path.mps.ant.path" />
45+
46+
<generator-settings id="m2m-0" strictMode="true" parallelThreads="4" inplaceTransform="true" warnWrongChild="true" createStaticRefs="true" skipUnmodifiedModels="${mps.generator.skipUnmodifiedModels}" />
47+
4148
<target name="assemble" depends="classes, declare-mps-tasks">
4249
<mkdir dir="${build.layout}" />
4350
<mkdir dir="${build.tmp}/default/org.iets3.opensource.build.jar" />
@@ -112,7 +119,8 @@
112119

113120
<target name="generate" depends="declare-mps-tasks, fetchDependencies">
114121
<echo message="generating" />
115-
<generate strictMode="true" parallelMode="true" parallelThreads="4" useInplaceTransform="true" hideWarnings="false" createStaticRefs="true" fork="true" skipUnmodifiedModels="${mps.generator.skipUnmodifiedModels}" logLevel="${mps.ant.log}">
122+
<generate fork="true" logLevel="${mps.ant.log}">
123+
<settings refid="m2m-0" />
116124
<plugin path="${artifacts.com.mbeddr.platform}/com.mbeddr.platform.build" />
117125
<plugin path="${artifacts.com.mbeddr.platform}/de.itemis.mps.extensions.build" />
118126
<plugin path="${artifacts.com.mbeddr.platform}/de.slisson.mps.hacks" />
@@ -137,6 +145,7 @@
137145
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
138146
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
139147
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.runtime.jar" />
148+
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.util.jar" />
140149
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguageInternal.jar" />
141150
<library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.constraints.jar" />
142151
<library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.constraints.rules.jar" />
@@ -146,6 +155,7 @@
146155
<library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.general-purpose.jar" />
147156
<library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.language-descriptor.jar" />
148157
<library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.templates.jar" />
158+
<library file="${artifacts.mps}/languages/editor/jetbrains.mps.editing.runtime.jar" />
149159
<library file="${artifacts.mps}/languages/editor/jetbrains.mps.editor.runtime.jar" />
150160
<library file="${artifacts.mps}/languages/editor/jetbrains.mps.editorlang.runtime.jar" />
151161
<library file="${artifacts.mps}/languages/editor/jetbrains.mps.ide.editor.jar" />
@@ -205,7 +215,6 @@
205215
<library file="${artifacts.mps}/languages/make/jetbrains.mps.smodel.resources.jar" />
206216
<library file="${artifacts.mps}/languages/mps-stubs.jar" />
207217
<library file="${artifacts.mps}/languages/plaf/jetbrains.mps.baseLanguage.search.jar" />
208-
<library file="${artifacts.mps}/languages/plaf/jetbrains.mps.baseLanguage.util.jar" />
209218
<library file="${artifacts.mps}/languages/plaf/jetbrains.mps.ide.platform.jar" />
210219
<library file="${artifacts.mps}/languages/plaf/jetbrains.mps.ide.refactoring.platform.jar" />
211220
<library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
@@ -250,9 +259,7 @@
250259
</generate>
251260
</target>
252261

253-
<target name="declare-mps-tasks">
254-
<taskdef resource="jetbrains/mps/build/ant/antlib.xml" classpathref="path.mps.ant.path" />
255-
</target>
262+
<target name="declare-mps-tasks" />
256263

257264
<target name="makeDependents" />
258265

@@ -318,8 +325,9 @@
318325
<fileset file="${artifacts.mps}/lib/annotations.jar" />
319326
<fileset dir="${artifacts.mps}/lib" includes="*.jar" />
320327
<fileset file="${artifacts.mps}/lib/util.jar" />
328+
<fileset file="${artifacts.mps}/lib/3rd-party-rt.jar" />
321329
<fileset file="${artifacts.mps}/lib/3rd-party.jar" />
322-
<fileset file="${artifacts.mps}/lib/ecj-4.16.jar" />
330+
<fileset file="${artifacts.mps}/lib/eclipse.jar" />
323331
<fileset file="${artifacts.com.mbeddr.platform}/de.slisson.mps.hacks/languages/de.slisson.mps.hacks/de.slisson.mps.reflection.runtime.jar" />
324332
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
325333
<fileset file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.jar" />
@@ -380,8 +388,9 @@
380388
<fileset file="${artifacts.mps}/lib/annotations.jar" />
381389
<fileset dir="${artifacts.mps}/lib" includes="*.jar" />
382390
<fileset file="${artifacts.mps}/lib/util.jar" />
391+
<fileset file="${artifacts.mps}/lib/3rd-party-rt.jar" />
383392
<fileset file="${artifacts.mps}/lib/3rd-party.jar" />
384-
<fileset file="${artifacts.mps}/lib/ecj-4.16.jar" />
393+
<fileset file="${artifacts.mps}/lib/eclipse.jar" />
385394
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
386395
<fileset file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.jar" />
387396
<fileset file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.mps.jar" />

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
<entry key="jetbrains.mps.ide.mpsmigration.v35.SetGenRequiredToEmptyAspects" value="executed" />
1717
<entry key="jetbrains.mps.ide.mpsmigration.v_2019_3.DefaultFacetExplicitPersistence" value="executed" />
1818
<entry key="jetbrains.mps.ide.mpsmigration.v_2021_2.SplitMPSCoreStub" value="executed" />
19+
<entry key="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
1920
<entry key="jetbrains.mps.javaVersionMigration_JDKDefault" value="executed" />
2021
<entry key="jetbrains.mps.v8_elimination" value="executed" />
21-
<entry key="project.migrated.version" value="212" />
22+
<entry key="project.migrated.version" value="213" />
2223
</component>
2324
</project>

‎code/languages/org.iets3.opensource/_spreferences/CodeReviewPreferences/module.msd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<language slang="l:d09a16fb-1d68-4a92-a5a4-20b4b2f86a62:com.mbeddr.mpsutil.jung" version="0" />
2020
<language slang="l:b4d28e19-7d2d-47e9-943e-3a41f97a0e52:com.mbeddr.mpsutil.plantuml.node" version="0" />
2121
<language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
22-
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />
22+
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
2323
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
2424
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
2525
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />

‎code/languages/org.iets3.opensource/_spreferences/TestExecutionPreferences/module.msd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<language slang="l:d09a16fb-1d68-4a92-a5a4-20b4b2f86a62:com.mbeddr.mpsutil.jung" version="0" />
1919
<language slang="l:b4d28e19-7d2d-47e9-943e-3a41f97a0e52:com.mbeddr.mpsutil.plantuml.node" version="0" />
2020
<language slang="l:92d2ea16-5a42-4fdf-a676-c7604efe3504:de.slisson.mps.richtext" version="0" />
21-
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />
21+
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
2222
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
2323
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
2424
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />

‎code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/behavior.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="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
6-
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="11" />
6+
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
77
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
88
<use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
99
<devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />

‎code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/editor.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="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
6-
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="11" />
6+
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
77
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
88
<use id="9d69e719-78c8-4286-90db-fb19c107d049" name="com.mbeddr.mpsutil.grammarcells" version="2" />
99
<devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />

‎code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/intentions.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="d7a92d38-f7db-40d0-8431-763b0c3c9f20" name="jetbrains.mps.lang.intentions" version="1" />
6-
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="11" />
6+
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
77
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
88
<use id="b92f861d-0184-446d-b88b-6dcf0e070241" name="com.mbeddr.mpsutil.intentions" version="0" />
99
<devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />

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

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<languages>
55
<use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
66
<use id="c0080a47-7e37-4558-bee9-9ae18e690549" name="jetbrains.mps.lang.extension" version="-1" />
7-
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="11" />
7+
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
88
<use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
99
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
1010
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
@@ -440,6 +440,9 @@
440440
<concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
441441
<child id="8970989240999019149" name="part" index="1dT_Ay" />
442442
</concept>
443+
<concept id="8465538089690331492" name="jetbrains.mps.baseLanguage.javadoc.structure.DeprecatedBlockDocTag" flags="ng" index="TZ5HI">
444+
<child id="2667874559098216723" name="text" index="3HnX3l" />
445+
</concept>
443446
<concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
444447
<property id="8970989240999019144" name="text" index="1dT_AB" />
445448
</concept>
@@ -6427,18 +6430,21 @@
64276430
<node concept="3Tm1VV" id="2fgSOgkgxB_" role="1B3o_S" />
64286431
<node concept="2AHcQZ" id="2fgSOgkgxBB" role="2AJF6D">
64296432
<ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
6430-
</node>
6431-
<node concept="2AHcQZ" id="2fgSOgkgxBC" role="2AJF6D">
6432-
<ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
6433-
</node>
6434-
<node concept="2AHcQZ" id="2fgSOgkgxBD" role="2AJF6D">
6435-
<ref role="2AI5Lk" to="mhfm:~ApiStatus$ScheduledForRemoval" resolve="ApiStatus.ScheduledForRemoval" />
6436-
<node concept="2B6LJw" id="2fgSOgkgxBE" role="2B76xF">
6437-
<ref role="2B6OnR" to="mhfm:~ApiStatus$ScheduledForRemoval.inVersion()" resolve="inVersion" />
6438-
<node concept="Xl_RD" id="2fgSOgkgxBF" role="2B70Vg">
6433+
<node concept="2B6LJw" id="7tc9lTMfnGo" role="2B76xF">
6434+
<ref role="2B6OnR" to="wyt6:~Deprecated.since()" resolve="since" />
6435+
<node concept="Xl_RD" id="7tc9lTMfnGk" role="2B70Vg">
64396436
<property role="Xl_RC" value="2020.2" />
64406437
</node>
64416438
</node>
6439+
<node concept="2B6LJw" id="7tc9lTMfnGp" role="2B76xF">
6440+
<ref role="2B6OnR" to="wyt6:~Deprecated.forRemoval()" resolve="forRemoval" />
6441+
<node concept="3clFbT" id="7tc9lTMfnGq" role="2B70Vg">
6442+
<property role="3clFbU" value="true" />
6443+
</node>
6444+
</node>
6445+
</node>
6446+
<node concept="2AHcQZ" id="2fgSOgkgxBC" role="2AJF6D">
6447+
<ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
64426448
</node>
64436449
<node concept="3uibUv" id="2fgSOgkgxBJ" role="3clF45">
64446450
<ref role="3uigEE" to="wyt6:~String" resolve="String" />
@@ -6453,6 +6459,11 @@
64536459
<node concept="2AHcQZ" id="2fgSOgkgxBO" role="2AJF6D">
64546460
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
64556461
</node>
6462+
<node concept="P$JXv" id="7tc9lTMfnGl" role="lGtFl">
6463+
<node concept="TZ5HI" id="7tc9lTMfnGm" role="3nqlJM">
6464+
<node concept="TZ5HA" id="7tc9lTMfnGn" role="3HnX3l" />
6465+
</node>
6466+
</node>
64566467
</node>
64576468
<node concept="3clFb_" id="2S0X1v6MAGK" role="jymVt">
64586469
<property role="TrG5h" value="getClickConsumer" />

0 commit comments

Comments
 (0)