Skip to content

Commit 1c4d9e0

Browse files
fisakovfisakov
authored
Merge pull request #1639 from JetBrains/mps/2025.3
[MPS 2025.3] Drop MPS.ThirdParty module completely
2 parents 0b53ff3 + 469f007 commit 1c4d9e0

File tree

14 files changed

+70
-489
lines changed

14 files changed

+70
-489
lines changed

‎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/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps‎

Lines changed: 3 additions & 345 deletions
Large diffs are not rendered by default.

‎code/compare/languages/de.itemis.mps.compare/compare.mpl‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
<dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
3737
<dependency reexport="false">215c4c45-ba99-49f5-9ab7-4b6901a63cfd(MPS.Generator)</dependency>
3838
<dependency reexport="false">7124e466-fc92-4803-a656-d7a6b7eb3910(MPS.TextGen)</dependency>
39-
<dependency reexport="false">39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty)</dependency>
4039
<dependency reexport="false">92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)</dependency>
4140
<dependency reexport="false">7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)</dependency>
4241
<dependency reexport="false">7ab1a6fa-0a11-4b95-9e48-75f363d6cb00(jetbrains.mps.lang.generator.plan)</dependency>
@@ -78,7 +77,6 @@
7877
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
7978
<module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
8079
<module reference="7124e466-fc92-4803-a656-d7a6b7eb3910(MPS.TextGen)" version="0" />
81-
<module reference="39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty)" version="0" />
8280
<module reference="c6420b75-4569-420d-aaf7-9bc590ad7b2a(de.itemis.mps.comparator)" version="0" />
8381
<module reference="f47b95d4-5e73-4c04-9204-18076950153b(de.itemis.mps.compare)" version="0" />
8482
<module reference="3b21f776-9e24-4e37-9639-70bded433068(de.itemis.mps.compare#756135271275941091)" version="0" />

‎code/compare/languages/de.itemis.mps.compare/generator/template/[email protected]‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,23 +33,21 @@
3333
<import index="ap4t" ref="215c4c45-ba99-49f5-9ab7-4b6901a63cfd/java:jetbrains.mps.generator(MPS.Generator/)" />
3434
<import index="qjvf" ref="r:82cadfba-0fcc-402e-8eaa-37395d383fb6(de.itemis.mps.compare.behavior)" />
3535
<import index="ao3" ref="7124e466-fc92-4803-a656-d7a6b7eb3910/java:jetbrains.mps.text(MPS.TextGen/)" />
36-
<import index="2o8p" ref="39983771-4e9b-401b-a1a9-1da6c777c843/java:com.intellij.diff.contents(MPS.ThirdParty/)" />
37-
<import index="phib" ref="39983771-4e9b-401b-a1a9-1da6c777c843/java:com.intellij.diff.requests(MPS.ThirdParty/)" />
38-
<import index="yt4f" ref="39983771-4e9b-401b-a1a9-1da6c777c843/java:com.intellij.diff(MPS.ThirdParty/)" />
3936
<import index="87nw" ref="r:ca2ab6bb-f6e7-4c0f-a88c-b78b9b31fff3(de.slisson.mps.richtext.structure)" />
4037
<import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
4138
<import index="tp25" ref="r:00000000-0000-4000-0000-011c89590301(jetbrains.mps.lang.smodel.structure)" />
4239
<import index="bjdw" ref="r:4a23ef0d-9c2f-48a6-8597-fbdd5b11f792(jetbrains.mps.lang.generator.plan.structure)" />
4340
<import index="3a50" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide(MPS.Platform/)" />
4441
<import index="wyuk" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.components(MPS.Core/)" />
4542
<import index="jlff" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.vfs(MPS.IDEA/)" />
46-
<import index="yt4g" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.diff(MPS.IDEA/)" />
43+
<import index="yt4f" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.diff(MPS.IDEA/)" />
4744
<import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
4845
<import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
49-
<import index="phic" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.diff.requests(MPS.IDEA/)" />
46+
<import index="phib" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.diff.requests(MPS.IDEA/)" />
5047
<import index="rjhg" ref="49808fad-9d41-4b96-83fa-9231640f6b2b/java:org.junit(JUnit/)" />
5148
<import index="tpdw" ref="r:00000000-0000-4000-0000-011c895902d8(jetbrains.mps.baseLanguage.unitTest.generator.baseLanguage.template.main@generator)" />
5249
<import index="et5u" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.messages(MPS.Core/)" />
50+
<import index="2o8p" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.diff.contents(MPS.IDEA/)" />
5351
<import index="f4a4" ref="r:1d4f7f55-4fae-4dcb-9cb8-5924426f75d6(jetbrains.mps.tests@genplan)" implicit="true" />
5452
<import index="tbr6" ref="r:6a005c26-87c0-43c4-8cf3-49ffba1099df(de.slisson.mps.richtext.behavior)" implicit="true" />
5553
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />

