From ea29358c031c98afa241e77dea852c2b8e4a8085 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 15:23:03 +0000 Subject: [PATCH 1/2] build(deps): bump modelixCore from 4.11.5 to 7.0.0 Bumps `modelixCore` from 4.11.5 to 7.0.0. Updates `org.modelix:model-api` from 4.11.5 to 7.0.0 - [Release notes](https://github.com/modelix/modelix.core/releases) - [Changelog](https://github.com/modelix/modelix.core/blob/main/.releaserc.json) - [Commits](https://github.com/modelix/modelix.core/compare/4.11.5...7.0.0) Updates `org.modelix:model-api-gen-runtime` from 4.11.5 to 7.0.0 - [Release notes](https://github.com/modelix/modelix.core/releases) - [Changelog](https://github.com/modelix/modelix.core/blob/main/.releaserc.json) - [Commits](https://github.com/modelix/modelix.core/compare/4.11.5...7.0.0) Updates `org.modelix:light-model-client` from 4.11.5 to 7.0.0 - [Release notes](https://github.com/modelix/modelix.core/releases) - [Changelog](https://github.com/modelix/modelix.core/blob/main/.releaserc.json) - [Commits](https://github.com/modelix/modelix.core/compare/4.11.5...7.0.0) Updates `org.modelix:authorization` from 4.11.5 to 7.0.0 - [Release notes](https://github.com/modelix/modelix.core/releases) - [Changelog](https://github.com/modelix/modelix.core/blob/main/.releaserc.json) - [Commits](https://github.com/modelix/modelix.core/compare/4.11.5...7.0.0) Updates `org.modelix:model-client` from 4.11.5 to 7.0.0 - [Release notes](https://github.com/modelix/modelix.core/releases) - [Changelog](https://github.com/modelix/modelix.core/blob/main/.releaserc.json) - [Commits](https://github.com/modelix/modelix.core/compare/4.11.5...7.0.0) Updates `org.modelix:model-server` from 4.11.5 to 7.0.0 - [Release notes](https://github.com/modelix/modelix.core/releases) - [Changelog](https://github.com/modelix/modelix.core/blob/main/.releaserc.json) - [Commits](https://github.com/modelix/modelix.core/compare/4.11.5...7.0.0) Updates `org.modelix:modelql-core` from 4.11.5 to 7.0.0 - [Release notes](https://github.com/modelix/modelix.core/releases) - [Changelog](https://github.com/modelix/modelix.core/blob/main/.releaserc.json) - [Commits](https://github.com/modelix/modelix.core/compare/4.11.5...7.0.0) Updates `org.modelix:modelql-untyped` from 4.11.5 to 7.0.0 - [Release notes](https://github.com/modelix/modelix.core/releases) - [Changelog](https://github.com/modelix/modelix.core/blob/main/.releaserc.json) - [Commits](https://github.com/modelix/modelix.core/compare/4.11.5...7.0.0) Updates `org.modelix:modelql-html` from 4.11.5 to 7.0.0 - [Release notes](https://github.com/modelix/modelix.core/releases) - [Changelog](https://github.com/modelix/modelix.core/blob/main/.releaserc.json) - [Commits](https://github.com/modelix/modelix.core/compare/4.11.5...7.0.0) Updates `org.modelix:model-datastructure` from 4.11.5 to 7.0.0 - [Release notes](https://github.com/modelix/modelix.core/releases) - [Changelog](https://github.com/modelix/modelix.core/blob/main/.releaserc.json) - [Commits](https://github.com/modelix/modelix.core/compare/4.11.5...7.0.0) Updates `org.modelix.mps:model-adapters` from 4.11.5 to 7.0.0 - [Release notes](https://github.com/modelix/modelix.core/releases) - [Changelog](https://github.com/modelix/modelix.core/blob/main/.releaserc.json) - [Commits](https://github.com/modelix/modelix.core/compare/4.11.5...7.0.0) Updates `org.modelix.model-api-gen` from 4.11.5 to 7.0.0 --- updated-dependencies: - dependency-name: org.modelix:model-api dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.modelix:model-api-gen-runtime dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.modelix:light-model-client dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.modelix:authorization dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.modelix:model-client dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.modelix:model-server dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.modelix:modelql-core dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.modelix:modelql-untyped dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.modelix:modelql-html dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.modelix:model-datastructure dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.modelix.mps:model-adapters dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.modelix.model-api-gen dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8e25e2cd..0b53f11d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ modelix-model-api-gen = { id = "org.modelix.model-api-gen", version.ref = "model npm-publish = { id = "dev.petuska.npm.publish", version = "3.4.2" } [versions] -modelixCore = "5.0.0" +modelixCore = "7.0.0" [libraries] modelix-model-api = { group = "org.modelix", name = "model-api", version.ref = "modelixCore" } From a181b4282d62ebbcd3de94c85f8e4d47e84d9890 Mon Sep 17 00:00:00 2001 From: Sascha Lisson Date: Mon, 18 Mar 2024 16:30:18 +0100 Subject: [PATCH 2/2] fix(mps-legacy-sync-plugin): removed usage of `MetaModelBranch` Was removed in modelix.core:7.0.0 and already disabled a long time ago. --- .../java/org/modelix/model/mpsplugin/ModelCloudExporter.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mps-legacy-sync-plugin/src/main/java/org/modelix/model/mpsplugin/ModelCloudExporter.kt b/mps-legacy-sync-plugin/src/main/java/org/modelix/model/mpsplugin/ModelCloudExporter.kt index 0c71da16..61978db5 100644 --- a/mps-legacy-sync-plugin/src/main/java/org/modelix/model/mpsplugin/ModelCloudExporter.kt +++ b/mps-legacy-sync-plugin/src/main/java/org/modelix/model/mpsplugin/ModelCloudExporter.kt @@ -67,7 +67,6 @@ import org.modelix.model.lazy.CLVersion import org.modelix.model.lazy.CLVersion.Companion.loadFromHash import org.modelix.model.lazy.PrefetchCache.Companion.with import org.modelix.model.lazy.RepositoryId -import org.modelix.model.metameta.MetaModelBranch import org.modelix.model.mpsadapters.mps.SConceptAdapter import org.modelix.model.mpsplugin.ModelCloudExporter.PersistenceFacility import java.io.File @@ -181,7 +180,7 @@ class ModelCloudExporter { } return repositoryInModelServer!!.computeRead>({ val tree: CLTree = version.getTree() - val branch: IBranch = MetaModelBranch(PBranch(tree, IdGeneratorDummy())) + val branch: IBranch = PBranch(tree, IdGeneratorDummy()) PArea(branch).executeRead({ with>(tree, { val t: ITransaction = branch.transaction