Merge pull request #10 from modelix/release/modelix-24.1

Release modelix-24.1

build.gradle.kts

@@ -1,12 +1,7 @@
-/*
- * This file was generated by the Gradle 'init' task.
- *
- * This is a general purpose Gradle build.
- * Learn more about Gradle by exploring our samples at https://docs.gradle.org/8.0.2/samples
- */
 plugins {
     `java-platform`
     `maven-publish`
+    `version-catalog`
 }
 
 dependencies {
@@ -16,8 +11,8 @@ dependencies {
         api(libs.modelix.bulk.model.sync.lib)
         api(libs.modelix.bulk.model.sync.lib.js)
         api(libs.modelix.bulk.model.sync.lib.jvm)
+        api(libs.modelix.bulk.model.sync.mps)
         api(libs.modelix.bulk.model.sync.gradle)
-        api(libs.modelix.bulk.model.sync.solution)
         api(libs.modelix.bulk.model.sync.plugin)
         api(libs.modelix.kotlin.utils)
         api(libs.modelix.kotlin.utils.js)
@@ -76,6 +71,14 @@ dependencies {
         api(libs.modelix.build.tools.lib)
         api(libs.modelix.build.tools.gradle)
         api(libs.modelix.build.tools.plugin)
+
+        //mps plugins
+        api(libs.modelix.mps.diff.plugin)
+        api(libs.modelix.mps.generator.execution.plugin)
+        api(libs.modelix.mps.legacy.sync.plugin)
+        api(libs.modelix.mps.sync.plugin.lib)
+        api(libs.modelix.mps.sync.plugin)
+
     }
 }
 
@@ -113,41 +116,3 @@ publishing {
         }
     }
 }
-subprojects {
-    apply(plugin="java-platform")
-    apply(plugin="maven-publish")
-
-    publishing {
-        publications {
-            create<MavenPublication>("modelixMpsPlatform") {
-                group = "org.modelix"
-                version = platformVersion
-
-                from(components["javaPlatform"])
-            }
-        }
-        repositories {
-            maven {
-                name = "itemis"
-                url = if (version.toString().contains("SNAPSHOT")) {
-                    uri("https://artifacts.itemis.cloud/repository/maven-mps-snapshots/")
-                } else {
-                    uri("https://artifacts.itemis.cloud/repository/maven-mps-releases/")
-                }
-                credentials {
-                    username = project.findProperty("artifacts.itemis.cloud.user").toString()
-                    password = project.findProperty("artifacts.itemis.cloud.pw").toString()
-                }
-            }
-            maven {
-                name = "GitHubPackages"
-                url = uri("https://maven.pkg.github.com/modelix/modelix.platform")
-                credentials {
-                    username = project.findProperty("gpr.user") as? String ?: System.getenv("GITHUB_ACTOR")
-                    password = project.findProperty("gpr.key") as? String ?: System.getenv("GITHUB_TOKEN")
-                }
-            }
-        }
-    }
-}
-

docs/global/modules/platform/pages/howto/usage-platform.adoc

@@ -5,17 +5,14 @@
 
 The modelix platform provides component versions.
 To enforce these versions in your project's build you can add the platform as an enforcedPlatform.
-We make the following assumptions:
-
-* the string variable `mps_version` contains the mps version that is used in your project, e.g. `2021-1`
-* the string variable `modelix_platform_version` contains the version of the modelix platform you want to use, e. g. `23.1.0`
+We assume that the string variable `modelix_platform_version` contains the version of the modelix platform you want to use, e. g. `24.1.0`
 
 To enforce the versions provided by the platform in your Gradle build, you can use `enforcedPlatform` inside of a `dependencies` block like this:
 
 [source, kotlin]
 --
 dependencies {
-    implementation(enforcedPlatform("org.modelix:platform-mps-$mps_version:$modelix_platform_version"))
+    implementation(enforcedPlatform("org.modelix:platform:$modelix_platform_version"))
 }
 --
 
@@ -25,14 +22,11 @@ For example:
 [source, kotlin]
 --
 dependencies {
-    implementation(enforcedPlatform("org.modelix:platform-mps-$mps_version:$modelix_platform_version"))
+    implementation(enforcedPlatform("org.modelix:platform:$modelix_platform_version"))
     implementation("org.modelix:model-client")
 }
 --
 