‎code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/de.itemis.mps.editor.diagram.runtime.msd‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
<dependency reexport="false">5b1f863d-65a0-41a6-a801-33896be24202(jetbrains.mps.ide.editor)</dependency>
6565
<dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
6666
<dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
67-
<dependency reexport="false">39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty)</dependency>
6867
<dependency reexport="false">563a0770-eb88-4f4f-83ed-f708776fc2fe(de.itemis.stubs.batik)</dependency>
6968
<dependency reexport="false">ecfb9949-7433-4db5-85de-0f84d172e4ce(de.q60.mps.collections.libs)</dependency>
7069
</dependencies>
@@ -102,7 +101,6 @@
102101
<module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
103102
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
104103
<module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
105-
<module reference="39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty)" version="0" />
106104
<module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
107105
<module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
108106
<module reference="7b45fa94-2707-4a1a-9e6a-ce40c4aaf35a(de.itemis.mps.editor.collapsible.runtime)" version="0" />

‎code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/models/test/de/itemis/mps/editor/diagram/[email protected]‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
<import index="1njx" ref="1144260c-e9a5-49a2-9add-39a1a1a7077e/java:com.mxgraph.view(de.itemis.mps.editor.diagram.runtime/)" />
6363
<import index="2qld" ref="r:24bac084-437d-402d-b9a3-49599b18a0d1(de.itemis.mps.editor.diagram.structure)" />
6464
<import index="vux5" ref="r:d4785159-376e-4d99-a1d3-5a6f377de3e6(de.itemis.mps.editor.diagram.demo.activity.structure)" />
65-
<import index="ddhc" ref="39983771-4e9b-401b-a1a9-1da6c777c843/java:com.intellij.ide(MPS.ThirdParty/)" />
6665
</imports>
6766
<registry>
6867
<language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">

‎code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/test.de.itemis.mps.editor.diagram.solution.msd‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
<dependency reexport="false">8ca79d43-eb45-4791-bdd4-0d6130ff895b(de.itemis.mps.editor.diagram.layout)</dependency>
2121
<dependency reexport="false">b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)</dependency>
2222
<dependency reexport="false">fa13cc63-c476-4d46-9c96-d53670abe7bc(de.itemis.mps.editor.diagram)</dependency>
23-
<dependency reexport="false">39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty)</dependency>
2423
</dependencies>
2524
<languageVersions>
2625
<language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="1" />
@@ -57,7 +56,6 @@
5756
<module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
5857
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
5958
<module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
60-
<module reference="39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty)" version="0" />
6159
<module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
6260
<module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
6361
<module reference="7b45fa94-2707-4a1a-9e6a-ce40c4aaf35a(de.itemis.mps.editor.collapsible.runtime)" version="0" />

