Skip to content

Commit d017903

Browse files
sergej-koscejevsergej-koscejev
committed
integration-test: migrate test projects to MPS 2023.2
1 parent bd0951f commit d017903

File tree

29 files changed

+110
-76
lines changed

29 files changed

+110
-76
lines changed

‎test-projects/execute-method/.mps/migration.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project version="4">
3+
<component name="MigrationProperties">
4+
<entry key="jetbrains.mps.ide.mpsmigration.v191.SaveAllJavaStubMethodRefsToShortForeignFormat" value="executed" />
5+
<entry key="jetbrains.mps.ide.mpsmigration.v191.UpdateJavaStubMethodRefs" value="executed" />
6+
<entry key="jetbrains.mps.ide.mpsmigration.v_2019_3.DefaultFacetExplicitPersistence" value="executed" />
7+
<entry key="jetbrains.mps.ide.mpsmigration.v_2021_2.SplitMPSCoreStub" value="executed" />
8+
<entry key="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
9+
<entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.ExplicitJavaFacetSettings" value="executed" />
10+
<entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
11+
<entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
12+
<entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
13+
<entry key="project.migrated.version" value="232" />
14+
</component>
15+
</project>

‎test-projects/execute-method/.mps/vcs.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project version="4">
33
<component name="VcsDirectoryMappings">
4-
<mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
4+
<mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
55
</component>
66
</project>

‎test-projects/execute-method/solutions/my.solution/models/my.solution.java.mps‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<child id="1068581517665" name="statement" index="3cqZAp" />
5252
</concept>
5353
<concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
54-
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
54+
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
5555
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
5656
<child id="1068499141038" name="actualArgument" index="37wK5m" />
5757
</concept>
@@ -61,13 +61,13 @@
6161
<concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
6262
<reference id="1107535924139" name="classifier" index="3uigEE" />
6363
</concept>
64-
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
64+
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
6565
<child id="1178549979242" name="visibility" index="1B3o_S" />
6666
</concept>
6767
<concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
6868
</language>
6969
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
70-
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
70+
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
7171
<property id="1169194664001" name="name" index="TrG5h" />
7272
</concept>
7373
</language>

‎test-projects/execute-method/solutions/my.solution/my.solution.msd‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,23 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<solution name="my.solution" uuid="468a495b-8ea4-49d8-b365-3c92887c30e0" moduleVersion="0" compileInMPS="true">
2+
<solution name="my.solution" uuid="468a495b-8ea4-49d8-b365-3c92887c30e0" moduleVersion="0">
33
<models>
44
<modelRoot contentPath="${module}" type="default">
55
<sourceRoot location="models" />
66
</modelRoot>
77
</models>
88
<facets>
9-
<facet type="java">
9+
<facet type="java" compile="mps" classes="mps" ext="no">
1010
<classes generated="true" path="${module}/classes_gen" />
1111
</facet>
1212
</facets>
13-
<sourcePath />
1413
<dependencies>
1514
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
1615
<dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
1716
</dependencies>
1817
<languageVersions>
1918
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
2019
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
21-
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
20+
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
2221
<language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
2322
<language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
2423
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />

‎test-projects/generate-build-solution/.mps/migration.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,12 @@
55
<entry key="jetbrains.mps.ide.mpsmigration.v191.SaveAllJavaStubMethodRefsToShortForeignFormat" value="executed" />
66
<entry key="jetbrains.mps.ide.mpsmigration.v191.UpdateJavaStubMethodRefs" value="executed" />
77
<entry key="jetbrains.mps.ide.mpsmigration.v_2019_3.DefaultFacetExplicitPersistence" value="executed" />
8+
<entry key="jetbrains.mps.ide.mpsmigration.v_2021_2.SplitMPSCoreStub" value="executed" />
9+
<entry key="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
10+
<entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.ExplicitJavaFacetSettings" value="executed" />
11+
<entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
12+
<entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
13+
<entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
14+
<entry key="project.migrated.version" value="232" />
815
</component>
916
</project>

