Skip to content
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.

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

Migrate to 2022.3 #19

Merged
merged 10 commits into from
Oct 8, 2023
5 changes: 3 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,15 @@ ext.jdk_home = jdk_home

ext.dependencyRepositories = [
'https://maven.pkg.github.com/mbeddr/*',
'https://artifacts.itemis.cloud/repository/maven-mps/'
]

// Dependency versions
ext.mpsVersion = '2022.2'
ext.mpsVersion = '2022.3'

// Project versions
ext.major = '2022'
ext.minor = '2'
ext.minor = '3'

if (ciBuild) {
String branch = GitBasedVersioning.gitBranch
Expand Down
6 changes: 4 additions & 2 deletions build/scripts/build_all_scripts.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
<pathelement location="${artifacts.mps}/lib/ant/lib/ant-mps.jar" />
<fileset dir="${artifacts.mps}/lib">
<include name="util.jar" />
<include name="3rd-party-rt.jar" />
</fileset>
</path>

Expand Down Expand Up @@ -145,7 +144,6 @@
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.javadoc.jar" />
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jdk7.jar" />
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jdk8.jar" />
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.references.runtime.jar" />
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.jar" />
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
Expand Down Expand Up @@ -208,6 +206,9 @@
<library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.dataFlow.runtime.jar" />
<library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.findUsages.runtime.jar" />
<library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.behavior.api.jar" />
<library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.feedback.context.jar" />
<library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.feedback.problem.legacy-constraints.jar" />
<library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.feedback.problem.rt.jar" />
<library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.migration.runtime.jar" />
<library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.lang.smodel.query.runtime.jar" />
<library file="${artifacts.mps}/languages/runtimes/jetbrains.mps.refactoring.runtime.jar" />
Expand All @@ -229,6 +230,7 @@
<jvmargs>
<arg value="-ea" />
<arg value="-Xmx1024m" />
<arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
</jvmargs>
<macro name="mps.home" path="${mps.home}" />
<macro name="mpsqa.home" path="${mpsqa.home}" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,13 @@
<project version="4">
<component name="MigrationProperties">
<entry key="jetbrains.mps.ide.mpsmigration.v182.ReapplyPatternMigration" value="executed" />
<entry key="jetbrains.mps.ide.mpsmigration.v191.SaveAllJavaStubMethodRefsToShortForeignFormat" value="executed" />
<entry key="jetbrains.mps.ide.mpsmigration.v191.UpdateJavaStubMethodRefs" value="executed" />
<entry key="jetbrains.mps.ide.mpsmigration.v_2019_3.DefaultFacetExplicitPersistence" value="executed" />
<entry key="jetbrains.mps.ide.mpsmigration.v_2021_2.SplitMPSCoreStub" value="executed" />
<entry key="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
<entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.ExplicitJavaFacetSettings" value="executed" />
<entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
<entry key="project.migrated.version" value="223" />
</component>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
</imports>
<registry>
<language id="3600cb0a-44dd-4a5b-9968-22924406419e" name="jetbrains.mps.build.mps.tests">
<concept id="4560297596904469357" name="jetbrains.mps.build.mps.tests.structure.BuildMpsLayout_TestModules" flags="nn" index="22LTRH">
<concept id="4560297596904469357" name="jetbrains.mps.build.mps.tests.structure.BuildAspect_MpsTestModules" flags="nn" index="22LTRH">
<child id="4560297596904469360" name="modules" index="22LTRK" />
<child id="6593674873639474544" name="options" index="24cAkG" />
</concept>
<concept id="4560297596904469362" name="jetbrains.mps.build.mps.tests.structure.BuildMpsLayout_TestModule" flags="nn" index="22LTRM">
<concept id="4560297596904469362" name="jetbrains.mps.build.mps.tests.structure.BuildMps_TestModule" flags="nn" index="22LTRM">
<reference id="4560297596904469363" name="module" index="22LTRN" />
</concept>
<concept id="6593674873639474400" name="jetbrains.mps.build.mps.tests.structure.BuildMpsLayout_TestModules_Options" flags="ng" index="24cAiW" />
<concept id="6593674873639474400" name="jetbrains.mps.build.mps.tests.structure.BuildMps_TestModules_Options" flags="ng" index="24cAiW" />
<concept id="4005526075820600484" name="jetbrains.mps.build.mps.tests.structure.BuildModuleTestsPlugin" flags="ng" index="1gjT0q" />
</language>
<language id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
<sourceRoot location="models" />
</modelRoot>
</models>
<facets>
<facet compile="mps" classes="mps" ext="no" type="java">
<classes generated="true" path="${module}/classes_gen" />
</facet>
</facets>
<sourcePath />
<dependencies>
<dependency reexport="false">cf9e90bb-6263-4505-b1d0-f6a2339ece89(org.mpsqa.clones.build)</dependency>
Expand All @@ -14,7 +19,7 @@
<language slang="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" version="0" />
<language slang="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" version="7" />
<language slang="l:3600cb0a-44dd-4a5b-9968-22924406419e:jetbrains.mps.build.mps.tests" version="1" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
</languageVersions>
<dependencyVersions>
<module reference="422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)" version="0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
<model ref="r:b5f6f685-e641-4e79-861c-1be9b77a62b8(org.mpsqa.clones.demo.config._010_headless_runner@tests)">
<persistence version="9" />
<languages>
<use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
<use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
<use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
<use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
</languages>
<imports>
<import index="f4mj" ref="r:87c69567-b194-437c-b9e6-0ce2770f06d2(org.mpsqa.clones.config.pluginSolution.utils)" />
Expand All @@ -21,6 +22,7 @@
</concept>
<concept id="1225467090849" name="jetbrains.mps.lang.test.structure.ProjectExpression" flags="nn" index="1jxXqW" />
<concept id="1216913645126" name="jetbrains.mps.lang.test.structure.NodesTestCase" flags="lg" index="1lH9Xt">
<property id="2616911529524314943" name="accessMode" index="3DII0k" />
<child id="1217501895093" name="testMethods" index="1SL9yI" />
</concept>
<concept id="1225978065297" name="jetbrains.mps.lang.test.structure.SimpleNodeTest" flags="ng" index="1LZb2c" />
Expand Down Expand Up @@ -73,11 +75,8 @@
<concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
<reference id="1107535924139" name="classifier" index="3uigEE" />
</concept>
<concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
<property id="6329021646629104958" name="text" index="3SKdUp" />
</concept>
<concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
<child id="6329021646629175155" name="commentPart" index="3SKWNk" />
<child id="8356039341262087992" name="line" index="1aUNEU" />
</concept>
</language>
<language id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi">
Expand Down Expand Up @@ -111,6 +110,14 @@
<property id="1169194664001" name="name" index="TrG5h" />
</concept>
</language>
<language id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text">
<concept id="155656958578482948" name="jetbrains.mps.lang.text.structure.Word" flags="nn" index="3oM_SD">
<property id="155656958578482949" name="value" index="3oM_SC" />
</concept>
<concept id="2535923850359271782" name="jetbrains.mps.lang.text.structure.Line" flags="nn" index="1PaTwC">
<child id="2535923850359271783" name="elements" index="1PaTwD" />
</concept>
</language>
<language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
<concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
<child id="1151688676805" name="elementType" index="_ZDj9" />
Expand All @@ -120,6 +127,7 @@
</registry>
<node concept="1lH9Xt" id="6dJ4vxiTQh_">
<property role="TrG5h" value="HeadlessRunner" />
<property role="3DII0k" value="2hh8MJdVwqX/command" />
<node concept="1LZb2c" id="7YZJmepzqZz" role="1SL9yI">
<property role="TrG5h" value="run_clones_headless" />
<node concept="3cqZAl" id="7YZJmepzqZ$" role="3clF45" />
Expand All @@ -141,7 +149,7 @@
<node concept="2OqwBi" id="7YZJmepB4S5" role="Vysub">
<node concept="1jxXqW" id="7YZJmepB4GZ" role="2Oq$k0" />
<node concept="liA8E" id="7YZJmepB5wq" role="2OqNvi">
<ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
<ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
</node>
</node>
</node>
Expand Down Expand Up @@ -175,13 +183,86 @@
</node>
<node concept="3clFbH" id="6dJ4vxiU2xr" role="3cqZAp" />
<node concept="3SKdUt" id="6dJ4vxiU2I5" role="3cqZAp">
<node concept="3SKdUq" id="6dJ4vxiU2I7" role="3SKWNk">
<property role="3SKdUp" value="if the clones detection config has as postprocessor the &quot;filtering of new clones w.r.t. baseline&quot;, then our test " />
<node concept="1PaTwC" id="4G8aeOH2reC" role="1aUNEU">
<node concept="3oM_SD" id="4G8aeOH2reD" role="1PaTwD">
<property role="3oM_SC" value="if" />
</node>
<node concept="3oM_SD" id="4G8aeOH2reE" role="1PaTwD">
<property role="3oM_SC" value="the" />
</node>
<node concept="3oM_SD" id="4G8aeOH2reF" role="1PaTwD">
<property role="3oM_SC" value="clones" />
</node>
<node concept="3oM_SD" id="4G8aeOH2reG" role="1PaTwD">
<property role="3oM_SC" value="detection" />
</node>
<node concept="3oM_SD" id="4G8aeOH2reH" role="1PaTwD">
<property role="3oM_SC" value="config" />
</node>
<node concept="3oM_SD" id="4G8aeOH2reI" role="1PaTwD">
<property role="3oM_SC" value="has" />
</node>
<node concept="3oM_SD" id="4G8aeOH2reJ" role="1PaTwD">
<property role="3oM_SC" value="as" />
</node>
<node concept="3oM_SD" id="4G8aeOH2reK" role="1PaTwD">
<property role="3oM_SC" value="postprocessor" />
</node>
<node concept="3oM_SD" id="4G8aeOH2reL" role="1PaTwD">
<property role="3oM_SC" value="the" />
</node>
<node concept="3oM_SD" id="4G8aeOH2reM" role="1PaTwD">
<property role="3oM_SC" value="&quot;filtering" />
</node>
<node concept="3oM_SD" id="4G8aeOH2reN" role="1PaTwD">
<property role="3oM_SC" value="of" />
</node>
<node concept="3oM_SD" id="4G8aeOH2reO" role="1PaTwD">
<property role="3oM_SC" value="new" />
</node>
<node concept="3oM_SD" id="4G8aeOH2reP" role="1PaTwD">
<property role="3oM_SC" value="clones" />
</node>
<node concept="3oM_SD" id="4G8aeOH2reQ" role="1PaTwD">
<property role="3oM_SC" value="w.r.t." />
</node>
<node concept="3oM_SD" id="4G8aeOH2reR" role="1PaTwD">
<property role="3oM_SC" value="baseline&quot;," />
</node>
<node concept="3oM_SD" id="4G8aeOH2reS" role="1PaTwD">
<property role="3oM_SC" value="then" />
</node>
<node concept="3oM_SD" id="4G8aeOH2reT" role="1PaTwD">
<property role="3oM_SC" value="our" />
</node>
<node concept="3oM_SD" id="4G8aeOH2reU" role="1PaTwD">
<property role="3oM_SC" value="test" />
</node>
</node>
</node>
<node concept="3SKdUt" id="6dJ4vxiU3cL" role="3cqZAp">
<node concept="3SKdUq" id="6dJ4vxiU3cN" role="3SKWNk">
<property role="3SKdUp" value="will fail if new clones are detected " />
<node concept="1PaTwC" id="4G8aeOH2reV" role="1aUNEU">
<node concept="3oM_SD" id="4G8aeOH2reW" role="1PaTwD">
<property role="3oM_SC" value="will" />
</node>
<node concept="3oM_SD" id="4G8aeOH2reX" role="1PaTwD">
<property role="3oM_SC" value="fail" />
</node>
<node concept="3oM_SD" id="4G8aeOH2reY" role="1PaTwD">
<property role="3oM_SC" value="if" />
</node>
<node concept="3oM_SD" id="4G8aeOH2reZ" role="1PaTwD">
<property role="3oM_SC" value="new" />
</node>
<node concept="3oM_SD" id="4G8aeOH2rf0" role="1PaTwD">
<property role="3oM_SC" value="clones" />
</node>
<node concept="3oM_SD" id="4G8aeOH2rf1" role="1PaTwD">
<property role="3oM_SC" value="are" />
</node>
<node concept="3oM_SD" id="4G8aeOH2rf2" role="1PaTwD">
<property role="3oM_SC" value="detected" />
</node>
</node>
</node>
<node concept="3vlDli" id="6dJ4vxiTVOZ" role="3cqZAp">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
<sourceRoot location="models" />
</modelRoot>
</models>
<facets>
<facet compile="mps" classes="mps" ext="no" type="java">
<classes generated="true" path="${module}/classes_gen" />
</facet>
<facet type="tests" />
</facets>
<sourcePath />
<dependencies>
<dependency reexport="false">c444eed9-4c7b-48e8-a62c-124f7b6b1712(org.mpsqa.clones.config.pluginSolution)</dependency>
Expand All @@ -13,15 +19,15 @@
<dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
</dependencies>
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="8" />
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
<language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
<language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
<language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="2" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
<language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="6" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:56cfcf05-92e4-4822-8126-2ea0e0cece6b:org.mpsqa.clones.config" version="0" />
</languageVersions>
Expand Down
4 changes: 3 additions & 1 deletion code/languages/org.mpsqa.arch/.mps/migration.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
<entry key="jetbrains.mps.ide.mpsmigration.v_2019_3.DefaultFacetExplicitPersistence" value="executed" />
<entry key="jetbrains.mps.ide.mpsmigration.v_2021_2.SplitMPSCoreStub" value="executed" />
<entry key="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
<entry key="project.migrated.version" value="222" />
<entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.ExplicitJavaFacetSettings" value="executed" />
<entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
<entry key="project.migrated.version" value="223" />
</component>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</modelRoot>
</models>
<facets>
<facet type="java">
<facet type="java" compile="mps" classes="mps" ext="yes">
<classes generated="true" path="${module}/classes_gen" />
</facet>
</facets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</modelRoot>
</models>
<facets>
<facet type="java">
<facet type="java" compile="mps" classes="mps" ext="yes">
<classes generated="true" path="${module}/classes_gen" />
</facet>
</facets>
Expand All @@ -19,7 +19,7 @@
</modelRoot>
</models>
<facets>
<facet type="java">
<facet type="java" compile="mps" classes="mps" ext="no">
<classes generated="true" path="${module}/generator/classes_gen" />
</facet>
</facets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</modelRoot>
</models>
<facets>
<facet type="java">
<facet type="java" compile="mps" classes="mps" ext="yes">
<classes generated="true" path="${module}/classes_gen" />
</facet>
</facets>
Expand All @@ -19,7 +19,7 @@
</modelRoot>
</models>
<facets>
<facet type="java">
<facet type="java" compile="mps" classes="mps" ext="no">
<classes generated="true" path="${module}/generator/classes_gen" />
</facet>
</facets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</modelRoot>
</models>
<facets>
<facet type="java">
<facet type="java" compile="mps" classes="mps" ext="yes">
<classes generated="true" path="${module}/classes_gen" />
</facet>
</facets>
Expand All @@ -19,7 +19,7 @@
</modelRoot>
</models>
<facets>
<facet type="java">
<facet type="java" compile="mps" classes="mps" ext="no">
<classes generated="true" path="${module}/generator/classes_gen" />
</facet>
</facets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</modelRoot>
</models>
<facets>
<facet type="java">
<facet type="java" compile="mps" classes="mps" ext="yes">
<classes generated="true" path="${module}/classes_gen" />
</facet>
</facets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</modelRoot>
</models>
<facets>
<facet type="java">
<facet type="java" compile="mps" classes="mps" ext="no">
<classes generated="true" path="${module}/classes_gen" />
</facet>
</facets>
Expand Down
Loading
Loading