Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ The project does _not_ follow Semantic Versioning and the changes are documented

### Fixed

- Updated API for build.gentests and junit.interpreter.run.configuration
- Variability: In the configuration editor, pressing Return/Enter anywhere will create an empty line after the configuration. Pressing Shift-Return/Enter on the header line of a configuration will create an empty line before the configuration.

### Removed
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def minor = "9"



ext.mpsVersion = "252.18003.155"
ext.mpsVersion = "252.25557.10320"
def mpsQAVersion = "$major.$minor+"


Expand Down
7 changes: 1 addition & 6 deletions build/scripts/build-allScripts.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,7 @@

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

<taskdef resource="jetbrains/mps/build/ant/antlib.xml" classpathref="path.mps.ant.path" />
Expand Down Expand Up @@ -140,7 +138,6 @@
<jvmargs>
<arg value="-ea" />
<arg value="-Xmx512m" />
<arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
</jvmargs>
<macro name="iets3.github.opensource.home" path="${iets3.github.opensource.home}" />
<macro name="mps.home" path="${mps.home}" />
Expand Down Expand Up @@ -223,7 +220,6 @@
<fileset file="${artifacts.mps}/lib/testFramework.jar" />
<fileset file="${artifacts.mps}/lib/stats.jar" />
<fileset file="${artifacts.mps}/lib/platform-loader.jar" />
<fileset file="${artifacts.mps}/lib/trove.jar" />
<fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
<fileset file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.jar" />
Expand Down Expand Up @@ -295,7 +291,6 @@
<fileset file="${artifacts.mps}/lib/testFramework.jar" />
<fileset file="${artifacts.mps}/lib/stats.jar" />
<fileset file="${artifacts.mps}/lib/platform-loader.jar" />
<fileset file="${artifacts.mps}/lib/trove.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
<fileset file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.jar" />
<fileset file="${artifacts.mps}/plugins/mps-build/languages/build/jetbrains.mps.build.mps.jar" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@
<import index="oq0c" ref="r:6c6155f0-4bbe-4af5-8c26-244d570e21e4(org.iets3.core.expr.base.plugin)" />
<import index="wyuk" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.components(MPS.Core/)" />
<import index="3a50" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide(MPS.Platform/)" />
<import index="xfg9" ref="r:ac28053f-2041-47f6-806b-ecfaca05a64a(org.iets3.core.expr.base.runtime.runtime)" />
<import index="gdgh" ref="r:e4d9478b-ae0e-416e-be60-73d136571015(org.iets3.core.base.behavior)" implicit="true" />
<import index="87nw" ref="r:ca2ab6bb-f6e7-4c0f-a88c-b78b9b31fff3(de.slisson.mps.richtext.structure)" implicit="true" />
<import index="xfg9" ref="r:ac28053f-2041-47f6-806b-ecfaca05a64a(org.iets3.core.expr.base.runtime.runtime)" implicit="true" />
<import index="vs0r" ref="r:f7764ca4-8c75-4049-922b-08516400a727(com.mbeddr.core.base.structure)" implicit="true" />
<import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
</imports>
Expand Down
15 changes: 8 additions & 7 deletions ...pr.genjava.toplevel/generator/template/[email protected]
Original file line number Diff line number Diff line change
Expand Up @@ -811,7 +811,7 @@
<node concept="3aamgX" id="4f5wuCuX26u" role="3acgRq">
<property role="36QftV" value="true" />
<ref role="30HIoZ" to="yv47:49WTic8f4iz" resolve="Function" />
<ref role="2sgKRv" node="2qRo6DhZXuC" resolve="Funktion" />
<ref role="2sgKRv" node="2qRo6DhZXuC" resolve="Function" />
<node concept="j$656" id="EpsWA8hv5C" role="1lVwrX">
<ref role="v9R2y" node="1z6mtoTjc17" resolve="Function_NonExt" />
</node>
Expand Down Expand Up @@ -917,7 +917,7 @@
</node>
</node>
<node concept="2rT7sh" id="2qRo6DhZXuC" role="2rTMjI">
<property role="TrG5h" value="Funktion" />
<property role="TrG5h" value="Function" />
<ref role="2rZz_L" to="tpee:fIYIFWa" resolve="StaticMethodDeclaration" />
<ref role="2rTdP9" to="zzzn:49WTic8eSCJ" resolve="IFunctionLike" />
</node>
Expand Down Expand Up @@ -1117,7 +1117,7 @@
<node concept="2OqwBi" id="4Qs0nZjoISU" role="3clFbG">
<node concept="1iwH7S" id="4Qs0nZjoISV" role="2Oq$k0" />
<node concept="1iwH70" id="4Qs0nZjoISW" role="2OqNvi">
<ref role="1iwH77" node="2qRo6DhZXuC" resolve="Funktion" />
<ref role="1iwH77" node="2qRo6DhZXuC" resolve="Function" />
<node concept="2OqwBi" id="4Qs0nZjoISX" role="1iwH7V">
<node concept="30H73N" id="4Qs0nZjoISY" role="2Oq$k0" />
<node concept="3TrEf2" id="4Qs0nZjoJXd" role="2OqNvi">
Expand Down Expand Up @@ -1145,7 +1145,7 @@
<node concept="2OqwBi" id="4Qs0nZjoKT_" role="2Oq$k0">
<node concept="1iwH7S" id="4Qs0nZjoKTA" role="2Oq$k0" />
<node concept="1iwH70" id="4Qs0nZjoKTB" role="2OqNvi">
<ref role="1iwH77" node="2qRo6DhZXuC" resolve="Funktion" />
<ref role="1iwH77" node="2qRo6DhZXuC" resolve="Function" />
<node concept="2OqwBi" id="4Qs0nZjoKTC" role="1iwH7V">
<node concept="30H73N" id="4Qs0nZjoKTD" role="2Oq$k0" />
<node concept="3TrEf2" id="4Qs0nZjoKTE" role="2OqNvi">
Expand Down Expand Up @@ -3079,7 +3079,7 @@
<node concept="2OqwBi" id="VXV$b4aYxE" role="3clFbG">
<node concept="1iwH7S" id="VXV$b4aY7_" role="2Oq$k0" />
<node concept="1iwH70" id="VXV$b4aZ9Q" role="2OqNvi">
<ref role="1iwH77" node="2qRo6DhZXuC" resolve="Funktion" />
<ref role="1iwH77" node="2qRo6DhZXuC" resolve="Function" />
<node concept="2OqwBi" id="VXV$b4aZJN" role="1iwH7V">
<node concept="30H73N" id="VXV$b4aZtb" role="2Oq$k0" />
<node concept="3TrEf2" id="VXV$b4b051" role="2OqNvi">
Expand Down Expand Up @@ -6444,7 +6444,6 @@
<node concept="2tJIrI" id="6I2TeLIbZeS" role="jymVt">
<node concept="5jKBG" id="1z6mtoTjDTm" role="lGtFl">
<ref role="v9R2y" node="1z6mtoTjc17" resolve="Function_NonExt" />
<ref role="2rW$FS" node="2qRo6DhZXuC" resolve="Funktion" />
</node>
</node>
<node concept="3Tm1VV" id="6I2TeLIbZes" role="1B3o_S" />
Expand Down Expand Up @@ -8306,7 +8305,9 @@
</node>
</node>
</node>
<node concept="raruj" id="1z6mtoTj_FW" role="lGtFl" />
<node concept="raruj" id="1z6mtoTj_FW" role="lGtFl">
<ref role="2sdACS" node="2qRo6DhZXuC" resolve="Function" />
</node>
<node concept="3cqZAl" id="EpsWA8jTUC" role="3clF45">
<node concept="5jKBG" id="EpsWA8jUex" role="lGtFl">
<ref role="v9R2y" node="EpsWA8jRsw" resolve="Function_ReturnType" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@
<dependency reexport="false">cbb71b24-470d-4374-b77c-ebd0d3b3bb27(org.iets3.core.expr.plugin)</dependency>
<dependency reexport="false">34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)</dependency>
<dependency reexport="false">52a8c4c0-f4b0-4243-bf00-9dfac3472876(org.iets3.core.expr.simpleTypes.runtime)</dependency>
<dependency reexport="false">49808fad-9d41-4b96-83fa-9231640f6b2b(JUnit)</dependency>
</dependencies>
<languageVersions>
<language slang="l:f3b3dc28-fee3-49e1-a46e-685e96389094:com.mbeddr.mpsutil.bldoc" version="0" />
Expand Down
6 changes: 5 additions & 1 deletion ...tests/generator/template/[email protected]
Original file line number Diff line number Diff line change
Expand Up @@ -1516,7 +1516,11 @@
<ref role="37wK5l" to="o3n2:7Fhemu9T7D3" resolve="DependenciesHelper" />
<ref role="1Y3XeK" to="o3n2:41__iZjkZ0W" resolve="DependenciesHelper" />
<node concept="3Tm1VV" id="4nDalG8RlP2" role="1B3o_S" />
<node concept="1iwH7S" id="2TqXzNe_cVu" role="37wK5m" />
<node concept="2YIFZM" id="7u3RhgSjtme" role="37wK5m">
<ref role="37wK5l" to="o3n2:19KdqCVerNJ" resolve="defaultContext" />
<ref role="1Pybhc" to="o3n2:4jjtc7WZOAv" resolve="Context" />
<node concept="1iwH7S" id="3_LUYfhyHE0" role="37wK5m" />
</node>
<node concept="37vLTw" id="akLgX4mP8t" role="37wK5m">
<ref role="3cqZAo" node="63InNWG5ay7" resolve="project" />
</node>
Expand Down
Loading