-NOTE: If you want to handle dependencies to MPS version-specific modelix components yourself, you can use `org.modelix:platform` instead, which does not contain these dependencies.
-However, sometimes it might be necessary to pick a specific version of a single component, e.g. when one wants to test new features.
-
 == Overriding versions
 
 IMPORTANT: Overriding versions may lead to *incompatibilities* between individual modelix components.
@@ -42,7 +36,7 @@ In order to override versions inside the platform during dependency resolution,
 [source, kotlin]
 --
 dependencies {
-    implementation(platform("org.modelix:platform-mps-$mps_version:$modelix_platform_version"))
+    implementation(platform("org.modelix:platform:$modelix_platform_version"))
     implementation("org.modelix:model-client:2.4.0")
 }
 --

gradle/libs.versions.toml

@@ -1,16 +1,16 @@
 [versions]
-core = "3.12.1"
+core = "7.3.0"
 incremental = "0.2.0"
-buildTools = "1.1.0"
-modelixMPSPatch = "157"
+buildTools = "1.5.0"
+mpsPlugins = "0.7.1"
 
 [libraries]
 modelix-authorization = { group = "org.modelix", name = "authorization", version.ref = "core"}
 modelix-bulk-model-sync-lib = { group = "org.modelix", name = "bulk-model-sync-lib", version.ref = "core"}
 modelix-bulk-model-sync-lib-js = { group = "org.modelix", name = "bulk-model-sync-lib-js", version.ref = "core"}
 modelix-bulk-model-sync-lib-jvm = { group = "org.modelix", name = "bulk-model-sync-lib-jvm", version.ref = "core"}
+modelix-bulk-model-sync-mps =  { group = "org.modelix", name = "bulk-model-sync-mps", version.ref = "core"}
 modelix-bulk-model-sync-gradle = { group = "org.modelix", name = "bulk-model-sync-gradle", version.ref = "core"}
-modelix-bulk-model-sync-solution = { group = "org.modelix.mps", name = "bulk-model-sync-solution", version.ref = "core"}
 modelix-bulk-model-sync-plugin = { group = "org.modelix.bulk-model-sync", name = "org.modelix.bulk-model-sync.gradle.plugin", version.ref = "core"}
 modelix-kotlin-utils = { group = "org.modelix", name = "kotlin-utils", version.ref = "core"}
 modelix-kotlin-utils-js = { group = "org.modelix", name = "kotlin-utils-js", version.ref = "core"}
@@ -66,3 +66,9 @@ modelix-incremental-jvm = { group = "org.modelix", name = "incremental-jvm", ver
 modelix-build-tools-lib = { group = "org.modelix.mps", name = "build-tools-lib", version.ref = "buildTools" }
 modelix-build-tools-gradle = { group = "org.modelix.mps", name = "build-tools-gradle", version.ref = "buildTools" }
 modelix-build-tools-plugin = { group = "org.modelix.mps.build-tools", name = "org.modelix.mps.build-tools.gradle.plugin", version.ref = "buildTools"}
+
+modelix-mps-diff-plugin = { group = "org.modelix.mps", name = "diff-plugin", version.ref = "mpsPlugins" }
+modelix-mps-generator-execution-plugin = { group = "org.modelix.mps", name = "generator-execution-plugin", version.ref = "mpsPlugins" }
+modelix-mps-legacy-sync-plugin = { group = "org.modelix.mps", name = "legacy-sync-plugin", version.ref = "mpsPlugins" }
+modelix-mps-sync-plugin-lib = { group = "org.modelix.mps", name = "sync-plugin-lib", version.ref = "mpsPlugins" }
+modelix-mps-sync-plugin = { group = "org.modelix.mps", name = "sync-plugin", version.ref = "mpsPlugins" }

platform-test/build.gradle.kts

@@ -25,7 +25,10 @@ kotlin {
         val test by getting {
             dependencies {
                 api(enforcedPlatform("org.modelix:platform:$platformVersion"))
-                implementation("org.modelix:model-server")
+                implementation("org.modelix:model-server") // to test core version
+                implementation("org.modelix:incremental") // to test incremental version
+                implementation("org.modelix.mps:build-tools-lib") // to test build-tools version
+                implementation("org.modelix.mps:sync-plugin-lib") // to test mps plugins version
             }
         }
     }

settings.gradle.kts

@@ -8,8 +8,3 @@
  */
 
 rootProject.name = "platform"
-include("platform-mps-2020-3")
-include("platform-mps-2021-1")
-include("platform-mps-2021-2")
-include("platform-mps-2021-3")
-