Skip to content

Changes necessary to compile mps-extension with MPS 2025.3 #1633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sergej-koscejev merged 2 commits into from
Oct 20, 2025
Merged

Changes necessary to compile mps-extension with MPS 2025.3 #1633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5154ef2
[MPS 2025.3] Use AsyncDns from okhttp lib to test MPS.ThirdParty
fisakov Oct 20, 2025
02ce7e0
[MPS 2025.3] Use TreeMultiMap from de.q60.mps.collections.libs
fisakov Oct 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .../build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14532,6 +14532,9 @@
<node concept="m$_yC" id="4TTyUQxowCT" role="m$_yJ">
<ref role="m$_y1" node="hCVXosGNJH" resolve="com.mbeddr.mpsutil.modellisteners" />
</node>
<node concept="m$_yC" id="5T38oZcF9H$" role="m$_yJ">
<ref role="m$_y1" node="2OJNL7ElZsF" resolve="de.q60.mps.collections.libs" />
</node>
</node>
<node concept="2G$12M" id="3quoVcnLGky" role="3989C9">
<property role="TrG5h" value="group.intentions" />
Expand Down Expand Up @@ -14772,6 +14775,11 @@
<ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
</node>
</node>
<node concept="1SiIV0" id="5T38oZcESDY" role="3bR37C">
<node concept="3bR9La" id="5T38oZcESDZ" role="1SiIV1">
<ref role="3bR37D" node="6fQhGuklQWU" resolve="de.q60.mps.collections.libs" />
</node>
</node>
</node>
</node>
<node concept="m$_wf" id="hCVXosGNJH" role="3989C9">
Expand Down
2 changes: 2 additions & 0 deletions ...tionsmenu/com.mbeddr.mpsutil.intentions.runtime/com.mbeddr.mpsutil.intentions.runtime.msd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<dependency reexport="false">3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)</dependency>
<dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
<dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
<dependency reexport="false">ecfb9949-7433-4db5-85de-0f84d172e4ce(de.q60.mps.collections.libs)</dependency>
</dependencies>
<languageVersions>
<language slang="l:654422bf-e75f-44dc-936d-188890a746ce:de.slisson.mps.reflection" version="0" />
Expand Down Expand Up @@ -53,6 +54,7 @@
<module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
<module reference="b92f861d-0184-446d-b88b-6dcf0e070241(com.mbeddr.mpsutil.intentions)" version="0" />
<module reference="4bff7bbe-ce5f-432e-84bf-60809cb9987c(com.mbeddr.mpsutil.intentions.runtime)" version="0" />
<module reference="ecfb9949-7433-4db5-85de-0f84d172e4ce(de.q60.mps.collections.libs)" version="0" />
<module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
<module reference="443f4c36-fcf5-4eb6-9500-8d06ed259e3e(jetbrains.mps.baseLanguage.classifiers)" version="0" />
<module reference="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67(jetbrains.mps.baseLanguage.lightweightdsl)" version="0" />
Expand Down
2 changes: 1 addition & 1 deletion ...nu/com.mbeddr.mpsutil.intentions.runtime/models/com/mbeddr/mpsutil/intentions/runtime.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
<import index="ev0w" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.typechecking.backend(MPS.Core/)" />
<import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
<import index="7oz1" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.configuration(MPS.Editor/)" />
<import index="3o3z" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.google.common.collect(MPS.IDEA/)" />
<import index="zn9m" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.util(MPS.IDEA/)" />
<import index="3o3z" ref="ecfb9949-7433-4db5-85de-0f84d172e4ce/java:com.google.common.collect(de.q60.mps.collections.libs/)" />
<import index="9j2l" ref="r:acd2b506-390d-4e84-8c47-cd8fb8c9e0c0(com.mbeddr.mpsutil.intentions.behavior)" implicit="true" />
</imports>
<registry>
Expand Down
6 changes: 3 additions & 3 deletions code/third-party/solutions/third.party.usage.test/models/third.party.usage.test.mdl.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
</languages>
<imports>
<import index="lhlt" ref="39983771-4e9b-401b-a1a9-1da6c777c843/java:com.fasterxml.jackson.databind.node(MPS.ThirdParty/)" />
<import index="gwgf" ref="39983771-4e9b-401b-a1a9-1da6c777c843/java:okhttp3(MPS.ThirdParty/)" />
</imports>
<registry>
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
Expand Down Expand Up @@ -35,10 +35,10 @@
<property role="TrG5h" value="UseStuffFromAppJar" />
<node concept="3Tm1VV" id="6wECU8wtfQI" role="1B3o_S" />
<node concept="312cEg" id="6wECU8wtfTh" role="jymVt">
<property role="TrG5h" value="jacksonStuff" />
<property role="TrG5h" value="okhttpStuff" />
<node concept="3Tm1VV" id="6wECU8wtfSU" role="1B3o_S" />
<node concept="3uibUv" id="6yNnJSJYgI_" role="1tU5fm">
<ref role="3uigEE" to="lhlt:~ArrayNode" resolve="ArrayNode" />
<ref role="3uigEE" to="gwgf:~AsyncDns" resolve="AsyncDns" />
</node>
</node>
</node>
Expand Down
5 changes: 1 addition & 4 deletions scripts/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@

<path id="path.mps.ant.path">
<pathelement location="${artifacts.mps}/lib/ant/lib/ant-mps.jar" />
<fileset dir="${artifacts.IDEA}/lib">
<include name="util-8.jar" />
</fileset>
<pathelement location="${artifacts.IDEA}/lib/util-8.jar" />
</path>

<taskdef resource="jetbrains/mps/build/ant/antlib.xml" classpathref="path.mps.ant.path" />
Expand Down Expand Up @@ -116,7 +114,6 @@
<jvmargs>
<arg value="-ea" />
<arg value="-Xmx2024m" />
<arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
</jvmargs>
<macro name="mps.home" path="${mps.home}" />
<macro name="extensions.home" path="${extensions.home}" />
Expand Down