Merge pull request #8 from modelix/release/modelix-23.2

Release modelix-23.2
modelix · Nov 2, 2023 · f967f76 · f967f76
2 parents a4d9408 + eff0953
commit f967f76
Show file tree

Hide file tree

Showing 7 changed files with 76 additions and 19 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -13,26 +13,59 @@ dependencies {
     constraints {
         //modelix core
         api(libs.modelix.authorization)
+        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.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)
+        api(libs.modelix.kotlin.utils.jvm)
         api(libs.modelix.light.model.client)
+        api(libs.modelix.light.model.client.js)
+        api(libs.modelix.light.model.client.jvm)
         api(libs.modelix.model.server.lib)
         api(libs.modelix.metamodel.export)
         api(libs.modelix.model.api.gen)
         api(libs.modelix.model.api.gen.gradle)
-        api(libs.modelix.model.api.gen.plugin)
         api(libs.modelix.model.api.gen.runtime)
         api(libs.modelix.model.api.gen.runtime.js)
         api(libs.modelix.model.api.gen.runtime.jvm)
+        api(libs.modelix.model.api.gen.plugin)
         api(libs.modelix.model.api)
         api(libs.modelix.model.api.js)
         api(libs.modelix.model.api.jvm)
         api(libs.modelix.model.client)
         api(libs.modelix.model.client.js)
         api(libs.modelix.model.client.jvm)
+        api(libs.modelix.model.datastructure)
+        api(libs.modelix.model.datastructure.js)
+        api(libs.modelix.model.datastructure.jvm)
         api(libs.modelix.model.server)
         api(libs.modelix.model.server.api)
         api(libs.modelix.model.server.api.js)
         api(libs.modelix.model.server.api.jvm)
+        api(libs.modelix.model.server.lib)
         api(libs.modelix.model.server.with.dependencies)
+        api(libs.modelix.modelql.client)
+        api(libs.modelix.modelql.client.js)
+        api(libs.modelix.modelql.client.jvm)
+        api(libs.modelix.modelql.core)
+        api(libs.modelix.modelql.core.js)
+        api(libs.modelix.modelql.core.jvm)
+        api(libs.modelix.modelql.html)
+        api(libs.modelix.modelql.html.js)
+        api(libs.modelix.modelql.html.jvm)
+        api(libs.modelix.modelql.server)
+        api(libs.modelix.modelql.typed)
+        api(libs.modelix.modelql.typed.js)
+        api(libs.modelix.modelql.typed.jvm)
+        api(libs.modelix.modelql.untyped)
+        api(libs.modelix.modelql.untyped.js)
+        api(libs.modelix.modelql.untyped.jvm)
+        api(libs.modelix.mps.model.adapters)
+        api(libs.modelix.mps.model.server.plugin)
 
         //incremental
         api(libs.modelix.incremental)

diff --git a/gradle.properties b/gradle.properties
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,30 +1,63 @@
 [versions]
-core = "2.4.0"
-incremental = "0.1.4"
-buildTools = "1.0.11"
+core = "3.12.1"
+incremental = "0.2.0"
+buildTools = "1.1.0"
+modelixMPSPatch = "157"
 
 [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-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"}
+modelix-kotlin-utils-jvm = { group = "org.modelix", name = "kotlin-utils-jvm", version.ref = "core"}
 modelix-light-model-client = { group = "org.modelix", name = "light-model-client", version.ref = "core"}
-modelix-model-server-lib = { group = "org.modelix", name = "model-server-lib", version.ref = "core"}
+modelix-light-model-client-js = { group = "org.modelix", name = "light-model-client-js", version.ref = "core"}
+modelix-light-model-client-jvm = { group = "org.modelix", name = "light-model-client-jvm", version.ref = "core"}
 modelix-metamodel-export = { group = "org.modelix.mps", name = "metamodel-export", version.ref = "core"}
 modelix-model-api-gen = { group = "org.modelix", name = "model-api-gen", version.ref = "core"}
 modelix-model-api-gen-gradle = { group = "org.modelix", name = "model-api-gen-gradle", version.ref = "core"}
 modelix-model-api-gen-runtime = { group = "org.modelix", name = "model-api-gen-runtime", version.ref = "core"}
 modelix-model-api-gen-runtime-js = { group = "org.modelix", name = "model-api-gen-runtime-js", version.ref = "core"}
 modelix-model-api-gen-runtime-jvm = { group = "org.modelix", name = "model-api-gen-runtime-jvm", version.ref = "core"}
+modelix-model-api-gen-plugin = { group = "org.modelix.model-api-gen", name = "org.modelix.model-api-gen.gradle.plugin", version.ref = "core"}
 modelix-model-api = { group = "org.modelix", name = "model-api", version.ref = "core"}
 modelix-model-api-js = { group = "org.modelix", name = "model-api-js", version.ref = "core"}
 modelix-model-api-jvm = { group = "org.modelix", name = "model-api-jvm", version.ref = "core"}
-modelix-model-api-gen-plugin = { group = "org.modelix.model-api-gen", name = "org.modelix.model-api-gen.gradle.plugin", version.ref = "core"}
 modelix-model-client = { group = "org.modelix", name = "model-client", version.ref = "core"}
 modelix-model-client-js = { group = "org.modelix", name = "model-client-js", version.ref = "core"}
 modelix-model-client-jvm = { group = "org.modelix", name = "model-client-jvm", version.ref = "core"}
+modelix-model-datastructure = { group = "org.modelix", name = "model-datastructure", version.ref = "core"}
+modelix-model-datastructure-js = { group = "org.modelix", name = "model-datastructure-js", version.ref = "core"}
+modelix-model-datastructure-jvm = { group = "org.modelix", name = "model-datastructure-jvm", version.ref = "core"}
 modelix-model-server = { group = "org.modelix", name = "model-server", version.ref = "core"}
 modelix-model-server-api = { group = "org.modelix", name = "model-server", version.ref = "core"}
 modelix-model-server-api-js = { group = "org.modelix", name = "modelix-model-server-api-js", version.ref = "core"}
 modelix-model-server-api-jvm = { group = "org.modelix", name = "modelix-model-server-api-jvm", version.ref = "core"}
+modelix-model-server-lib = { group = "org.modelix", name = "model-server-lib", version.ref = "core"}
 modelix-model-server-with-dependencies = { group = "org.modelix", name = "modelix-model-server-with-dependencies", version.ref = "core"}
+modelix-modelql-client = { group = "org.modelix", name = "modelql-client", version.ref = "core" }
+modelix-modelql-client-js = { group = "org.modelix", name = "modelql-client-js", version.ref = "core" }
+modelix-modelql-client-jvm = { group = "org.modelix", name = "modelql-client-jvm", version.ref = "core" }
+modelix-modelql-core = { group = "org.modelix", name = "modelql-core", version.ref = "core" }
+modelix-modelql-core-js = { group = "org.modelix", name = "modelql-core-js", version.ref = "core" }
+modelix-modelql-core-jvm = { group = "org.modelix", name = "modelql-core-jvm", version.ref = "core" }
+modelix-modelql-html = { group = "org.modelix", name = "modelql-html", version.ref = "core" }
+modelix-modelql-html-js = { group = "org.modelix", name = "modelql-html-js", version.ref = "core" }
+modelix-modelql-html-jvm = { group = "org.modelix", name = "modelql-html-jvm", version.ref = "core" }
+modelix-modelql-server = { group = "org.modelix", name = "modelql-server", version.ref = "core"}
+modelix-modelql-typed = { group = "org.modelix", name = "modelql-typed", version.ref = "core" }
+modelix-modelql-typed-js = { group = "org.modelix", name = "modelql-typed-js", version.ref = "core" }
+modelix-modelql-typed-jvm = { group = "org.modelix", name = "modelql-typed-jvm", version.ref = "core" }
+modelix-modelql-untyped = { group = "org.modelix", name = "modelql-untyped", version.ref = "core" }
+modelix-modelql-untyped-js = { group = "org.modelix", name = "modelql-untyped-js", version.ref = "core" }
+modelix-modelql-untyped-jvm = { group = "org.modelix", name = "modelql-untyped-jvm", version.ref = "core" }
+modelix-mps-model-adapters = { group = "org.modelix.mps", name = "model-adapters", version.ref = "core" }
+modelix-mps-model-server-plugin = { group = "org.modelix.mps", name = "model-server-plugin", version.ref = "core"}
 
 modelix-incremental = { group = "org.modelix", name = "incremental", version.ref = "incremental" }
 modelix-incremental-js = { group = "org.modelix", name = "incremental-js", version.ref = "incremental" }

diff --git a/platform-mps-2020-3/build.gradle.kts b/platform-mps-2020-3/build.gradle.kts
@@ -1,5 +1,4 @@
-val modelixMPSPatchVersion: String by rootProject
-val modelixVersion = "2020.3.$modelixMPSPatchVersion"
+val modelixVersion = "2020.3.${libs.versions.modelixMPSPatch}"
 val platformVersion = file("../platform_version.txt").readText().trim()
 
 javaPlatform {
@@ -13,7 +12,6 @@ dependencies {
         api("org.modelix.mps.model-download-gradle:org.modelix.mps.model-download-gradle.gradle.plugin:$modelixVersion")
         api("org.modelix.mps:model-server-sync-plugin:$modelixVersion")
         api("org.modelix.mps:build-solution:$modelixVersion")
-        api("org.modelix.mps:headless-runner:$modelixVersion")
         api("org.modelix.mps:web-editors-plugin:$modelixVersion")
     }
 }

diff --git a/platform-mps-2021-1/build.gradle.kts b/platform-mps-2021-1/build.gradle.kts
@@ -1,5 +1,4 @@
-val modelixMPSPatchVersion: String by rootProject
-val modelixVersion = "2021.1.$modelixMPSPatchVersion"
+val modelixVersion = "2021.1.${libs.versions.modelixMPSPatch}"
 val platformVersion = file("../platform_version.txt").readText().trim()
 
 javaPlatform {
@@ -13,7 +12,6 @@ dependencies {
         api("org.modelix.mps.model-download-gradle:org.modelix.mps.model-download-gradle.gradle.plugin:$modelixVersion")
         api("org.modelix.mps:model-server-sync-plugin:$modelixVersion")
         api("org.modelix.mps:build-solution:$modelixVersion")
-        api("org.modelix.mps:headless-runner:$modelixVersion")
         api("org.modelix.mps:web-editors-plugin:$modelixVersion")
     }
 }

diff --git a/platform-mps-2021-2/build.gradle.kts b/platform-mps-2021-2/build.gradle.kts
@@ -1,5 +1,4 @@
-val modelixMPSPatchVersion: String by rootProject
-val modelixVersion = "2021.2.$modelixMPSPatchVersion"
+val modelixVersion = "2021.2.$${libs.versions.modelixMPSPatch}"
 val platformVersion = file("../platform_version.txt").readText().trim()
 
 javaPlatform {
@@ -13,7 +12,6 @@ dependencies {
         api("org.modelix.mps.model-download-gradle:org.modelix.mps.model-download-gradle.gradle.plugin:$modelixVersion")
         api("org.modelix.mps:model-server-sync-plugin:$modelixVersion")
         api("org.modelix.mps:build-solution:$modelixVersion")
-        api("org.modelix.mps:headless-runner:$modelixVersion")
         api("org.modelix.mps:web-editors-plugin:$modelixVersion")
     }
 }

diff --git a/platform-mps-2021-3/build.gradle.kts b/platform-mps-2021-3/build.gradle.kts
@@ -1,5 +1,4 @@
-val modelixMPSPatchVersion: String by rootProject
-val modelixVersion = "2021.3.$modelixMPSPatchVersion"
+val modelixVersion = "2021.3.${libs.versions.modelixMPSPatch}"
 val platformVersion = file("../platform_version.txt").readText().trim()
 
 javaPlatform {
@@ -13,7 +12,6 @@ dependencies {
         api("org.modelix.mps.model-download-gradle:org.modelix.mps.model-download-gradle.gradle.plugin:$modelixVersion")
         api("org.modelix.mps:model-server-sync-plugin:$modelixVersion")
         api("org.modelix.mps:build-solution:$modelixVersion")
-        api("org.modelix.mps:headless-runner:$modelixVersion")
         api("org.modelix.mps:web-editors-plugin:$modelixVersion")
     }
 }