diff --git a/.gitignore b/.gitignore
index 47f2096..c886fc1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ build.xml
mps/dependencies/
build/
.gradle
+.mpsconfig
# generated java classes and java source files
classes_gen
diff --git a/build.gradle.kts b/build.gradle.kts
index 6fb6cf3..98c1ca2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,17 +7,18 @@ import kotlin.reflect.full.memberProperties
buildscript {
repositories {
- maven { url = uri("https://projects.itemis.de/nexus/content/repositories/mbeddr") }
+ maven { url = uri("https://artifacts.itemis.cloud/repository/maven-mps/") }
}
dependencies {
- classpath("de.itemis.mps:mps-gradle-plugin:1.6.281.3790039")
+ classpath("de.itemis.mps:mps-gradle-plugin:1.28.0.1.f8ee996")
}
}
plugins {
id("maven-publish")
id("download-jbr") version "1.5.269.964f94a"
+ id("org.modelix.mps.build-tools") version "1.0.10-3-g7dcb0d3.dirty-SNAPSHOT"
}
repositories {
@@ -50,6 +51,11 @@ repositories {
password = githubToken
}
}
+
+ maven {
+ url = uri("https://artifacts.itemis.cloud/repository/maven-mps/")
+ }
+
//maven { url = uri("https://projects.itemis.de/nexus/content/repositories/mbeddr") }
mavenCentral()
}
@@ -90,8 +96,8 @@ object Versions {
// mps
public const val mpsMajor: String = "2021"
- public const val mpsMinor: String = "1"
- public const val mpsPatch: String = "3"
+ public const val mpsMinor: String = "3"
+ public const val mpsPatch: String = "5"
public const val mpsMajorMinor: String = Versions.mpsMajor + "." + Versions.mpsMinor
public const val mpsFull: String = Versions.mpsMajorMinor + "." + Versions.mpsPatch
@@ -99,7 +105,7 @@ object Versions {
public const val buildVerison: String = Versions.mpsFull + "-SNAPSHOT"
// mps dependencies
- public const val extensions: String = "2021.1.2150.821d1bc"
+ public const val extensions: String = "2021.3.2869.e5eae69"
public const val antjunit: String = "1.10.6"
override fun toString() : String{
@@ -108,10 +114,6 @@ object Versions {
}
-
-
-
-
// tasks
val extractMps by tasks.registering(Copy::class) {
from({ mps.resolve().map { zipTree(it) } })
@@ -183,7 +185,7 @@ val packageMpsPlugin by tasks.registering(Zip::class) {
dependsOn(buildLanguages)
archiveFileName.set(Versions.groupID + "." + Versions.artifactID + "." + Versions.buildVerison + ".zip")
- from(file("build/artifacts/de.doge.mps.dot.build"))
+ from(file("build/artifacts/de.doge.dot.build"))
destinationDirectory.set(publishDir)
}
@@ -218,3 +220,4 @@ publishing {
}
}
+
diff --git a/buildAll.xml b/buildAll.xml
index 6313d64..56a7470 100644
--- a/buildAll.xml
+++ b/buildAll.xml
@@ -32,10 +32,16 @@
-
-
+
+
+
+
+
+
+
+
@@ -101,7 +107,8 @@
-
+
+
@@ -121,7 +128,9 @@
+
+
@@ -168,13 +177,15 @@
-
+
+
+
@@ -203,9 +214,7 @@
-
-
-
+
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 84d1f85..17655d0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/mps/.mps/migration.xml b/mps/.mps/migration.xml
index d34a86a..84ab930 100644
--- a/mps/.mps/migration.xml
+++ b/mps/.mps/migration.xml
@@ -5,5 +5,8 @@
+
+
+
-
+
\ No newline at end of file
diff --git a/mps/languages/libre.doge.mps.dot.plaintextgen/libre.doge.mps.dot.plaintextgen.mpl b/mps/languages/libre.doge.mps.dot.plaintextgen/libre.doge.mps.dot.plaintextgen.mpl
index b71fbf3..7abeb9c 100644
--- a/mps/languages/libre.doge.mps.dot.plaintextgen/libre.doge.mps.dot.plaintextgen.mpl
+++ b/mps/languages/libre.doge.mps.dot.plaintextgen/libre.doge.mps.dot.plaintextgen.mpl
@@ -29,7 +29,7 @@
-
+
@@ -42,7 +42,7 @@
-
+
@@ -61,7 +61,7 @@
-
+
@@ -86,7 +86,7 @@
-
+
diff --git a/mps/languages/libre.doge.mps.dot/libre.doge.mps.dot.mpl b/mps/languages/libre.doge.mps.dot/libre.doge.mps.dot.mpl
index 2c0d55b..be41c6c 100644
--- a/mps/languages/libre.doge.mps.dot/libre.doge.mps.dot.mpl
+++ b/mps/languages/libre.doge.mps.dot/libre.doge.mps.dot.mpl
@@ -18,7 +18,7 @@
6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)
-
+
@@ -43,7 +43,7 @@
-
+
diff --git a/mps/languages/libre.doge.mps.dot/models/libre.doge.mps.dot.behavior.mps b/mps/languages/libre.doge.mps.dot/models/libre.doge.mps.dot.behavior.mps
index a9b22f7..7533097 100644
--- a/mps/languages/libre.doge.mps.dot/models/libre.doge.mps.dot.behavior.mps
+++ b/mps/languages/libre.doge.mps.dot/models/libre.doge.mps.dot.behavior.mps
@@ -109,9 +109,6 @@
-
-
-
@@ -161,6 +158,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -171,18 +187,14 @@
-
-
-
-
+
+
-
-
-
-
+
+
@@ -200,18 +212,14 @@
-
-
-
-
+
+
-
-
-
-
+
+
@@ -258,35 +266,33 @@
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -299,40 +305,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -343,35 +315,33 @@
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -390,18 +360,14 @@
-
-
-
-
+
+
-
-
-
-
+
+
@@ -412,18 +378,14 @@
-
-
-
-
+
+
-
-
-
-
+
+
diff --git a/mps/languages/libre.doge.mps.dot/models/libre.doge.mps.dot.constraints.mps b/mps/languages/libre.doge.mps.dot/models/libre.doge.mps.dot.constraints.mps
index 1dbdb5b..eee07ec 100644
--- a/mps/languages/libre.doge.mps.dot/models/libre.doge.mps.dot.constraints.mps
+++ b/mps/languages/libre.doge.mps.dot/models/libre.doge.mps.dot.constraints.mps
@@ -3,7 +3,7 @@
-
+
@@ -72,9 +72,6 @@
-
-
-
@@ -122,14 +119,6 @@
-
-
-
-
-
-
-
-
@@ -139,37 +128,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/mps/solutions/libre.doge.mps.dot.build/models/libre.doge.mps.dot.build.mps b/mps/solutions/libre.doge.mps.dot.build/models/libre.doge.mps.dot.build.mps
index 77ae433..aa382ed 100644
--- a/mps/solutions/libre.doge.mps.dot.build/models/libre.doge.mps.dot.build.mps
+++ b/mps/solutions/libre.doge.mps.dot.build/models/libre.doge.mps.dot.build.mps
@@ -85,27 +85,22 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -234,7 +229,7 @@
-
+
@@ -245,16 +240,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -272,6 +257,106 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -324,6 +409,10 @@
+
+
+
+
diff --git a/mps/solutions/libre.doge.mps.dot.genplan/libre.doge.mps.dot.genplan.msd b/mps/solutions/libre.doge.mps.dot.genplan/libre.doge.mps.dot.genplan.msd
index 069508e..92f2094 100644
--- a/mps/solutions/libre.doge.mps.dot.genplan/libre.doge.mps.dot.genplan.msd
+++ b/mps/solutions/libre.doge.mps.dot.genplan/libre.doge.mps.dot.genplan.msd
@@ -12,13 +12,13 @@
-
+
-
+
diff --git a/mps/solutions/libre.doge.mps.dot.genplan/models/libre.doge.mps.dot.genplan.generate@plan.mps b/mps/solutions/libre.doge.mps.dot.genplan/models/libre.doge.mps.dot.genplan.generate@plan.mps
index 7e495fc..1b2f4d4 100644
--- a/mps/solutions/libre.doge.mps.dot.genplan/models/libre.doge.mps.dot.genplan.generate@plan.mps
+++ b/mps/solutions/libre.doge.mps.dot.genplan/models/libre.doge.mps.dot.genplan.generate@plan.mps
@@ -2,7 +2,7 @@
-
+
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 78a5202..4f85a7c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,6 +16,9 @@ pluginManagement {
}
repositories {
+
+ maven { url = uri("https://artifacts.itemis.cloud/repository/maven-mps/") }
+
mavenLocal()
maven {
url = uri("https://maven.pkg.github.com/mbeddr/mps-gradle-plugin")