Skip to content

Commit ba74a9d

Browse files
committed
adjust build script and versions to 20251
1 parent bda9a7c commit ba74a9d

File tree

2 files changed

+18
-17
lines changed

2 files changed

+18
-17
lines changed

build.gradle.kts

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import de.itemis.mps.gradle.GitBasedVersioning
33
import de.itemis.mps.gradle.Macro
44
import de.itemis.mps.gradle.RunAntScript
55
import de.itemis.mps.gradle.TestLanguages
6+
import de.itemis.mps.gradle.tasks.MpsCheck
67
import de.itemis.mps.gradle.tasks.MpsMigrate
78
import de.itemis.mps.gradle.tasks.Remigrate
89
import groovy.util.Node
@@ -21,7 +22,6 @@ plugins {
2122
alias(libs.plugins.githubRelease)
2223
alias(libs.plugins.cyclonedxBom)
2324
alias(libs.plugins.downloadJbr)
24-
alias(libs.plugins.modelcheck)
2525
}
2626

2727
repositories {
@@ -282,21 +282,22 @@ val remigrate by tasks.registering(Remigrate::class) {
282282
maxHeapSize = "4G"
283283
}
284284

285-
modelcheck {
286-
projectLocation = File("$projectDir/code/languages/org.iets3.opensource")
287-
mpsLocation = mpsHomeDir.asFile
288-
pluginsProperty.set(emptyList())
289-
mpsConfig = mps
290-
macros = listOf(Macro("iets3.github.opensource.home", "$projectDir"))
291-
junitFile = layout.buildDirectory.file("TEST-checkProject.xml").get().asFile
292-
junitFormat = "message"
293-
errorNoFail = true
285+
val checkmodels by tasks.registering(MpsCheck::class) {
286+
dependsOn(resolveMPS)
287+
javaLauncher.set(tasks.downloadJbr.get().javaLauncher)
288+
289+
projectLocation.set(file("$projectDir/code/languages/org.iets3.opensource"))
290+
mpsHome.set(mpsHomeDir)
291+
pluginRoots.add(mpsHomeDir.dir("plugins"))
292+
folderMacros.put("iets3.github.opensource.home", layout.projectDirectory)
293+
294+
junitFile.set(layout.buildDirectory.file("TEST-checkProject.xml"))
295+
junitFormat.set("message")
296+
ignoreFailures = true
294297
debug = false
295-
maxHeap = "4G"
298+
maxHeapSize = "4G"
296299
}
297300

298-
tasks.checkmodels { dependsOn(resolveMPS) }
299-
300301
val packageLanguages by tasks.registering(Zip::class) {
301302
dependsOn(buildLanguages, tasks.cyclonedxBom)
302303
from(artifactsDir) {

gradle/libs.versions.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[versions]
2-
mpsVersion = "2024.1.3"
3-
mpsQaVersion = "2024.1.+"
2+
mpsVersion = "2025.1"
3+
mpsQaVersion = "2025.1.+"
44
# if you want to build against a specific mbeddr branch, prepend it here with a dot.
55
# NOTE: instances of '/' in the branch name need to be replaced by '-'
66
# example: mbeddrVersion="feature-my_new_feature.2023.2.+"
7-
mbeddrVersion = "2024.1.+"
7+
mbeddrVersion = "2025.1.+"
88

99
gradle = "8.13"
10-
jbr = "17.0.11-b1207.30"
10+
jbr = "21.0.6-b895.109"
1111

1212
[libraries]
1313
mps = { group = "com.jetbrains", name = "mps", version.ref = "mpsVersion" }

0 commit comments

Comments
 (0)