diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 25c6f2cc0..9388de687 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4,7 +4,7 @@ name: FASTEN_CI
on: [push, pull_request]
env:
- MPS_VER: "2021.1"
+ MPS_VER: "2022.2"
GITHUB_ACTOR: ${{ github.actor }}
GITHUB_TOKEN: ${{ secrets.FASTEN_GITHUB_PKG_REGISTRY }}
@@ -25,11 +25,16 @@ jobs:
run: |
Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
- - name: Set up JDK 11
+ - name: Set up JDK 17
uses: actions/setup-java@v1
with:
- java-version: 11
-
+ java-version: 17
+
+ - name: Resolve MPS
+ uses: gradle/gradle-build-action@v2.4.2
+ with:
+ arguments: resolveMps -Pgpr.user=${{github.actor}} -Pgpr.token=${{ secrets.GITHUB_TOKEN }}
+
- name: Build FASTEN
uses: gradle/gradle-build-action@v2.4.2
with:
@@ -115,10 +120,10 @@ jobs:
run: |
Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
- - name: Set up JDK 11
+ - name: Set up JDK 17
uses: actions/setup-java@v1
with:
- java-version: 11
+ java-version: 17
#- name: Build FASTEN Assurance Distribution
# uses: gradle/gradle-build-action@v2.4.2
diff --git a/build.gradle.kts b/build.gradle.kts
index cd6170e7e..e827e2791 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,25 +5,17 @@ import de.itemis.mps.gradle.modelcheck.ModelcheckMpsProjectPlugin
import java.util.Date
//will pull the groovy classes/types from nexus to the classpath
-buildscript {
- dependencies {
- // Version must match download-jbr plugin below
- classpath("de.itemis.mps:mps-gradle-plugin:1.11.+")
- }
-
- dependencyLocking { lockAllConfigurations() }
-}
-
plugins {
base
`maven-publish`
id("co.riiid.gradle") version "0.4.2"
// Version must match buildscript mps-gradle-plugin dependency above
- id("download-jbr") version "1.11.+"
+ id("download-jbr") version "1.17.+"
+ id("de.itemis.mps.gradle.common") version "1.18.+"
}
-val jbrVers = "11_0_12-b1504.28"
+val jbrVers = "17.0.6-b653.34"
downloadJbr {
jbrVersion = jbrVers
@@ -32,29 +24,6 @@ downloadJbr {
// detect if we are in a CI build
val ciBuild = (System.getenv("CI") != null && System.getenv("CI").toBoolean()) || project.hasProperty("forceCI") || project.hasProperty("teamcity")
-// Detect jdk location, required to start ant with tools.jar on classpath otherwise javac and tests will fail
-val jdk_home: String = if (project.hasProperty("java11_home")) {
- project.findProperty("java11_home") as String
-} else if (System.getenv("JB_JAVA11_HOME") != null) {
- System.getenv("JB_JAVA11_HOME")!!
-} else {
- val expected = JavaVersion.VERSION_11
- if (JavaVersion.current() != expected) {
- throw GradleException("This build script requires Java 11 but you are currently using ${JavaVersion.current()}.\nWhat you can do:\n"
- + " * Use project property java11_home to point to the Java 11 JDK.\n"
- + " * Use environment variable JB_JAVA11_HOME to point to the Java 11 JDK\n"
- + " * Run Gradle using Java 11")
- }
- System.getProperty("java.home")!!
-}
-
-// Check JDK location
-if (!File(jdk_home, "lib").exists()) {
- throw GradleException("Unable to locate JDK home folder. Detected folder is: $jdk_home")
-}
-
-logger.info("Using JDK at {}", jdk_home)
-
var nexusUsername: String? by extra
var nexusPassword: String? by extra
@@ -66,8 +35,10 @@ if (nexusUsername == null) {
logger.info("Repository username: {}", nexusUsername)
// Project versions
-val major = "2021"
-val minor = "3"
+val major = "2022"
+val minor = "2"
+
+val mpsVersion ="$major.$minor"
// Dependency versions
val platformVersion = "$major.$minor.+"
@@ -103,7 +74,7 @@ configurations {
val jbrLinux by creating
dependencies {
- mps("com.jetbrains:mps:$platformVersion")
+ mps("com.jetbrains:mps:$mpsVersion")
languageLibs("com.mbeddr:platform:$platformVersion")
languageLibs("org.mpsqa:all-in-one:$platformVersion")
antLib("org.apache.ant:ant-junit:1.10.6")
@@ -112,7 +83,7 @@ configurations {
jbrLinux("com.jetbrains.jdk:jbr_jcef:$jbrVers:linux-x64@tgz")
}
}
-
+
dependencyLocking { lockAllConfigurations() }
repositories {
@@ -155,8 +126,7 @@ val resolveMps = if (skipResolveMps) {
}
// tools needed for compiler support in ant calls
-val buildScriptClasspath = project.configurations["antLib"] +
- project.files("$project.jdk_home/lib/tools.jar")
+val buildScriptClasspath = project.configurations["antLib"]
val artifactsDir = file("$buildDir/artifacts")
val dependenciesDir = file("$buildDir/dependencies")
@@ -172,22 +142,19 @@ val defaultScriptArgs = mapOf(
"version" to version,
"build.date" to Date(),
//incremental build support
- "mps.generator.skipUnmodifiedModels" to true
+ "mps.generator.skipUnmodifiedModels" to true,
+ "jdk.nio.zipfs.allowDotZipEntry" to true,
+ "jdk.util.zip.disableZip64ExtraFieldValidation" to true
)
-// enables https://github.com/mbeddr/mps-gradle-plugin#providing-global-defaults
-extra["itemis.mps.gradle.ant.defaultScriptArgs"] = defaultScriptArgs.map { "-D${it.key}=${it.value}" }
-extra["itemis.mps.gradle.ant.defaultScriptClasspath"] = buildScriptClasspath
-extra["itemis.mps.gradle.ant.defaultJavaExecutable"] = File(jdk_home, "bin/java")
-
tasks {
val configureJava by registering {
val downloadJbr = named("downloadJbr", DownloadJbrForPlatform::class)
dependsOn(downloadJbr)
doLast {
- extra["itemis.mps.gradle.ant.defaultScriptArgs"] = defaultScriptArgs.map { "-D${it.key}=${it.value}" }
- extra["itemis.mps.gradle.ant.defaultScriptClasspath"] = buildScriptClasspath
- extra["itemis.mps.gradle.ant.defaultJavaExecutable"] = downloadJbr.get().javaExecutable
+ project.extra["itemis.mps.gradle.ant.defaultScriptArgs"] = defaultScriptArgs.map { "-D${it.key}=${it.value}" }
+ project.extra["itemis.mps.gradle.ant.defaultScriptClasspath"] = buildScriptClasspath
+ project.extra["itemis.mps.gradle.ant.defaultJavaExecutable"] = downloadJbr.get().javaExecutable
}
}
@@ -260,6 +227,7 @@ tasks {
}
val run_all_tests by registering(TestLanguages::class) {
+ dependsOn(configureJava)
description = "Will execute all tests from command line"
script = "$buildDir/scripts/build-all-tests.xml"
doLast {
diff --git a/build/scripts/build_all_scripts.xml b/build/scripts/build_all_scripts.xml
index 1280d5f10..5f7a8e392 100644
--- a/build/scripts/build_all_scripts.xml
+++ b/build/scripts/build_all_scripts.xml
@@ -194,6 +194,7 @@
+
diff --git a/buildscript-gradle.lockfile b/buildscript-gradle.lockfile
deleted file mode 100644
index e1e1e2027..000000000
--- a/buildscript-gradle.lockfile
+++ /dev/null
@@ -1,27 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-co.riiid.gradle:co.riiid.gradle.gradle.plugin:0.4.2=classpath
-commons-beanutils:commons-beanutils:1.8.0=classpath
-commons-codec:commons-codec:1.6=classpath
-commons-collections:commons-collections:3.2.1=classpath
-commons-lang:commons-lang:2.4=classpath
-commons-logging:commons-logging:1.1.1=classpath
-de.itemis.mps:mps-gradle-plugin:1.11.330.8d31adc=classpath
-download-jbr:download-jbr.gradle.plugin:1.11.330.8d31adc=classpath
-gradle.plugin.co.riiid:gradle-github-plugin:0.4.2=classpath
-net.sf.ezmorph:ezmorph:1.0.6=classpath
-net.sf.json-lib:json-lib:2.3=classpath
-net.sourceforge.nekohtml:nekohtml:1.9.16=classpath
-net.swiftzer.semver:semver:1.1.2=classpath
-org.apache.httpcomponents:httpclient:4.2.1=classpath
-org.apache.httpcomponents:httpcore:4.2.1=classpath
-org.codehaus.groovy.modules.http-builder:http-builder:0.7.1=classpath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21=classpath
-org.jetbrains.kotlin:kotlin-stdlib:1.6.21=classpath
-org.jetbrains:annotations:13.0=classpath
-org.slf4j:slf4j-api:1.6.6=classpath
-org.zeroturnaround:zt-zip:1.8=classpath
-xerces:xercesImpl:2.9.1=classpath
-xml-resolver:xml-resolver:1.2=classpath
-empty=
diff --git a/code/languages/com.mbeddr.formal.nusmv/.mps/migration.xml b/code/languages/com.mbeddr.formal.nusmv/.mps/migration.xml
index fa07800f8..345bfc32f 100644
--- a/code/languages/com.mbeddr.formal.nusmv/.mps/migration.xml
+++ b/code/languages/com.mbeddr.formal.nusmv/.mps/migration.xml
@@ -8,6 +8,6 @@
-
+
\ No newline at end of file
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.activity/icons/activity_diagram.PNG b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.activity/icons/activity_diagram.png
similarity index 100%
rename from code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.activity/icons/activity_diagram.PNG
rename to code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.activity/icons/activity_diagram.png
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.git/com.fasten.base.git.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.git/com.fasten.base.git.mpl
index d7169dca4..19ca7778c 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.git/com.fasten.base.git.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.git/com.fasten.base.git.mpl
@@ -21,18 +21,16 @@
1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)
-
+
-
-
@@ -53,7 +51,7 @@
-
+
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.git/models/com.fasten.base.git.behavior.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.git/models/com.fasten.base.git.behavior.mps
index 56e265c6e..046bdd108 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.git/models/com.fasten.base.git.behavior.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.fasten.base.git/models/com.fasten.base.git.behavior.mps
@@ -2,7 +2,7 @@
-
+
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/com.mbeddr.formal.nusmv.cbd.mpl b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/com.mbeddr.formal.nusmv.cbd.mpl
index 1ff8da430..d1e40f324 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/com.mbeddr.formal.nusmv.cbd.mpl
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.nusmv.cbd/com.mbeddr.formal.nusmv.cbd.mpl
@@ -191,7 +191,6 @@
-
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/sandbox/com.mbeddr.formal.ocra.sandbox.msd b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/sandbox/com.mbeddr.formal.ocra.sandbox.msd
index 6f20c8a2c..d5f264710 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/sandbox/com.mbeddr.formal.ocra.sandbox.msd
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/sandbox/com.mbeddr.formal.ocra.sandbox.msd
@@ -17,7 +17,7 @@
-
+
diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/sandbox/models/com.mbeddr.formal.ocra.sandbox.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/sandbox/models/com.mbeddr.formal.ocra.sandbox.mps
index 0bd1a786d..d9502b0a6 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/sandbox/models/com.mbeddr.formal.ocra.sandbox.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.ocra/sandbox/models/com.mbeddr.formal.ocra.sandbox.mps
@@ -283,7 +283,7 @@
-