‎test-projects/generate-build-solution/.mps/vcs.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project version="4">
33
<component name="VcsDirectoryMappings">
4-
<mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
4+
<mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
55
</component>
66
</project>

‎test-projects/generate-build-solution/solutions/my.build/models/script.mps‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@
4040
<child id="5617550519002745378" name="macros" index="1l3spd" />
4141
<child id="5617550519002745372" name="layout" index="1l3spN" />
4242
</concept>
43-
<concept id="4701820937132344003" name="jetbrains.mps.build.structure.BuildLayout_Container" flags="ng" index="1y1bJS">
43+
<concept id="4701820937132344003" name="jetbrains.mps.build.structure.BuildLayout_Container" flags="ngI" index="1y1bJS">
4444
<child id="7389400916848037006" name="children" index="39821P" />
4545
</concept>
4646
</language>
4747
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
48-
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
48+
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
4949
<property id="1169194664001" name="name" index="TrG5h" />
5050
</concept>
5151
</language>

‎test-projects/generate-build-solution/solutions/my.build/my.build.msd‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<solution name="my.build" uuid="a4deeaa8-8bf4-485e-b06c-d772b56fee6a" moduleVersion="0" compileInMPS="true">
2+
<solution name="my.build" uuid="a4deeaa8-8bf4-485e-b06c-d772b56fee6a" moduleVersion="0">
33
<models>
44
<modelRoot contentPath="${module}" type="default">
55
<sourceRoot location="models" />
66
</modelRoot>
77
</models>
88
<facets>
9-
<facet type="java">
9+
<facet type="java" compile="mps" classes="mps" ext="no">
1010
<classes generated="true" path="${module}/classes_gen" />
1111
</facet>
1212
</facets>
13-
<sourcePath />
1413
<dependencies>
1514
<dependency reexport="false">422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)</dependency>
1615
</dependencies>

‎test-projects/generate-build-solution/solutions/my.solution/models/java.mps‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<child id="1068581517665" name="statement" index="3cqZAp" />
5252
</concept>
5353
<concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
54-
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
54+
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
5555
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
5656
<child id="1068499141038" name="actualArgument" index="37wK5m" />
5757
</concept>
@@ -61,13 +61,13 @@
6161
<concept id="7812454656619025416" name="jetbrains.mps.baseLanguage.structure.MethodDeclaration" flags="ng" index="1rXfSm">
6262
<property id="8355037393041754995" name="isNative" index="2aFKle" />
6363
</concept>
64-
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
64+
<concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
6565
<child id="1178549979242" name="visibility" index="1B3o_S" />
6666
</concept>
6767
<concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
6868
</language>
6969
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
70-
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
70+
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
7171
<property id="1169194664001" name="name" index="TrG5h" />
7272
</concept>
7373
</language>

‎test-projects/generate-build-solution/solutions/my.solution/my.solution.msd‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,29 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<solution name="my.solution" uuid="b1f17f16-1c8d-4491-a51a-0a9b3adf1bef" moduleVersion="0" compileInMPS="true">
2+
<solution name="my.solution" uuid="b1f17f16-1c8d-4491-a51a-0a9b3adf1bef" moduleVersion="0">
33
<models>
44
<modelRoot contentPath="${module}" type="default">
55
<sourceRoot location="models" />
66
</modelRoot>
77
</models>
88
<facets>
9-
<facet type="java">
9+
<facet type="java" compile="mps" classes="mps" ext="no">
1010
<classes generated="true" path="${module}/classes_gen" />
1111
</facet>
1212
</facets>
13-
<sourcePath />
1413
<dependencies>
1514
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
1615
</dependencies>
1716
<languageVersions>
18-
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />
17+
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
1918
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
20-
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
19+
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
2120
<language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
2221
<language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
2322
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
2423
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
2524
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
2625
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
27-
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="18" />
26+
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
2827
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
2928
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
3029
</languageVersions>

0 commit comments

Comments
 (0)