From 75a731be3c36c80507e2cea25f00500dbd4058d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Mon, 11 Nov 2024 13:45:53 +0100 Subject: [PATCH 1/2] modelcheck: Mention the flag to disable indexing in the log message --- .../main/kotlin/de/itemis/mps/gradle/modelcheck/ModelCheck.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modelcheck/src/main/kotlin/de/itemis/mps/gradle/modelcheck/ModelCheck.kt b/modelcheck/src/main/kotlin/de/itemis/mps/gradle/modelcheck/ModelCheck.kt index 325c357..53e8e64 100644 --- a/modelcheck/src/main/kotlin/de/itemis/mps/gradle/modelcheck/ModelCheck.kt +++ b/modelcheck/src/main/kotlin/de/itemis/mps/gradle/modelcheck/ModelCheck.kt @@ -337,7 +337,7 @@ fun modelCheckProject(args: ModelCheckArgs, environment: Environment, project: P // Workaround for https://youtrack.jetbrains.com/issue/MPS-37926/Indices-not-built-properly-in-IdeaEnvironment if (project is MPSProject && shouldForceIndexing(args, BuildNumber.currentVersion())) { - logger.info("Forcing full indexing to work around MPS-37926") + logger.info("Forcing full indexing to work around MPS-37926. Can be disabled with --force-indexing=never.") ApplicationManager.getApplication().invokeAndWait({ ApplicationManager.getApplication().runWriteAction { ProjectRootManagerEx.getInstanceEx(project.project) From 7b2e8d8ee2e8d724c0f89f0f0ba26afed606b89b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Mon, 11 Nov 2024 11:44:36 +0100 Subject: [PATCH 2/2] 1.19.0: support for 2024.1.1 * Load `mps-modelchecker` plugin instead of explicitly adding just UnresolvedReferencesChecker to the checker list. --- CHANGELOG.md | 7 +++++++ gradle.properties | 2 +- integration-tests/build.gradle.kts | 3 +-- modelcheck/build.gradle.kts | 1 - .../de/itemis/mps/gradle/modelcheck/ModelCheck.kt | 3 --- .../itemis/mps/gradle/modelcheck/ModelCheckArgs.kt | 14 ++++++++++++++ 6 files changed, 23 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd4c7de..5a917d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file. 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.19.0 + +- The backends are now tested against MPS 2024.1.1. + +- `modelcheck`: instead of adding `UnresolvedReferencesChecker` to the list of checkers, `mps-modelchecker` plugin + (which contains this checker) is loaded by default, unless `--without-mps-modelchecker-plugin` argument is passed. + ## 1.18.0 - `modelcheck`: Work around an indexing problem in MPS 2023.2 and above (build number 232.xxx or higher) by triggering diff --git a/gradle.properties b/gradle.properties index a88e25b..d5aff3a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -version.backend=1.18.0 +version.backend=1.19.0 version.project-loader=2.3.1 diff --git a/integration-tests/build.gradle.kts b/integration-tests/build.gradle.kts index 8474747..4d40da2 100644 --- a/integration-tests/build.gradle.kts +++ b/integration-tests/build.gradle.kts @@ -20,7 +20,7 @@ dependencies { execute(project(":execute")) } -val SUPPORTED_MPS_VERSIONS = arrayOf("2021.3.5", "2022.2.2", "2022.3.2", "2023.2", "2023.3") +val SUPPORTED_MPS_VERSIONS = arrayOf("2022.2.2", "2022.3.3", "2023.2.2", "2024.1.1") val GENERATION_TESTS = listOf( GenerationTest("generateBuildSolution", "generate-build-solution", listOf("--model", "my.build.script"), @@ -300,7 +300,6 @@ fun tasksForMpsVersion(mpsVersion: String): Multimap fail("Unsupported value '$this'. Supported values are always, never, auto") } }.default(null) + + val withoutModelcheckerPlugin by parser.flagging( + "--without-mps-modelchecker-plugin", + help = "do not load the mps-modelchecker plugin by default") + + override fun configureProjectLoader(builder: ProjectLoader.Builder) { + if (!withoutModelcheckerPlugin) { + builder.environmentConfig { + plugins.add(Plugin("jetbrains.mps.ide.modelchecker", "mps-modelchecker")) + } + } + } }