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.

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

Migrate to 2023.2 #23

Merged
merged 14 commits into from
Dec 8, 2023
Merged

Migrate to 2023.2 #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8b4165b
org.mpsqa.base: run migrations
alexanderpann Dec 7, 2023
8da9fb7
org.mpsqa.arch: run migrations
alexanderpann Dec 7, 2023
273b7af
org.mpsqa.build: run migrations
alexanderpann Dec 7, 2023
35aaa21
org.mpsqa.deprecated: run migrations
alexanderpann Dec 7, 2023
3270a50
org.mpsqa.lint: run migrations
alexanderpann Dec 7, 2023
bb41a6c
org.mpsqa.mutant: run migrations + fix imports
alexanderpann Dec 7, 2023
0cd3e04
org.mpsqa.unused: run migrations
alexanderpann Dec 7, 2023
ec2aabe
org.mpsqa.base: re-export JDK for libs
alexanderpann Dec 7, 2023
a9f3d25
org.mpsqa.testing: run migrations
alexanderpann Dec 7, 2023
95d6433
org.mpsqa.clones: run migrations
alexanderpann Dec 7, 2023
ba7ef27
org.mpsqa.clones.demo: run migrations
alexanderpann Dec 7, 2023
b7b2013
org.mpsqa.clones.demo: run migrations and fix build script
alexanderpann Dec 7, 2023
8eb1356
Cleanup + fix some warnings
alexanderpann Dec 7, 2023
d3e13f9
Update build.gradle
alexanderpann Dec 7, 2023
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: 4 additions & 4 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ plugins {

apply plugin: 'download-jbr'

ext.jbrVers = '17.0.3-b469.32'
ext.jbrVers = '17.0.8.1-b1000.32'

downloadJbr {
jbrVersion = jbrVers
Expand Down Expand Up @@ -57,11 +57,11 @@ ext.dependencyRepositories = [
]

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

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

if (ciBuild) {
String branch = GitBasedVersioning.gitBranch
Expand Down
5 changes: 3 additions & 2 deletions build/scripts/build_all_scripts.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<property name="build.dir" location="build" />
<property name="build.tmp" location="${build.dir}/tmp/org.mpsqa.allScripts" />
<property name="build.layout" location="${build.dir}/artifacts/org.mpsqa.allScripts" />
<property name="mps.home" location="${basedir}/../../../MPS_2020_3_5" />
<property name="mps.home" location="" />
<property name="mpsqa.home" location="${basedir}/../.." />
<property name="mpsqa.build.home" location="${mpsqa.home}/code/languages/org.mpsqa.build" />
<property name="artifacts.mps" location="${mps.home}" />
Expand All @@ -28,7 +28,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.jar" />
<include name="util-8.jar" />
</fileset>
</path>

Expand Down Expand Up @@ -206,6 +206,7 @@
<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.constraints.rules.runtime.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" />
Expand Down
4 changes: 3 additions & 1 deletion code/applications/org.mpsqa.clones.demo/code/.mps/migration.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
<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" />
<entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
<entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
<entry key="project.migrated.version" value="232" />
</component>
</project>
2 changes: 1 addition & 1 deletion code/applications/org.mpsqa.clones.demo/code/.mps/vcs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$mpsqa.home$" vcs="Git" />
<mapping directory="$PROJECT_DIR$/../../../.." vcs="Git" />
</component>
</project>
76 changes: 43 additions & 33 deletions ...cations/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.build/models/build.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
<imports>
<import index="c9zv" ref="r:c9eae771-f543-4d3e-89a7-0f86ee2dae52(org.mpsqa.clones.build)" />
<import index="ffeo" ref="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)" />
<import index="2tou" ref="r:18bebd8f-6332-4ffd-b628-cc9dad4ef421(org.mpsqa.build._010_base_build)" />
<import index="5g2w" ref="r:eecfcc09-6fb4-4fd4-bb99-b3d1712ec5a4(org.mpsqa.build._030_clones_build)" implicit="true" />
</imports>
<registry>
<language id="3600cb0a-44dd-4a5b-9968-22924406419e" name="jetbrains.mps.build.mps.tests">
Expand Down Expand Up @@ -60,7 +62,7 @@
<concept id="8654221991637384182" name="jetbrains.mps.build.structure.BuildFileIncludesSelector" flags="ng" index="3qWCbU">
<property id="8654221991637384184" name="pattern" index="3qWCbO" />
</concept>
<concept id="4701820937132344003" name="jetbrains.mps.build.structure.BuildLayout_Container" flags="ng" index="1y1bJS">
<concept id="4701820937132344003" name="jetbrains.mps.build.structure.BuildLayout_Container" flags="ngI" index="1y1bJS">
<child id="7389400916848037006" name="children" index="39821P" />
</concept>
<concept id="841011766566059607" name="jetbrains.mps.build.structure.BuildStringNotEmpty" flags="ng" index="3_J27D" />
Expand All @@ -73,7 +75,7 @@
</concept>
</language>
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
<property id="1169194664001" name="name" index="TrG5h" />
</concept>
</language>
Expand Down Expand Up @@ -109,6 +111,12 @@
<concept id="763829979718664966" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleResources" flags="ng" index="3rtmxn">
<child id="763829979718664967" name="files" index="3rtmxm" />
</concept>
<concept id="4278635856200817744" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleModelRoot" flags="ng" index="1BupzO">
<property id="8137134783396907368" name="convert2binary" index="1Hdu6h" />
<property id="8137134783396676838" name="extracted" index="1HemKv" />
<property id="2889113830911481881" name="deployFolderName" index="3ZfqAx" />
<child id="8137134783396676835" name="location" index="1HemKq" />
</concept>
<concept id="3189788309731840247" name="jetbrains.mps.build.mps.structure.BuildMps_Solution" flags="ng" index="1E1JtA">
<property id="269707337715731330" name="sourcesKind" index="aoJFB" />
</concept>
Expand Down Expand Up @@ -152,7 +160,7 @@
<ref role="m$_y1" to="ffeo:4k71ibbKLe8" resolve="jetbrains.mps.core" />
</node>
<node concept="m$_yC" id="1GhTetdABhp" role="m$_yJ">
<ref role="m$_y1" to="c9zv:2JVMSZMFXh0" resolve="org.mpsqa.clones" />
<ref role="m$_y1" to="5g2w:2JVMSZMFXh0" resolve="org.mpsqa.clones" />
</node>
<node concept="3_J27D" id="2JVMSZMFY9r" role="m_cZH">
<node concept="3Mxwew" id="2JVMSZMFY9s" role="3MwsjC">
Expand All @@ -166,7 +174,7 @@
<property role="BnDLt" value="true" />
<property role="TrG5h" value="org.mpsqa.clones.demo.config" />
<property role="3LESm3" value="c234a129-76f4-4c3c-8e00-1d5d820ac2f6" />
<property role="aoJFB" value="sources and tests" />
<property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
<node concept="3rtmxn" id="1GhTetdABhv" role="3bR31x">
<node concept="3LXTmp" id="1GhTetdABhw" role="3rtmxm">
<node concept="398BVA" id="1GhTetdABhx" role="3LXTmr">
Expand Down Expand Up @@ -203,7 +211,7 @@
</node>
<node concept="1SiIV0" id="6dJ4vxiUcX$" role="3bR37C">
<node concept="3bR9La" id="6dJ4vxiUcX_" role="1SiIV1">
<ref role="3bR37D" to="c9zv:2JVMSZMFXgA" resolve="org.mpsqa.clones.core" />
<ref role="3bR37D" to="5g2w:2JVMSZMFXgA" resolve="org.mpsqa.clones.core" />
</node>
</node>
<node concept="1SiIV0" id="6dJ4vxiUcXA" role="3bR37C">
Expand All @@ -218,7 +226,32 @@
</node>
<node concept="1SiIV0" id="6dJ4vxiUcXE" role="3bR37C">
<node concept="3bR9La" id="6dJ4vxiUcXF" role="1SiIV1">
<ref role="3bR37D" to="c9zv:2JVMSZMFXgS" resolve="org.mpsqa.clones.config.pluginSolution" />
<ref role="3bR37D" to="5g2w:2JVMSZMFXgS" resolve="org.mpsqa.clones.config.pluginSolution" />
</node>
</node>
<node concept="1BupzO" id="7j9WyvhwngV" role="3bR31x">
<property role="3ZfqAx" value="models" />
<property role="1Hdu6h" value="true" />
<property role="1HemKv" value="true" />
<node concept="3LXTmp" id="7j9WyvhwngW" role="1HemKq">
<node concept="398BVA" id="7j9WyvhwngL" role="3LXTmr">
<ref role="398BVh" node="1GhTetdB0oc" resolve="mpsqa.clones.detection.home" />
<node concept="2Ry0Ak" id="7j9WyvhwngM" role="iGT6I">
<property role="2Ry0Am" value="code" />
<node concept="2Ry0Ak" id="7j9WyvhwngN" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="7j9WyvhwngO" role="2Ry0An">
<property role="2Ry0Am" value="org.mpsqa.clones.demo.config" />
<node concept="2Ry0Ak" id="7j9WyvhwngP" role="2Ry0An">
<property role="2Ry0Am" value="models" />
</node>
</node>
</node>
</node>
</node>
<node concept="3qWCbU" id="7j9WyvhwngX" role="3LXTna">
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
</node>
</node>
</node>
</node>
Expand All @@ -230,39 +263,16 @@
</node>
</node>
<node concept="2sgV4H" id="6dJ4vxiTR6z" role="1l3spa">
<ref role="1l3spb" to="c9zv:2JVMSZMFXgi" resolve="org.mpsqa.clones" />
<ref role="1l3spb" to="c9zv:2JVMSZMFXJP" resolve="org.mpsqa.clones.headless" />
<node concept="398BVA" id="6dJ4vxiUhxa" role="2JcizS">
<ref role="398BVh" node="1GhTetdB0o4" resolve="mps_home" />
</node>
</node>
<node concept="2sgV4H" id="7j9WyvhwmK6" role="1l3spa">
<ref role="1l3spb" to="2tou:7C9PHv6FBIG" resolve="org.mpsqa.base" />
</node>
<node concept="398rNT" id="1GhTetdB0o4" role="1l3spd">
<property role="TrG5h" value="mps_home" />
<node concept="55IIr" id="1GhTetdB0o5" role="398pKh">
<node concept="2Ry0Ak" id="1GhTetdB0o6" role="iGT6I">
<property role="2Ry0Am" value=".." />
<node concept="2Ry0Ak" id="1GhTetdB0o7" role="2Ry0An">
<property role="2Ry0Am" value=".." />
<node concept="2Ry0Ak" id="1GhTetdB0o8" role="2Ry0An">
<property role="2Ry0Am" value=".." />
<node concept="2Ry0Ak" id="1GhTetdB0o9" role="2Ry0An">
<property role="2Ry0Am" value=".." />
<node concept="2Ry0Ak" id="1GhTetdBQO4" role="2Ry0An">
<property role="2Ry0Am" value=".." />
<node concept="2Ry0Ak" id="6dJ4vxiTQkY" role="2Ry0An">
<property role="2Ry0Am" value=".." />
<node concept="2Ry0Ak" id="6dJ4vxiTQxP" role="2Ry0An">
<property role="2Ry0Am" value=".." />
<node concept="2Ry0Ak" id="6dJ4vxiUhxf" role="2Ry0An">
<property role="2Ry0Am" value="MPS_2018_3_7_esd_devel_clones_detection" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="398rNT" id="1GhTetdB0oc" role="1l3spd">
<property role="TrG5h" value="mpsqa.clones.detection.home" />
Expand Down
5 changes: 3 additions & 2 deletions ...qa.clones.demo/code/solutions/org.mpsqa.clones.demo.build/org.mpsqa.clones.demo.build.msd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<solution name="org.mpsqa.clones.demo.build" uuid="3ef108e9-9b3a-4772-a069-c91cd62467de" moduleVersion="0" compileInMPS="true">
<solution name="org.mpsqa.clones.demo.build" uuid="3ef108e9-9b3a-4772-a069-c91cd62467de" moduleVersion="0">
<models>
<modelRoot contentPath="${module}" type="default">
<sourceRoot location="models" />
Expand All @@ -10,10 +10,10 @@
<classes generated="true" path="${module}/classes_gen" />
</facet>
</facets>
<sourcePath />
<dependencies>
<dependency reexport="false">cf9e90bb-6263-4505-b1d0-f6a2339ece89(org.mpsqa.clones.build)</dependency>
<dependency reexport="false">422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)</dependency>
<dependency reexport="false">11d4368a-a7e8-4dd9-bfc6-c2de268d1994(org.mpsqa.build)</dependency>
</dependencies>
<languageVersions>
<language slang="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" version="0" />
Expand All @@ -23,6 +23,7 @@
</languageVersions>
<dependencyVersions>
<module reference="422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)" version="0" />
<module reference="11d4368a-a7e8-4dd9-bfc6-c2de268d1994(org.mpsqa.build)" version="0" />
<module reference="cf9e90bb-6263-4505-b1d0-f6a2339ece89(org.mpsqa.clones.build)" version="0" />
<module reference="3ef108e9-9b3a-4772-a069-c91cd62467de(org.mpsqa.clones.demo.build)" version="0" />
</dependencyVersions>
Expand Down
2 changes: 1 addition & 1 deletion ....demo/code/solutions/org.mpsqa.clones.demo.config/models/_010_clones_detection_config.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</concept>
</language>
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
<property id="1169194664001" name="name" index="TrG5h" />
</concept>
</language>
Expand Down
6 changes: 3 additions & 3 deletions ...es.demo/code/solutions/org.mpsqa.clones.demo.config/models/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<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="19" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
<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>
Expand Down Expand Up @@ -68,7 +68,7 @@
<concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
<child id="1079359253376" name="expression" index="1eOMHV" />
</concept>
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
<child id="1068499141038" name="actualArgument" index="37wK5m" />
</concept>
Expand Down Expand Up @@ -106,7 +106,7 @@
</concept>
</language>
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
<property id="1169194664001" name="name" index="TrG5h" />
</concept>
</language>
Expand Down
5 changes: 2 additions & 3 deletions ....clones.demo/code/solutions/org.mpsqa.clones.demo.config/org.mpsqa.clones.demo.config.msd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<solution name="org.mpsqa.clones.demo.config" uuid="c234a129-76f4-4c3c-8e00-1d5d820ac2f6" moduleVersion="0" compileInMPS="true">
<solution name="org.mpsqa.clones.demo.config" uuid="c234a129-76f4-4c3c-8e00-1d5d820ac2f6" moduleVersion="0">
<models>
<modelRoot contentPath="${module}" type="default">
<sourceRoot location="models" />
Expand All @@ -11,7 +11,6 @@
</facet>
<facet type="tests" />
</facets>
<sourcePath />
<dependencies>
<dependency reexport="false">c444eed9-4c7b-48e8-a62c-124f7b6b1712(org.mpsqa.clones.config.pluginSolution)</dependency>
<dependency reexport="false">48b1eeb1-bf01-4e84-8d12-d2fc8bf60fb7(org.mpsqa.clones.core)</dependency>
Expand All @@ -22,7 +21,7 @@
<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:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
<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="2" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
Expand Down
4 changes: 3 additions & 1 deletion code/languages/org.mpsqa.arch/.mps/migration.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
<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" />
<entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.DataFlowStubsToRegularNodes" value="executed" />
<entry key="jetbrains.mps.ide.mpsmigration.v_2023_1.JavaModuleSettingsToFacet" value="executed" />
<entry key="project.migrated.version" value="232" />
</component>
</project>
Loading
Loading