Merge pull request #764 from modelix/mps241

MODELIX-864 support for MPS 2023.3 and 2024.1-EAP1

Author: slisson

.github/workflows/mps-compatibility.yaml

@@ -22,6 +22,8 @@ jobs:
           - "2022.2"
           - "2022.3"
           - "2023.2"
+          - "2023.3"
+          - "2024.1"
 
     steps:
       - uses: actions/checkout@v4
@@ -38,5 +40,6 @@ jobs:
           :bulk-model-sync-mps:build
           :metamodel-export:build
           :mps-model-adapters:build
+          :mps-model-adapters-plugin:build
           :mps-model-server-plugin:build
           -Pmps.version.major=${{ matrix.version }}

build-logic/src/main/kotlin/org/modelix/CopyMps.kt

@@ -41,10 +41,11 @@ val Project.mpsVersion: String get() {
                     "2021.1" to "2021.1.4",
                     "2021.2" to "2021.2.6",
                     "2021.3" to "2021.3.5",
-                    "2022.2" to "2022.2.2",
+                    "2022.2" to "2022.2.3",
                     "2022.3" to "2022.3.1",
                     "2023.2" to "2023.2",
-                    "2023.3" to "2023.3-RC1",
+                    "2023.3" to "2023.3",
+                    "2024.1" to "2024.1-EAP1",
                 )[it],
             ) { "Unknown MPS version: $it" }
         }

bulk-model-sync-lib-mps-test/src/test/kotlin/org/modelix/model/sync/bulk/lib/test/MPSTestBase.kt

@@ -29,6 +29,10 @@ import java.util.regex.Pattern
 private val TESTDATA_PATTERN = Pattern.compile(".*\\(testdata (.*)\\)")
 
 abstract class MPSTestBase : HeavyPlatformTestCase() {
+    init {
+        // workaround for MPS 2023.3 failing to start in test mode
+        System.setProperty("intellij.platform.load.app.info.from.resources", "true")
+    }
 
     protected lateinit var projectDir: Path
 

mps-model-adapters-plugin/build.gradle.kts

@@ -1,5 +1,4 @@
 import org.modelix.copyMps
-import org.modelix.mpsJavaVersion
 
 plugins {
     kotlin("jvm")
@@ -17,13 +16,9 @@ intellij {
 }
 
 tasks {
-    withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-        kotlinOptions.jvmTarget = mpsJavaVersion.toString()
-    }
-
     patchPluginXml {
         sinceBuild.set("211")
-        untilBuild.set("232.10072.781")
+        untilBuild.set("241.*")
     }
 
     buildSearchableOptions {

mps-model-adapters-plugin/src/test/kotlin/org/modelix/model/mpsadapters/MpsAdaptersTestBase.kt

@@ -39,6 +39,10 @@ import kotlin.io.path.deleteRecursively
  */
 @Suppress("removal")
 abstract class MpsAdaptersTestBase(val testDataName: String?) : UsefulTestCase() {
+    init {
+        // workaround for MPS 2023.3 failing to start in test mode
+        System.setProperty("intellij.platform.load.app.info.from.resources", "true")
+    }
 
     protected lateinit var project: Project
 

mps-model-server-plugin/build.gradle.kts

@@ -37,7 +37,7 @@ tasks {
 
     patchPluginXml {
         sinceBuild.set("203")
-        untilBuild.set("231.*")
+        untilBuild.set("241.*")
     }
 
     buildSearchableOptions {