‎code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,64 @@
418418
</node>
419419
</node>
420420
</node>
421+
<node concept="15bAme" id="5MqMjndObm6" role="15bAlL">
422+
<property role="15bAli" value="Po4Z58tnOM/removed" />
423+
<node concept="2DRihI" id="5MqMjndObm7" role="15bAlk">
424+
<node concept="3oM_SD" id="5MqMjndObm8" role="1PaTwD">
425+
<property role="3oM_SC" value="MPS.ThirdParty" />
426+
</node>
427+
<node concept="3oM_SD" id="5MqMjndObm9" role="1PaTwD">
428+
<property role="3oM_SC" value="has" />
429+
</node>
430+
<node concept="3oM_SD" id="5MqMjndObma" role="1PaTwD">
431+
<property role="3oM_SC" value="been" />
432+
</node>
433+
<node concept="3oM_SD" id="5MqMjndObmb" role="1PaTwD">
434+
<property role="3oM_SC" value="removed" />
435+
</node>
436+
<node concept="3oM_SD" id="5MqMjndObmc" role="1PaTwD">
437+
<property role="3oM_SC" value="completely." />
438+
</node>
439+
<node concept="3oM_SD" id="5MqMjndObmd" role="1PaTwD">
440+
<property role="3oM_SC" value="MPS.IDEA" />
441+
</node>
442+
<node concept="3oM_SD" id="5MqMjndObrP" role="1PaTwD">
443+
<property role="3oM_SC" value="or" />
444+
</node>
445+
<node concept="3oM_SD" id="5MqMjndObrQ" role="1PaTwD">
446+
<property role="3oM_SC" value="MPS.IDEA.Modules" />
447+
</node>
448+
<node concept="3oM_SD" id="5MqMjndObrR" role="1PaTwD">
449+
<property role="3oM_SC" value="to" />
450+
</node>
451+
<node concept="3oM_SD" id="5MqMjndObrS" role="1PaTwD">
452+
<property role="3oM_SC" value="be" />
453+
</node>
454+
<node concept="3oM_SD" id="5MqMjndObrT" role="1PaTwD">
455+
<property role="3oM_SC" value="used" />
456+
</node>
457+
<node concept="3oM_SD" id="5MqMjndObrU" role="1PaTwD">
458+
<property role="3oM_SC" value="instead." />
459+
</node>
460+
<node concept="3oM_SD" id="5MqMjndObrV" role="1PaTwD">
461+
<property role="3oM_SC" value="" />
462+
</node>
463+
</node>
464+
</node>
465+
<node concept="15bAme" id="5MqMjndObme" role="15bAlL">
466+
<property role="15bAli" value="Po4Z58tnOI/deprecated" />
467+
<node concept="2DRihI" id="5MqMjndObmf" role="15bAlk">
468+
<node concept="3oM_SD" id="5MqMjndObmg" role="1PaTwD">
469+
<property role="3oM_SC" value="MPS.Kotlin" />
470+
</node>
471+
<node concept="3oM_SD" id="5MqMjndObmh" role="1PaTwD">
472+
<property role="3oM_SC" value="is" />
473+
</node>
474+
<node concept="3oM_SD" id="5MqMjndObmi" role="1PaTwD">
475+
<property role="3oM_SC" value="deprecated." />
476+
</node>
477+
</node>
478+
</node>
421479
</node>
422480
<node concept="15bmVD" id="4xFP9J_Gj2t" role="15bmVC">
423481
<node concept="15ShDW" id="4xFP9J_Gj2q" role="15bq2Y">

