From 8afca4201aa6a651207632d9d257722a459c4a12 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Jan 2025 09:33:12 +0000 Subject: [PATCH 1/2] build(deps): bump kotlinCoroutines from 1.9.0 to 1.10.1 Bumps `kotlinCoroutines` from 1.9.0 to 1.10.1. Updates `org.jetbrains.kotlinx:kotlinx-coroutines-core` from 1.9.0 to 1.10.1 - [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases) - [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md) - [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.9.0...1.10.1) Updates `org.jetbrains.kotlinx:kotlinx-coroutines-swing` from 1.9.0 to 1.10.1 - [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases) - [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md) - [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.9.0...1.10.1) Updates `org.jetbrains.kotlinx:kotlinx-coroutines-test` from 1.9.0 to 1.10.1 - [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases) - [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md) - [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.9.0...1.10.1) --- updated-dependencies: - dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-swing dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-test dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> --- 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 f4f397666f..c98b170ace 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -25,7 +25,7 @@ docker-compose = { id = "com.avast.gradle.docker-compose" , version = "0.17.12" [versions] kotlin = "2.1.0" -kotlinCoroutines="1.9.0" +kotlinCoroutines="1.10.1" ktor="3.0.3" kotlinHtml="0.8.0" kotlinSerialization="1.7.3" From 82dfcbc0b72a7d2138c151f8164277cb85226a4e Mon Sep 17 00:00:00 2001 From: Oleksandr Dzhychko <odzhychko@itemis.com> Date: Thu, 9 Jan 2025 15:34:19 +0100 Subject: [PATCH 2/2] fix(mps-model-adapters): exclude libraries provided by MPS from mps-model-adapters-plugin --- mps-model-adapters-plugin/build.gradle.kts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mps-model-adapters-plugin/build.gradle.kts b/mps-model-adapters-plugin/build.gradle.kts index 6547a7c13a..6ddc0474f9 100644 --- a/mps-model-adapters-plugin/build.gradle.kts +++ b/mps-model-adapters-plugin/build.gradle.kts @@ -7,7 +7,13 @@ plugins { } dependencies { - testImplementation(project(":mps-model-adapters")) + testImplementation(project(":mps-model-adapters")) { + // MPS provides the Kotlin standard library and coroutines. + // Bundling different versions of the same library can cause the plugin to break. + exclude(group = "org.jetbrains.kotlin") + exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-coroutines-core") + exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-coroutines-jdk8") + } } intellij {