Skip to content

Commit

Permalink
Changed migration mps depenendencies and xml-extension versions
Browse files Browse the repository at this point in the history
  • Loading branch information
conquj committed Mar 20, 2024
1 parent d2662fb commit c3fbd03
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .mps/migration.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
<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="213" />
<entry key="project.migrated.version" value="222" />
</component>
</project>
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ configurations {
}

dependencies {
mps "com.jetbrains:mps:2021.3.+"
languageLibs "com.mbeddr:mbeddr:2021.3.+"
mps "com.jetbrains:mps:2022.2.+"
languageLibs "com.mbeddr:mbeddr:2022.2.+"
junitAnt 'org.apache.ant:ant-junit:1.10.6'
}

Expand Down
36 changes: 22 additions & 14 deletions build/languageBuild.xml
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@
<module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" kind="rt" />
<module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
<module ref="479c7a8c-02f9-43b5-9139-d910cb22f298(jetbrains.mps.core.xml)" kind="cl" />
<module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
<module ref="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" kind="cl" />
</dependencies>
<uses>
Expand Down Expand Up @@ -151,6 +152,7 @@
<dependencies>
<module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="rt" />
<module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="rt" />
<module ref="215c4c45-ba99-49f5-9ab7-4b6901a63cfd(MPS.Generator)" kind="rt" />
<module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="rt" />
<module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" kind="rt" />
<module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" kind="rt" />
Expand Down Expand Up @@ -306,6 +308,7 @@
<module ref="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" kind="rt" />
<module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" kind="rt" />
<module ref="479c7a8c-02f9-43b5-9139-d910cb22f298(jetbrains.mps.core.xml)" kind="cl" />
<module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
<module ref="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" kind="cl" />
</dependencies>
<uses>
Expand Down Expand Up @@ -357,6 +360,7 @@
<dependencies>
<module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="rt" />
<module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" kind="rt" />
<module ref="215c4c45-ba99-49f5-9ab7-4b6901a63cfd(MPS.Generator)" kind="rt" />
<module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="rt" />
<module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" kind="rt" />
<module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" kind="rt" />
Expand Down Expand Up @@ -649,21 +653,23 @@
<fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
<fileset file="${artifacts.mps}/lib/mps-references.jar" />
<fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
<fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
<fileset file="${artifacts.mps}/lib/mps-editor.jar" />
<fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
<fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
<fileset file="${artifacts.mps}/lib/mps-generator.jar" />
<fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
<fileset file="${artifacts.mps}/lib/mps-generator.jar" />
<fileset file="${artifacts.mps}/lib/mps-environment.jar" />
<fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
<fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
<fileset file="${artifacts.mps}/lib/annotations.jar" />
<fileset dir="${artifacts.mps}/lib" includes="*.jar" />
<fileset file="${artifacts.mps}/lib/util.jar" />
<fileset file="${artifacts.mps}/lib/app.jar" />
<fileset file="${artifacts.mps}/lib/3rd-party-rt.jar" />
<fileset file="${artifacts.mps}/lib/3rd-party.jar" />
<fileset file="${artifacts.mps}/lib/eclipse.jar" />
<fileset file="${artifacts.mps}/lib/util.jar" />
<fileset file="${artifacts.mps}/lib/util_rt.jar" />
<fileset file="${artifacts.mps}/lib/forms_rt.jar" />
<fileset file="${artifacts.mps}/lib/java-impl.jar" />
<fileset file="${artifacts.mps}/lib/jps-model.jar" />
<fileset file="${artifacts.mps}/lib/testFramework.jar" />
<fileset file="${artifacts.mps}/lib/stats.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
<fileset file="${artifacts.mps}/languages/xml/jetbrains.mps.core.xml.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
Expand Down Expand Up @@ -704,22 +710,24 @@
<fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
<fileset file="${artifacts.mps}/lib/mps-references.jar" />
<fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
<fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
<fileset file="${artifacts.mps}/lib/mps-editor.jar" />
<fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
<fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
<fileset file="${artifacts.mps}/lib/mps-generator.jar" />
<fileset file="${artifacts.mps}/lib/mps-persistence.jar" />
<fileset file="${artifacts.mps}/lib/mps-generator.jar" />
<fileset file="${artifacts.mps}/lib/mps-environment.jar" />
<fileset file="${artifacts.mps}/lib/mps-project-check.jar" />
<fileset file="${artifacts.mps}/lib/mps-textgen.jar" />
<pathelement path="${build.tmp}/java/out/com.dslfoundry.xmlextension" />
<fileset file="${artifacts.mps}/lib/annotations.jar" />
<fileset dir="${artifacts.mps}/lib" includes="*.jar" />
<fileset file="${artifacts.mps}/lib/util.jar" />
<fileset file="${artifacts.mps}/lib/app.jar" />
<fileset file="${artifacts.mps}/lib/3rd-party-rt.jar" />
<fileset file="${artifacts.mps}/lib/3rd-party.jar" />
<fileset file="${artifacts.mps}/lib/eclipse.jar" />
<fileset file="${artifacts.mps}/lib/util.jar" />
<fileset file="${artifacts.mps}/lib/util_rt.jar" />
<fileset file="${artifacts.mps}/lib/forms_rt.jar" />
<fileset file="${artifacts.mps}/lib/java-impl.jar" />
<fileset file="${artifacts.mps}/lib/jps-model.jar" />
<fileset file="${artifacts.mps}/lib/testFramework.jar" />
<fileset file="${artifacts.mps}/lib/stats.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
<fileset file="${artifacts.mps}/languages/xml/jetbrains.mps.core.xml.jar" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
xmlextensionVersion = 2021.3
xmlextensionVersion = 2022.2
systemProp.org.gradle.internal.http.connectionTimeout=180000
systemProp.org.gradle.internal.http.socketTimeout=180000
1 change: 1 addition & 0 deletions scripts/allScripts.xml
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.context.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.dataFlow.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.editor.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.findUsages.jar" />
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.generationContext.jar" />
Expand Down

0 comments on commit c3fbd03

Please sign in to comment.