From 872313bddb643197137f000034fa3c563634d075 Mon Sep 17 00:00:00 2001 From: Mehmet Berk Takim Date: Tue, 10 Jun 2025 17:19:43 +0200 Subject: [PATCH 1/8] added jetbrains.mps.junit5 and jetbrains.mps.testing as depedency to org.mpsqa.testing plugin due to failing build --- .../models/org.mpsqa.testing.build.mps | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testing.build/models/org.mpsqa.testing.build.mps b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testing.build/models/org.mpsqa.testing.build.mps index fe47e6f3..00776f4b 100644 --- a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testing.build/models/org.mpsqa.testing.build.mps +++ b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testing.build/models/org.mpsqa.testing.build.mps @@ -393,6 +393,12 @@ + + + + + + From a42e2cecf7d94ee47102e5fda5a6724496ea2bc8 Mon Sep 17 00:00:00 2001 From: Mehmet Berk Takim Date: Tue, 10 Jun 2025 17:25:29 +0200 Subject: [PATCH 2/8] added jetbrains.mps.trove and jetbrains.mps.editor.tooltips to various builds off plugins --- .../models/org.mpsqa.build._040_mutant_build.mps | 3 +++ .../models/org.mpsqa.build._050_unused_build.mps | 6 ++++++ .../models/org.mpsqa.build._060_arch_build.mps | 6 ++++++ .../models/org.mpsqa.build._090_profile_build.mps | 3 +++ 4 files changed, 18 insertions(+) diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._040_mutant_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._040_mutant_build.mps index 0ade8b80..83ce41e8 100644 --- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._040_mutant_build.mps +++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._040_mutant_build.mps @@ -211,6 +211,9 @@ + + + diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._050_unused_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._050_unused_build.mps index 6955d751..92fd4a0b 100644 --- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._050_unused_build.mps +++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._050_unused_build.mps @@ -211,6 +211,12 @@ + + + + + + diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._060_arch_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._060_arch_build.mps index 18b6e0f3..f2dc725d 100644 --- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._060_arch_build.mps +++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._060_arch_build.mps @@ -249,6 +249,12 @@ + + + + + + diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._090_profile_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._090_profile_build.mps index 74ccd7df..c134ae54 100644 --- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._090_profile_build.mps +++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._090_profile_build.mps @@ -228,6 +228,9 @@ + + + From 440462c9b6999ba46ac6405bff3700f72a9fd608 Mon Sep 17 00:00:00 2001 From: Mehmet Berk Takim Date: Wed, 11 Jun 2025 10:46:59 +0200 Subject: [PATCH 3/8] modified models_with_non_devkits_as_used_languages to have whitelist parameters --- ...qa.lint.generic.linters_library.models.mps | 547 +++++++++++++++--- 1 file changed, 456 insertions(+), 91 deletions(-) diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.models.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.models.mps index dfeaba26..23bf1075 100644 --- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.models.mps +++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.models.mps @@ -346,7 +346,6 @@ - @@ -1987,7 +1986,14 @@ - + + + + + + + + @@ -2011,116 +2017,476 @@ - + - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - + + - - - + + + - - - - - - + + + + + - - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + - - - - + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + - - - - @@ -2128,23 +2494,23 @@ - - - - - - - - - + + + + + + + + + - - - - + + + + @@ -3798,7 +4164,6 @@ - From 7760804a5ab385c09e971b9ad6ce0b35546101bc Mon Sep 17 00:00:00 2001 From: Mehmet Berk Takim Date: Wed, 11 Jun 2025 11:13:25 +0200 Subject: [PATCH 4/8] added https://artifacts.itemis.cloud/repository/maven-mps/ to plugin repos --- settings.gradle.kts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/settings.gradle.kts b/settings.gradle.kts index ca4b0e41..94743939 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -7,6 +7,9 @@ pluginManagement { password = if (extra.has("github_token")) extra.get("github_token") as String else System.getenv("GITHUB_TOKEN") } } + maven { + url = uri("https://artifacts.itemis.cloud/repository/maven-mps/") + } gradlePluginPortal() } } From 8cc1bf81a0977d98b79c65bf14f489a77c2ef1bc Mon Sep 17 00:00:00 2001 From: Mehmet Berk Takim Date: Wed, 11 Jun 2025 11:36:23 +0200 Subject: [PATCH 5/8] force-save-all + migrate --- .../models/org.mpsqa.build._040_mutant_build.mps | 2 +- .../models/org.mpsqa.build._050_unused_build.mps | 4 ++-- .../models/org.mpsqa.build._060_arch_build.mps | 4 ++-- .../models/org.mpsqa.build._090_profile_build.mps | 2 +- .../org.mpsqa.lint.generic.linters_library.models.mps | 6 +++--- .../models/org.mpsqa.testing.build.mps | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._040_mutant_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._040_mutant_build.mps index 83ce41e8..bc0677ac 100644 --- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._040_mutant_build.mps +++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._040_mutant_build.mps @@ -212,7 +212,7 @@ - + diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._050_unused_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._050_unused_build.mps index 92fd4a0b..14e1dd92 100644 --- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._050_unused_build.mps +++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._050_unused_build.mps @@ -212,10 +212,10 @@ - + - + diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._060_arch_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._060_arch_build.mps index f2dc725d..a6c0a2d7 100644 --- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._060_arch_build.mps +++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._060_arch_build.mps @@ -250,10 +250,10 @@ - + - + diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._090_profile_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._090_profile_build.mps index c134ae54..1cc4788f 100644 --- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._090_profile_build.mps +++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._090_profile_build.mps @@ -229,7 +229,7 @@ - + diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.models.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.models.mps index 23bf1075..90fa8d28 100644 --- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.models.mps +++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.models.mps @@ -2296,7 +2296,7 @@ - + @@ -2431,7 +2431,7 @@ - + @@ -2477,7 +2477,7 @@ - + diff --git a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testing.build/models/org.mpsqa.testing.build.mps b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testing.build/models/org.mpsqa.testing.build.mps index 00776f4b..34da197e 100644 --- a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testing.build/models/org.mpsqa.testing.build.mps +++ b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testing.build/models/org.mpsqa.testing.build.mps @@ -394,10 +394,10 @@ - + - + From 1bfab90528e1d6e1046f3244cc319b9cbe0ffd3c Mon Sep 17 00:00:00 2001 From: Mehmet Berk Takim Date: Wed, 11 Jun 2025 11:39:19 +0200 Subject: [PATCH 6/8] move to MPS bugfix release 2024.1.4 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 5c350cd7..ee3cc2e1 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,7 @@ if (System.env.CI != null && System.env.CI.toBoolean()) { ext.ciBuild = project.hasProperty("teamcity") } -ext.mpsVersion = '2024.1.1' +ext.mpsVersion = '2024.1.4' // Project versions ext.major = '2024' From c819037cfd255460401ccc842c3f230e740e60dd Mon Sep 17 00:00:00 2001 From: Mehmet Berk Takim Date: Wed, 11 Jun 2025 13:33:27 +0200 Subject: [PATCH 7/8] Revert "modified models_with_non_devkits_as_used_languages to have whitelist parameters" This reverts commit 440462c9b6999ba46ac6405bff3700f72a9fd608. --- ...qa.lint.generic.linters_library.models.mps | 547 +++--------------- 1 file changed, 91 insertions(+), 456 deletions(-) diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.models.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.models.mps index 90fa8d28..dfeaba26 100644 --- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.models.mps +++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.models.mps @@ -346,6 +346,7 @@ + @@ -1986,14 +1987,7 @@ - - - - - - - - + @@ -2017,476 +2011,116 @@ - + - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - + + - - - + + + - - - - - + + + + + + - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - + + + + + + @@ -2494,23 +2128,23 @@ - - - - - - - - - + + + + + + + + + - - - - + + + + @@ -4164,6 +3798,7 @@ + From 76bd2774f634f9bdfa9b55165036a5fcf8360332 Mon Sep 17 00:00:00 2001 From: Mehmet Berk Takim Date: Thu, 12 Jun 2025 08:40:38 +0200 Subject: [PATCH 8/8] Reverted settings.gradle changes --- settings.gradle.kts | 3 --- 1 file changed, 3 deletions(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 94743939..ca4b0e41 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -7,9 +7,6 @@ pluginManagement { password = if (extra.has("github_token")) extra.get("github_token") as String else System.getenv("GITHUB_TOKEN") } } - maven { - url = uri("https://artifacts.itemis.cloud/repository/maven-mps/") - } gradlePluginPortal() } }