Skip to content

Commit 266dfbb

Browse files
committed
test(bulk-model-sync-gradle): bump mps version to 2021.2.5
MPS <=2021.1.4 can't handle cycles in filesystems while collecting jars. This causes the ci test to fail.
1 parent d95a056 commit 266dfbb

File tree

5 files changed

+7
-5
lines changed

5 files changed

+7
-5
lines changed

bulk-model-sync-gradle-test/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ val mpsDir = buildDir.resolve("mps").apply { mkdirs() }
4848
val kotlinGenDir = buildDir.resolve("metamodel/kotlin").apply { mkdirs() }
4949

5050
dependencies {
51-
mps("com.jetbrains:mps:2021.1.4")
51+
mps("com.jetbrains:mps:2021.2.5")
5252
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.2")
5353
implementation("org.modelix:model-server:$modelixCoreVersion")
5454
implementation("org.modelix:model-api-gen-runtime:$modelixCoreVersion")

bulk-model-sync-gradle-test/graph-lang-api/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ val mps: Configuration by configurations.creating
1919
val kotlinGenDir = buildDir.resolve("metamodel/kotlin").apply { mkdirs() }
2020

2121
dependencies {
22-
mps("com.jetbrains:mps:2021.1.4")
22+
mps("com.jetbrains:mps:2021.2.5")
2323
api("org.modelix:model-api-gen-runtime:$modelixCoreVersion")
2424
}
2525

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project version="4">
33
<component name="MigrationProperties">
4+
<entry key="jetbrains.mps.ide.mpsmigration.v_2021_2.SplitMPSCoreStub" value="executed" />
45
<entry key="project.baseline.version" value="211" />
6+
<entry key="project.migrated.version" value="212" />
57
</component>
68
</project>

bulk-model-sync-gradle-test/test-repo/languages/GraphLang/GraphLang.mpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
3939
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
4040
<language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
41-
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="18" />
41+
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
4242
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
4343
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
4444
</languageVersions>
@@ -83,7 +83,7 @@
8383
<language slang="l:b3551702-269c-4f05-ba61-58060cef4292:jetbrains.mps.lang.rulesAndMessages" version="0" />
8484
<language slang="l:d8f591ec-4d86-4af2-9f92-a9e93c803ffa:jetbrains.mps.lang.scopes" version="0" />
8585
<language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
86-
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="18" />
86+
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
8787
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
8888
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
8989
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />

bulk-model-sync-gradle-test/test-repo/languages/GraphLang/models/GraphLang.behavior.mps

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<model ref="r:ecda8711-ed27-4fcc-907a-148f823ede07(GraphLang.behavior)">
33
<persistence version="9" />
44
<languages>
5-
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="18" />
5+
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
66
<use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
77
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
88
</languages>

0 commit comments

Comments
 (0)