From 07a93de541c27193c1b367191edc59511d1d0da9 Mon Sep 17 00:00:00 2001
From: Willem Jan Glerum <willem.jan.glerum@lunatech.nl>
Date: Thu, 11 Apr 2024 15:46:12 +0200
Subject: [PATCH] Update minimum supported MPS version to MPS 2022.2.2

---
 CHANGELOG.md                                  |  6 +++++
 build.gradle.kts                              |  2 +-
 .../mps/gradle/ModelCheckWithPluginTest.kt    | 26 ++++++++-----------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ceea688..06c1a57 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 1.24.0
+
+### Changes
+
+- Update minimum supported MPS version to MPS 2022.2.2 and updates underlying dependencies.
+
 ## 1.23.1
 
 ### Fixed
diff --git a/build.gradle.kts b/build.gradle.kts
index 77b3ddf..ccf64aa 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -24,7 +24,7 @@ plugins {
     id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.13.2"
 }
 
-val baseVersion = "1.23.1"
+val baseVersion = "1.24.0"
 
 group = "de.itemis.mps"
 
diff --git a/src/test/kotlin/test/de/itemis/mps/gradle/ModelCheckWithPluginTest.kt b/src/test/kotlin/test/de/itemis/mps/gradle/ModelCheckWithPluginTest.kt
index 194ceef..672664e 100644
--- a/src/test/kotlin/test/de/itemis/mps/gradle/ModelCheckWithPluginTest.kt
+++ b/src/test/kotlin/test/de/itemis/mps/gradle/ModelCheckWithPluginTest.kt
@@ -1,10 +1,6 @@
 package test.de.itemis.mps.gradle
 
 import de.itemis.mps.gradle.ErrorMessages
-import de.itemis.mps.gradle.downloadJBR.DownloadJbrConfiguration
-import de.itemis.mps.gradle.modelcheck.ModelCheckPluginExtensions
-import org.gradle.kotlin.dsl.configure
-import org.gradle.testfixtures.ProjectBuilder
 import org.gradle.testkit.runner.GradleRunner
 import org.gradle.testkit.runner.TaskOutcome
 import org.hamcrest.CoreMatchers
@@ -57,13 +53,13 @@ class ModelCheckWithPluginTest {
     """.trimIndent() + "\n"
 
     @Test
-    fun `check model works with MPS 2020_3_3`() {
+    fun `check model works with MPS 2022_2_2`() {
         extractProject("test-project")
 
         settingsFile.writeText(settingsBoilerplate())
 
         buildFile.writeText(
-            buildScriptBoilerplate("2020.3.3") + """
+            buildScriptBoilerplate("2022.2.2") + """
                 modelcheck {
                     projectLocation = file("${mpsTestPrjLocation.toPath()}")
                     mpsConfig = mps
@@ -93,13 +89,13 @@ class ModelCheckWithPluginTest {
                 }
                 
                 downloadJbr {
-                    jbrVersion = "11_0_10-b1341.41"
+                    jbrVersion = "17.0.6-b469.82"
                 }
 
                 modelcheck {
                     projectLocation = projectDir
                     mpsLocation = file("build/mps")
-                    mpsVersion = "2020.3.3"
+                    mpsVersion = "2022.2.2"
                     javaExec = (tasks.getByName("downloadJbr") as DownloadJbrForPlatform).javaExecutable
                 }
                 
@@ -132,7 +128,7 @@ class ModelCheckWithPluginTest {
         settingsFile.writeText(settingsBoilerplate())
 
         buildFile.writeText(
-            buildScriptBoilerplate("2021.1.4") +
+            buildScriptBoilerplate("2022.2.2") +
             """
                 modelcheck {
                     projectLocation = file("${mpsTestPrjLocation.toPath()}")
@@ -158,7 +154,7 @@ class ModelCheckWithPluginTest {
         settingsFile.writeText(settingsBoilerplate())
 
         buildFile.writeText(
-            buildScriptBoilerplate("2021.1.4") +
+            buildScriptBoilerplate("2022.2.2") +
             """
             modelcheck {
                 projectLocation = file("${mpsTestPrjLocation.toPath()}")
@@ -211,7 +207,7 @@ class ModelCheckWithPluginTest {
         settingsFile.writeText(settingsBoilerplate())
 
         buildFile.writeText(
-            buildScriptBoilerplate("2020.3.3") +
+            buildScriptBoilerplate("2022.2.2") +
             """
             modelcheck {
                 projectLocation = file("${mpsTestPrjLocation.toPath()}")
@@ -236,7 +232,7 @@ class ModelCheckWithPluginTest {
         settingsFile.writeText(settingsBoilerplate())
 
         buildFile.writeText(
-            buildScriptBoilerplate("2020.3.3") +
+            buildScriptBoilerplate("2022.2.2") +
             """
             modelcheck {
                 projectLocation = file("${mpsTestPrjLocation.toPath()}")
@@ -261,11 +257,11 @@ class ModelCheckWithPluginTest {
         settingsFile.writeText(settingsBoilerplate())
 
         buildFile.writeText(
-            buildScriptBoilerplate("2020.3.3") +
+            buildScriptBoilerplate("2022.2.2") +
             """
             modelcheck {
                 projectLocation = file("${mpsTestPrjLocation.toPath()}")
-                mpsVersion = "2020.2.2"
+                mpsVersion = "2022.2.2"
                 junitFile = file("${junitFile.absolutePath}")
             }
         """.trimIndent()
@@ -284,7 +280,7 @@ class ModelCheckWithPluginTest {
         settingsFile.writeText(settingsBoilerplate())
 
         buildFile.writeText(
-            buildScriptBoilerplate("2020.3.3") +
+            buildScriptBoilerplate("2022.2.2") +
             """
             modelcheck {
                 projectLocation = file("${mpsTestPrjLocation.toPath()}")