Skip to content

Commit 3fd7d2f

Browse files
author
Alexander Pann
authored
Merge branch 'maintenance/mps20243' into merge/mps20243
2 parents cd023d9 + a4a3279 commit 3fd7d2f

File tree

6 files changed

+48
-60
lines changed

6 files changed

+48
-60
lines changed

‎build.gradle‎

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ import java.time.LocalDateTime
1717
apply plugin: 'download-jbr'
1818

1919
downloadJbr {
20-
jbrVersion = '17.0.11-b1207.30'
21-
20+
jbrVersion = '21.0.5-b631.8'
2221
}
2322

2423
// detect if we are in a CI build
@@ -43,11 +42,11 @@ logger.info 'Repository username: {}', project.nexusUsername
4342
// Dependency versions
4443

4544
// major version, e.g. '2021.1', '2021.2'
46-
ext.mpsMajor = '2024.1'
45+
ext.mpsMajor = '2024.3'
4746
// optional minor/bugfix number (not added to the final build version)
48-
ext.mpsMinor = '1'
47+
ext.mpsMinor = ''
4948
// e.g. Beta, EAP, RC
50-
ext.mpsReleaseType = ''
49+
ext.mpsReleaseType = 'EAP1'
5150

5251
def appendOpt = { str,pre -> !str.isEmpty() ? "${pre}${str}" : "" }
5352
ext.mpsVersion = "$mpsMajor" + appendOpt(mpsMinor, '.') + appendOpt(mpsReleaseType, '-')
@@ -195,8 +194,8 @@ dependencies {
195194
diagram_lib ("org.eclipse.elk:org.eclipse.elk.alg.topdownpacking:$elkVersion")
196195
diagram_lib ("org.eclipse.elk:org.eclipse.elk.core:$elkVersion")
197196
diagram_lib ("org.eclipse.elk:org.eclipse.elk.graph:$elkVersion")
198-
diagram_lib ("org.eclipse.emf:org.eclipse.emf.common:2.31.0")
199-
diagram_lib ("org.eclipse.emf:org.eclipse.emf.ecore:2.37.0")
197+
diagram_lib ("org.eclipse.emf:org.eclipse.emf.common:2.40.0")
198+
diagram_lib ("org.eclipse.emf:org.eclipse.emf.ecore:2.38.0")
200199
diagram_lib ("org.eclipse.emf:org.eclipse.emf.ecore.xmi:2.38.0")
201200

202201
xml_lib("xerces:xercesImpl:2.12.2")
@@ -230,19 +229,6 @@ def defaultScriptArgs = [mps_home, build_dir, artifacts_dir, ext.buildDate, ext.
230229

231230
afterEvaluate {
232231
project.ext["itemis.mps.gradle.ant.defaultJavaExecutable"] = tasks.getByName('downloadJbr').javaExecutable
233-
def jdk_home = null
234-
if (ext.has('java17_home')) {
235-
jdk_home = ext.get('java17_home')
236-
} else if (System.getenv('JB_JAVA17_HOME') != null) {
237-
jdk_home = System.getenv('JB_JAVA17_HOME')
238-
}
239-
if(jdk_home != null) {
240-
if (!new File(jdk_home, "lib").exists()) {
241-
throw new GradleException("Unable to locate JDK home folder. Detected folder is: $jdk_home")
242-
} else {
243-
ext["itemis.mps.gradle.ant.defaultJavaExecutable"] = new File(jdk_home, 'bin/java')
244-
}
245-
}
246232
}
247233

248234
// enables https://github.com/mbeddr/mps-gradle-plugin#providing-global-defaults

‎code/.mps/migration.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
<entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
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" />
16-
<entry key="project.migrated.version" value="241" />
16+
<entry key="project.migrated.version" value="243" />
1717
</component>
1818
</project>

‎code/debug/solutions/de.itemis.mps.debug.runtime/models/de.itemis.mps.debug.runtime.plugin.mps‎

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@
2121
<import index="y93e" ref="r:64204879-20e9-45e0-aa9c-21e16ba032f2(de.itemis.mps.debug.structure)" />
2222
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
2323
<import index="dp1x" ref="r:84719e1a-99f6-4297-90ba-8ad2a947fa4a(jetbrains.mps.ide.datatransfer)" />
24+
<import index="z1c3" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.project(MPS.Platform/)" />
25+
<import index="rdi9" ref="r:c30772cf-6faa-4379-900e-6719e180568e(de.itemis.mps.editor.celllayout.runtime.plugin)" />
2426
<import index="alof" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.project(MPS.Platform/)" />
25-
<import index="1m72" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.components(MPS.IDEA/)" />
27+
<import index="ksba" ref="r:12d1fcfd-d198-4520-8b28-436d7e8a8ae6(jetbrains.mps.console.plugin)" />
2628
<import index="tprs" ref="r:00000000-0000-4000-0000-011c895904a4(jetbrains.mps.ide.actions)" implicit="true" />
2729
</imports>
2830
<registry>
@@ -64,6 +66,9 @@
6466
<reference id="6193305307616734326" name="action" index="1bYAoF" />
6567
</concept>
6668
<concept id="5538333046911348654" name="jetbrains.mps.lang.plugin.structure.RequiredCondition" flags="ng" index="1oajcY" />
69+
<concept id="1208528650020" name="jetbrains.mps.lang.plugin.structure.ToolType" flags="in" index="1xUVSX">
70+
<reference id="1208529537963" name="tool" index="1xYkEM" />
71+
</concept>
6772
<concept id="1217252042208" name="jetbrains.mps.lang.plugin.structure.ActionDataParameterDeclaration" flags="ng" index="1DS2jV">
6873
<reference id="1217252646389" name="key" index="1DUlNI" />
6974
</concept>
@@ -74,6 +79,9 @@
7479
</language>
7580
<language id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone">
7681
<concept id="7520713872864775836" name="jetbrains.mps.lang.plugin.standalone.structure.StandalonePluginDescriptor" flags="ng" index="2DaZZR" />
82+
<concept id="681855071694758165" name="jetbrains.mps.lang.plugin.standalone.structure.GetToolInProjectOperation" flags="nn" index="LR4U6">
83+
<reference id="681855071694758166" name="tool" index="LR4U5" />
84+
</concept>
7785
</language>
7886
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
7987
<concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
@@ -145,6 +153,7 @@
145153
<concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
146154
<reference id="1205756909548" name="member" index="2WH_rO" />
147155
</concept>
156+
<concept id="1205769149993" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodCallOperation" flags="nn" index="2XshWL" />
148157
</language>
149158
<language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
150159
<concept id="5455284157994012186" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitLink" flags="ng" index="2pIpSj">
@@ -246,6 +255,9 @@
246255
<node concept="3cpWs8" id="7_uCKm_nUfo" role="3cqZAp">
247256
<node concept="3cpWsn" id="7_uCKm_nUfp" role="3cpWs9">
248257
<property role="TrG5h" value="ct" />
258+
<node concept="1xUVSX" id="4qohHcBHtVW" role="1tU5fm">
259+
<ref role="1xYkEM" to="ksba:2$nlLZbVXWa" resolve="ConsoleTool" />
260+
</node>
249261
<node concept="2OqwBi" id="4qohHcBHr1y" role="33vP2m">
250262
<node concept="2YIFZM" id="4qohHcBHp8W" role="2Oq$k0">
251263
<ref role="37wK5l" to="alof:~ProjectHelper.toIdeaProject(jetbrains.mps.project.Project)" resolve="toIdeaProject" />
@@ -257,16 +269,10 @@
257269
</node>
258270
</node>
259271
</node>
260-
<node concept="liA8E" id="V_BJyw1cJZ" role="2OqNvi">
261-
<ref role="37wK5l" to="1m72:~ComponentManager.getComponent(java.lang.Class)" resolve="getComponent" />
262-
<node concept="3VsKOn" id="V_BJyw1dWX" role="37wK5m">
263-
<ref role="3VsUkX" to="qgo0:1iC2RjkXjYJ" resolve="ConsoleTool" />
264-
</node>
272+
<node concept="LR4U6" id="4qohHcBHrW0" role="2OqNvi">
273+
<ref role="LR4U5" to="ksba:2$nlLZbVXWa" resolve="ConsoleTool" />
265274
</node>
266275
</node>
267-
<node concept="3uibUv" id="V_BJyw1aUQ" role="1tU5fm">
268-
<ref role="3uigEE" to="qgo0:1iC2RjkXjYJ" resolve="ConsoleTool" />
269-
</node>
270276
</node>
271277
</node>
272278
<node concept="3cpWs8" id="7_uCKm_nUfx" role="3cqZAp">
@@ -279,8 +285,8 @@
279285
<node concept="37vLTw" id="7_uCKm_nUf_" role="2Oq$k0">
280286
<ref role="3cqZAo" node="7_uCKm_nUfp" resolve="ct" />
281287
</node>
282-
<node concept="liA8E" id="V_BJyw1g3C" role="2OqNvi">
283-
<ref role="37wK5l" to="qgo0:5VzHAnbXFEZ" resolve="getCurrentEditableTab" />
288+
<node concept="2XshWL" id="4qohHcBHv2y" role="2OqNvi">
289+
<ref role="2WH_rO" to="ksba:2$nlLZc0tw7" resolve="getCurrentEditableTab" />
284290
</node>
285291
</node>
286292
</node>
@@ -469,29 +475,26 @@
469475
</node>
470476
</node>
471477
<node concept="3cpWs8" id="4qohHcBHxhI" role="3cqZAp">
472-
<node concept="3cpWsn" id="V_BJyw1gOQ" role="3cpWs9">
478+
<node concept="3cpWsn" id="4qohHcBHxhJ" role="3cpWs9">
473479
<property role="TrG5h" value="ct" />
474-
<node concept="2OqwBi" id="V_BJyw1gOR" role="33vP2m">
475-
<node concept="2YIFZM" id="V_BJyw1gOS" role="2Oq$k0">
480+
<node concept="1xUVSX" id="4qohHcBHxhK" role="1tU5fm">
481+
<ref role="1xYkEM" to="ksba:2$nlLZbVXWa" resolve="ConsoleTool" />
482+
</node>
483+
<node concept="2OqwBi" id="4qohHcBHxhL" role="33vP2m">
484+
<node concept="2YIFZM" id="4qohHcBHxhM" role="2Oq$k0">
476485
<ref role="37wK5l" to="alof:~ProjectHelper.toIdeaProject(jetbrains.mps.project.Project)" resolve="toIdeaProject" />
477486
<ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
478-
<node concept="2OqwBi" id="V_BJyw1gOT" role="37wK5m">
479-
<node concept="2WthIp" id="V_BJyw1gOU" role="2Oq$k0" />
480-
<node concept="1DTwFV" id="V_BJyw1gOV" role="2OqNvi">
487+
<node concept="2OqwBi" id="4qohHcBHxhN" role="37wK5m">
488+
<node concept="2WthIp" id="4qohHcBHxhO" role="2Oq$k0" />
489+
<node concept="1DTwFV" id="4qohHcBHxhP" role="2OqNvi">
481490
<ref role="2WH_rO" node="7_uCKm_iqTJ" resolve="mpsProject" />
482491
</node>
483492
</node>
484493
</node>
485-
<node concept="liA8E" id="V_BJyw1gOW" role="2OqNvi">
486-
<ref role="37wK5l" to="1m72:~ComponentManager.getComponent(java.lang.Class)" resolve="getComponent" />
487-
<node concept="3VsKOn" id="V_BJyw1gOX" role="37wK5m">
488-
<ref role="3VsUkX" to="qgo0:1iC2RjkXjYJ" resolve="ConsoleTool" />
489-
</node>
494+
<node concept="LR4U6" id="4qohHcBHxhQ" role="2OqNvi">
495+
<ref role="LR4U5" to="ksba:2$nlLZbVXWa" resolve="ConsoleTool" />
490496
</node>
491497
</node>
492-
<node concept="3uibUv" id="V_BJyw1gOY" role="1tU5fm">
493-
<ref role="3uigEE" to="qgo0:1iC2RjkXjYJ" resolve="ConsoleTool" />
494-
</node>
495498
</node>
496499
</node>
497500
<node concept="3cpWs8" id="7_uCKm_izgp" role="3cqZAp">
@@ -502,10 +505,10 @@
502505
</node>
503506
<node concept="2OqwBi" id="7_uCKm_izgr" role="33vP2m">
504507
<node concept="37vLTw" id="7_uCKm_izgs" role="2Oq$k0">
505-
<ref role="3cqZAo" node="V_BJyw1gOQ" resolve="ct" />
508+
<ref role="3cqZAo" node="4qohHcBHxhJ" resolve="ct" />
506509
</node>
507-
<node concept="liA8E" id="V_BJyw1iAQ" role="2OqNvi">
508-
<ref role="37wK5l" to="qgo0:5VzHAnbXFEZ" resolve="getCurrentEditableTab" />
510+
<node concept="2XshWL" id="4qohHcBH$6z" role="2OqNvi">
511+
<ref role="2WH_rO" to="ksba:2$nlLZc0tw7" resolve="getCurrentEditableTab" />
509512
</node>
510513
</node>
511514
</node>

‎code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,6 @@
733733
<concept id="1201306600024" name="jetbrains.mps.baseLanguage.collections.structure.ContainsKeyOperation" flags="nn" index="2Nt0df">
734734
<child id="1201654602639" name="key" index="38cxEo" />
735735
</concept>
736-
<concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
737736
<concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
738737
<child id="1205679832066" name="ascending" index="2S7zOq" />
739738
</concept>
@@ -89574,14 +89573,14 @@
8957489573
<ref role="3cqZAo" node="6HawCQIfmqS" resolve="style" />
8957589574
</node>
8957689575
<node concept="37vLTw" id="4sEIQIBKza1" role="37wK5m">
89577-
<ref role="3cqZAo" node="4sEIQIBKza2" resolve="it" />
89576+
<ref role="3cqZAo" node="3SbftMdSs8I" resolve="it" />
8957889577
</node>
8957989578
</node>
8958089579
</node>
8958189580
</node>
89582-
<node concept="Rh6nW" id="4sEIQIBKza2" role="1bW2Oz">
89581+
<node concept="gl6BB" id="3SbftMdSs8I" role="1bW2Oz">
8958389582
<property role="TrG5h" value="it" />
89584-
<node concept="2jxLKc" id="4sEIQIBKza3" role="1tU5fm" />
89583+
<node concept="2jxLKc" id="3SbftMdSs8J" role="1tU5fm" />
8958589584
</node>
8958689585
</node>
8958789586
</node>
@@ -89620,14 +89619,14 @@
8962089619
<node concept="1rXfSq" id="4sEIQIBLcwx" role="3clFbG">
8962189620
<ref role="37wK5l" node="74e51JlviKR" resolve="resetButtonVisibility" />
8962289621
<node concept="37vLTw" id="4sEIQIBLfzy" role="37wK5m">
89623-
<ref role="3cqZAo" node="4sEIQIBL8Fs" resolve="it" />
89622+
<ref role="3cqZAo" node="3SbftMdSs8K" resolve="it" />
8962489623
</node>
8962589624
</node>
8962689625
</node>
8962789626
</node>
89628-
<node concept="Rh6nW" id="4sEIQIBL8Fs" role="1bW2Oz">
89627+
<node concept="gl6BB" id="3SbftMdSs8K" role="1bW2Oz">
8962989628
<property role="TrG5h" value="it" />
89630-
<node concept="2jxLKc" id="4sEIQIBL8Ft" role="1tU5fm" />
89629+
<node concept="2jxLKc" id="3SbftMdSs8L" role="1tU5fm" />
8963189630
</node>
8963289631
</node>
8963389632
</node>

‎code/shadowmodels/solutions/de.q60.mps.collections.libs/de.q60.mps.collections.libs.msd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<solution name="de.q60.mps.collections.libs" uuid="ecfb9949-7433-4db5-85de-0f84d172e4ce" moduleVersion="0">
33
<models>
4-
<modelRoot type="java_classes" contentPath="${module}/lib">
4+
<modelRoot contentPath="${module}/lib" type="java_classes">
55
<sourceRoot location="trove4j-3.0.3.jar" />
66
<sourceRoot location="vavr-0.9.3.jar" />
77
<sourceRoot location="guava-27.1-jre.jar" />

‎code/third-party/solutions/third.party.usage.test/models/third.party.usage.test.mdl.mps‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
66
</languages>
77
<imports>
8-
<import index="3oi6" ref="39983771-4e9b-401b-a1a9-1da6c777c843/java:com.jetbrains.jsonSchema(MPS.ThirdParty/)" />
8+
<import index="lhlt" ref="39983771-4e9b-401b-a1a9-1da6c777c843/java:com.fasterxml.jackson.databind.node(MPS.ThirdParty/)" />
99
</imports>
1010
<registry>
1111
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -33,14 +33,14 @@
3333
</registry>
3434
<node concept="312cEu" id="6wECU8wtfQH">
3535
<property role="TrG5h" value="UseStuffFromAppJar" />
36+
<node concept="3Tm1VV" id="6wECU8wtfQI" role="1B3o_S" />
3637
<node concept="312cEg" id="6wECU8wtfTh" role="jymVt">
3738
<property role="TrG5h" value="jacksonStuff" />
3839
<node concept="3Tm1VV" id="6wECU8wtfSU" role="1B3o_S" />
3940
<node concept="3uibUv" id="6yNnJSJYgI_" role="1tU5fm">
40-
<ref role="3uigEE" to="3oi6:~JsonMappingKind" resolve="JsonMappingKind" />
41+
<ref role="3uigEE" to="lhlt:~ArrayNode" resolve="ArrayNode" />
4142
</node>
4243
</node>
43-
<node concept="3Tm1VV" id="6wECU8wtfQI" role="1B3o_S" />
4444
</node>
4545
</model>
4646

0 commit comments

Comments
 (0)