‎code/testing/solutions/nl.f1re.testing.examples/models/[email protected]‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,8 @@
5454
<import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" />
5555
<import index="px75" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.leftHighlighter(MPS.Editor/)" />
5656
<import index="6lvu" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.cellMenu(MPS.Editor/)" />
57-
<import index="fnpx" ref="39983771-4e9b-401b-a1a9-1da6c777c843/java:com.intellij.notification(MPS.ThirdParty/)" />
57+
<import index="fnpx" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.notification(MPS.IDEA/)" />
5858
<import index="alof" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.project(MPS.Platform/)" />
59-
<import index="fnpy" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.notification(MPS.IDEA/)" />
6059
<import index="tp5g" ref="r:00000000-0000-4000-0000-011c89590388(jetbrains.mps.lang.test.structure)" />
6160
<import index="kz9k" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.navigation(MPS.Editor/)" />
6261
<import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" />
@@ -2054,7 +2053,7 @@
20542053
<ref role="3cqZAo" node="6HRhZeXLKT7" resolve="notification" />
20552054
</node>
20562055
<node concept="liA8E" id="6HRhZeXLNH8" role="2OqNvi">
2057-
<ref role="37wK5l" to="fnpy:~Notification.getTitle()" resolve="getTitle" />
2056+
<ref role="37wK5l" to="fnpx:~Notification.getTitle()" resolve="getTitle" />
20582057
</node>
20592058
</node>
20602059
</node>
@@ -2067,7 +2066,7 @@
20672066
<ref role="3cqZAo" node="6HRhZeXLKT7" resolve="notification" />
20682067
</node>
20692068
<node concept="liA8E" id="6HRhZeXLNHd" role="2OqNvi">
2070-
<ref role="37wK5l" to="fnpy:~Notification.getContent()" resolve="getContent" />
2069+
<ref role="37wK5l" to="fnpx:~Notification.getContent()" resolve="getContent" />
20712070
</node>
20722071
</node>
20732072
</node>
@@ -2077,12 +2076,12 @@
20772076
<ref role="3cqZAo" node="6HRhZeXLKT7" resolve="notification" />
20782077
</node>
20792078
<node concept="liA8E" id="6HRhZeXLNHh" role="2OqNvi">
2080-
<ref role="37wK5l" to="fnpy:~Notification.getType()" resolve="getType" />
2079+
<ref role="37wK5l" to="fnpx:~Notification.getType()" resolve="getType" />
20812080
</node>
20822081
</node>
20832082
<node concept="Rm8GO" id="6HRhZeXLNHi" role="3tpDZB">
2084-
<ref role="Rm8GQ" to="fnpy:~NotificationType.INFORMATION" resolve="INFORMATION" />
2085-
<ref role="1Px2BO" to="fnpy:~NotificationType" resolve="NotificationType" />
2083+
<ref role="Rm8GQ" to="fnpx:~NotificationType.INFORMATION" resolve="INFORMATION" />
2084+
<ref role="1Px2BO" to="fnpx:~NotificationType" resolve="NotificationType" />
20862085
</node>
20872086
</node>
20882087
</node>

‎code/testing/solutions/nl.f1re.testing.examples/nl.f1re.testing.examples.msd‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
<dependency reexport="false">d7a92d38-f7db-40d0-8431-763b0c3c9f20(jetbrains.mps.lang.intentions)</dependency>
2020
<dependency reexport="false">87e083b3-d1b3-4c3f-9d8c-b24d74710f49(nl.f1re.testing.examples.lang)</dependency>
2121
<dependency reexport="false">707c4fde-f79a-44b5-b3d7-b5cef8844ccf(jetbrains.mps.lang.test.runtime)</dependency>
22-
<dependency reexport="false">39983771-4e9b-401b-a1a9-1da6c777c843(MPS.ThirdParty)</dependency>
2322
<dependency reexport="false">215c4c45-ba99-49f5-9ab7-4b6901a63cfd(MPS.Generator)</dependency>
2423
<dependency reexport="false">c6420b75-4569-420d-aaf7-9bc590ad7b2a(de.itemis.mps.comparator)</dependency>
2524
<dependency reexport="false">73a71448-99c6-4925-ae2a-2cb0801adee3(jetbrains.mps.ide.tools.todo)</dependency>

0 commit comments

Comments
 (0)