test: fix classpath of MPS plugins

modelix · Jan 29, 2025 · 3947aaa · 3947aaa
1 parent d514889
commit 3947aaa
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/build-logic/src/main/kotlin/org/modelix/CopyMps.kt b/build-logic/src/main/kotlin/org/modelix/CopyMps.kt
@@ -1,9 +1,11 @@
 package org.modelix
 
 import org.gradle.api.Project
+import org.gradle.api.artifacts.ModuleDependency
 import org.gradle.api.file.Directory
 import org.gradle.api.provider.Provider
 import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.exclude
 import java.io.File
 import java.util.zip.ZipInputStream
 
@@ -101,3 +103,14 @@ fun Project.copyMps(): File {
     println("Extracting MPS done.")
     return mpsHome
 }
+
+val excludeMPSLibraries: (ModuleDependency).() -> Unit = {
+    exclude("org.jetbrains.kotlinx", "kotlinx-coroutines-core")
+    exclude("org.jetbrains.kotlinx", "kotlinx-coroutines-jdk8")
+    exclude("org.jetbrains.kotlinx", "kotlinx-coroutines-swing")
+    exclude("org.jetbrains.kotlin", "kotlin-stdlib")
+    exclude("org.jetbrains.kotlin", "kotlin-stdlib-common")
+    exclude("org.jetbrains.kotlin", "kotlin-stdlib-jdk7")
+    exclude("org.jetbrains.kotlin", "kotlin-stdlib-jdk8")
+    exclude("org.jetbrains", "annotations")
+}
diff --git a/bulk-model-sync-lib/mps-test/build.gradle.kts b/bulk-model-sync-lib/mps-test/build.gradle.kts
@@ -1,4 +1,5 @@
 import org.modelix.copyMps
+import org.modelix.excludeMPSLibraries
 import org.modelix.mpsMajorVersion
 
 plugins {
@@ -14,10 +15,10 @@ plugins {
 }
 
 dependencies {
-    testImplementation(project(":bulk-model-sync-lib"))
-    testImplementation(project(":bulk-model-sync-mps"))
-    testImplementation(project(":mps-model-adapters"))
-    testImplementation(project(":model-datastructure"))
+    testImplementation(project(":bulk-model-sync-lib"), excludeMPSLibraries)
+    testImplementation(project(":bulk-model-sync-mps"), excludeMPSLibraries)
+    testImplementation(project(":mps-model-adapters"), excludeMPSLibraries)
+    testImplementation(project(":model-datastructure"), excludeMPSLibraries)
     testImplementation(libs.kotlin.serialization.json)
     testImplementation(libs.xmlunit.matchers)
     testImplementation(libs.jimfs)

diff --git a/mps-model-adapters-plugin/build.gradle.kts b/mps-model-adapters-plugin/build.gradle.kts
@@ -1,4 +1,5 @@
 import org.modelix.copyMps
+import org.modelix.excludeMPSLibraries
 import org.modelix.mpsMajorVersion
 
 plugins {
@@ -8,13 +9,7 @@ plugins {
 }
 
 dependencies {
-    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")
-    }
+    testImplementation(project(":mps-model-adapters"), excludeMPSLibraries)
     testImplementation(kotlin("test"))
 }