Merge pull request #612 from modelix/experiment/composite-build-for-plugin-tests

MODELIX-757 Use Gradle composite builds for modelix.core plugin tests

Author: mhuster23

bulk-model-sync-gradle-test/build.gradle.kts

@@ -19,17 +19,8 @@ plugins {
     id("org.modelix.bulk-model-sync")
 }
 
-val modelixCoreVersion: String = file("../version.txt").readText()
-
-version = modelixCoreVersion
-
 repositories {
     val modelixRegex = "org\\.modelix.*"
-    mavenLocal {
-        content {
-            includeGroupByRegex(modelixRegex)
-        }
-    }
     gradlePluginPortal {
         content {
             excludeGroupByRegex(modelixRegex)
@@ -52,13 +43,12 @@ repositories {
 val kotlinGenDir = project.layout.buildDirectory.dir("metamodel/kotlin").get().asFile.apply { mkdirs() }
 
 dependencies {
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.2")
-    implementation("org.modelix:model-server:$modelixCoreVersion")
-    implementation("org.modelix:model-api-gen-runtime:$modelixCoreVersion")
-    testImplementation("org.modelix:model-client:$modelixCoreVersion")
-    testImplementation("org.modelix:bulk-model-sync-lib:$modelixCoreVersion")
-    testImplementation("org.modelix.mps:model-adapters:$modelixCoreVersion")
-    testImplementation("org.modelix:graph-lang-api:$modelixCoreVersion")
+    implementation(libs.kotlin.coroutines.core)
+    implementation("org.modelix:model-server")
+    implementation("org.modelix:model-api-gen-runtime")
+    testImplementation(project(":graph-lang-api"))
+    testImplementation("org.modelix", "model-client", "", "jvmRuntimeElements")
+    testImplementation("org.modelix:bulk-model-sync-lib")
     testImplementation(kotlin("test"))
     testImplementation(libs.xmlunit.core)
 }

bulk-model-sync-gradle-test/ci.sh

@@ -3,13 +3,7 @@
 set -e
 set -x
 
-TEST_DIR="$(dirname "$(readlink -f "$0")")"
-cd "${TEST_DIR}"
-
-(
-  cd graph-lang-api
-  ./gradlew publishToMavenLocal --console=plain
-)
+cd "$(dirname "$(readlink -f "$0")")"
 
 ./gradlew assemble --console=plain
 
@@ -21,12 +15,9 @@ if [ "${CI}" != "true" ]; then
   }
 fi
 
-cd "${TEST_DIR}/.."
-./gradlew :model-server:run --console=plain --args="-inmemory -port 28309" &
+./gradlew :modelix.core:model-server:run --console=plain --args="-inmemory -port 28309" &
 MODEL_SERVER_PID=$!
 
-cd "${TEST_DIR}"
-
 curl -X GET --retry 30 --retry-connrefused --retry-delay 1 http://localhost:28309/health
 
 ./gradlew runSyncTestPush --console=plain --stacktrace

bulk-model-sync-gradle-test/graph-lang-api/build.gradle.kts

@@ -1,26 +1,20 @@
 plugins {
     id("org.modelix.model-api-gen")
-    `maven-publish`
-    alias(libs.plugins.kotlin.jvm)
+    kotlin("jvm")
 }
 
 repositories {
-    mavenLocal()
     gradlePluginPortal()
     maven { url = uri("https://artifacts.itemis.cloud/repository/maven-mps/") }
     mavenCentral()
 }
 
-val modelixCoreVersion = file("../../version.txt").readText()
-
-version = modelixCoreVersion
-
 val mps: Configuration by configurations.creating
 val kotlinGenDir = project.layout.buildDirectory.dir("metamodel/kotlin").get().asFile.apply { mkdirs() }
 
 dependencies {
     mps("com.jetbrains:mps:2021.2.5")
-    api("org.modelix:model-api-gen-runtime:$modelixCoreVersion")
+    api("org.modelix:model-api-gen-runtime")
 }
 
 val mpsDir = project.layout.buildDirectory.dir("mps").get().asFile.apply { mkdirs() }
@@ -30,7 +24,7 @@ val resolveMps by tasks.registering(Copy::class) {
     into(mpsDir)
 }
 
-val repoDir = projectDir.resolve("test-repo")
+val repoDir = projectDir.parentFile.resolve("test-repo")
 
 kotlin {
     sourceSets.named("main") {
@@ -43,23 +37,11 @@ metamodel {
     dependsOn(resolveMps)
     mpsHome = mpsDir
     kotlinDir = kotlinGenDir
-    modulesFrom(projectDir.parentFile.resolve("test-repo"))
+    modulesFrom(repoDir)
     includeLanguage("GraphLang")
     registrationHelperName = "org.modelix.model.sync.bulk.gradle.test.GraphLanguagesHelper"
 }
 
-publishing {
-    publications {
-        create<MavenPublication>("maven") {
-            groupId = "org.modelix"
-            from(components["kotlin"])
-        }
-    }
-    repositories {
-        mavenLocal()
-    }
-}
-
 tasks.named("processResources") {
     dependsOn("generateMetaModelSources")
 }

bulk-model-sync-gradle-test/graph-lang-api/gradle/wrapper/gradle-wrapper.jar

@@ -15,18 +15,9 @@
  */
 
 pluginManagement {
-    val modelixCoreVersion: String = file("../version.txt").readText()
+    includeBuild("..")
     val modelixRegex = "org\\.modelix.*"
-    plugins {
-        id("org.modelix.bulk-model-sync") version modelixCoreVersion
-        id("org.modelix.model-api-gen") version modelixCoreVersion
-    }
     repositories {
-        mavenLocal {
-            content {
-                includeGroupByRegex(modelixRegex)
-            }
-        }
         gradlePluginPortal {
             content {
                 excludeGroupByRegex(modelixRegex)
@@ -45,12 +36,12 @@ pluginManagement {
         }
     }
     dependencyResolutionManagement {
-        repositories {
-            mavenLocal {
-                content {
-                    includeGroupByRegex(modelixRegex)
-                }
+        versionCatalogs {
+            create("libs") {
+                from(files("../gradle/libs.versions.toml"))
             }
+        }
+        repositories {
             gradlePluginPortal {
                 content {
                     excludeGroupByRegex(modelixRegex)
@@ -69,10 +60,8 @@ pluginManagement {
                 }
             }
         }
-        versionCatalogs {
-            create("libs") {
-                from("org.modelix:core-version-catalog:$modelixCoreVersion")
-            }
-        }
     }
 }
+
+includeBuild("..")
+include("graph-lang-api")

bulk-model-sync-gradle-test/graph-lang-api/gradle/wrapper/gradle-wrapper.properties

@@ -3,20 +3,18 @@ plugins {
     id("org.modelix.model-api-gen") apply false
 }
 
-val modelixCoreVersion: String = projectDir.resolve("../../version.txt").readText()
-
 dependencies {
-    implementation("org.modelix:model-api-gen-runtime:$modelixCoreVersion")
-    implementation("org.modelix:modelql-typed:$modelixCoreVersion")
-    implementation("org.modelix:modelql-untyped:$modelixCoreVersion")
+    implementation("org.modelix:model-api-gen-runtime")
+    implementation("org.modelix:modelql-typed")
+    implementation("org.modelix:modelql-untyped")
 
     testImplementation(kotlin("test"))
     testImplementation(kotlin("reflect"))
 
-    testImplementation("org.modelix:model-api:$modelixCoreVersion")
-    testImplementation("org.modelix:model-client:$modelixCoreVersion")
-    testImplementation("org.modelix:model-server-lib:$modelixCoreVersion")
-    testImplementation("org.modelix:modelql-client:$modelixCoreVersion")
+    testImplementation("org.modelix:model-api")
+    testImplementation("org.modelix", "model-client", "", "jvmRuntimeElements")
+    testImplementation("org.modelix:model-server-lib")
+    testImplementation("org.modelix:modelql-client")
 
     testImplementation(libs.ktor.server.core)
     testImplementation(libs.ktor.server.cors)