Merge pull request #73 from modelix/feature/MODELIX-252

MODELIX-252: Rename mvn artifacts to unify modelix

Author: nkoester

.github/workflows/build.yaml

@@ -21,10 +21,10 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: ./gradlew build publishToMavenLocal -PciBuild=true
-      - name: Test Metamodel Gradle Plugin
+      - name: Test Model API Generator Gradle Plugin
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: metamodel-gradle-test/ci.sh
+        run: model-api-gen-gradle-test/ci.sh
       - name: Archive test report
         uses: actions/upload-artifact@v3
         if: always()

.github/workflows/publish.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Use tag as version
         run: echo "${GITHUB_REF#refs/*/}" > version.txt
       - name: Build and Publish Artifacts
-        run: ./gradlew build publish -PciBuild=true -Partifacts.itemis.cloud.user=${{secrets.ARTIFACTS_ITEMIS_CLOUD_USER}} -Partifacts.itemis.cloud.pw=${{secrets.ARTIFACTS_ITEMIS_CLOUD_PW}}
+        run: ./gradlew build publish -PciBuild=true -Partifacts.itemis.cloud.user=${{secrets.ARTIFACTS_ITEMIS_CLOUD_USER}} -Partifacts.itemis.cloud.pw=${{secrets.ARTIFACTS_ITEMIS_CLOUD_PW}} -PGITHUB_ACTOR=${{ github.actor }} -PGITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
         env:
           NODE_AUTH_TOKEN: ${{ secrets.ARTIFACTS_ITEMIS_CLOUD_NPM_TOKEN }}
       - name: Set up QEMU

.gitignore

@@ -8,3 +8,5 @@
 kotlin_gen
 /version.txt
 /node_modules
+**/.ideaconfig
+**/.mpsconfig

build.gradle.kts

@@ -1,4 +1,3 @@
-
 plugins {
     kotlin("multiplatform") apply false
     kotlin("plugin.serialization") apply false
@@ -20,7 +19,7 @@ fun computeVersion(): Any {
     return if (versionFile.exists()) {
         versionFile.readText().trim()
     } else {
-        gitVersion().let{ if (it.endsWith("-SNAPSHOT")) it else "$it-SNAPSHOT" }.also { versionFile.writeText(it) }
+        gitVersion().let { if (it.endsWith("-SNAPSHOT")) it else "$it-SNAPSHOT" }.also { versionFile.writeText(it) }
     }
 }
 
@@ -51,10 +50,35 @@ subprojects {
                     }
                 }
             }
+            val ghp_username = project.findProperty("gpr.user") as? String ?: System.getenv("GITHUB_ACTOR")
+            val ghp_password = project.findProperty("gpr.key") as? String ?: System.getenv("GITHUB_TOKEN")
+            if (ghp_username != null && ghp_password != null) {
+                maven {
+                    name = "GitHubPackages"
+                    // we moved some components from modelix/modelix to modelix/modelix.core but github packages
+                    // cannot handle this situation. basically we suffer from what is described here:
+                    //     https://github.com/orgs/community/discussions/23474
+                    // this is a simple workaround for the affected components.
+                    // consequently, when obtaining these dependencies, the repo url is the old modelix/modelix one...
+                    if (project.name in arrayOf("model-client",
+                                    "model-client-js",
+                                    "model-client-jvm",
+                                    "model-server",
+                                    "model-server-api")) {
+                        url = uri("https://maven.pkg.github.com/modelix/modelix")
+                    } else {
+                        url = uri("https://maven.pkg.github.com/modelix/modelix.core")
+                    }
+                    credentials {
+                        username = ghp_username
+                        password = ghp_password
+                    }
+                }
+            }
         }
     }
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask> {
     dependsOn(":ts-model-api:npm_run_build")
-}
+}

commitlint.config.js

@@ -6,10 +6,10 @@ module.exports = {
       "always",
       [
         "light-model-client",
-        "light-model-server",
-        "metamodel-export-mps",
-        "metamodel-generator",
-        "metamodel-gradle",
+        "model-server-lib",
+        "metamodel-export",
+        "model-api-gen",
+        "model-api-gen-gradle",
         "model-api",
         "model-client",
         "model-server",

docs/global/modules/core/pages/howto/usage-light-model-client.adoc

@@ -33,7 +33,7 @@ kotlin {
         val commonMain by getting {
             dependencies {
                 implementation(project(":model-api"))
-                implementation(project(":metamodel-runtime"))
+                implementation(project(":model-api-gen-runtime"))
                 implementation(project(":model-server-api"))
                 implementation("io.ktor:ktor-client-websockets:$ktorVersion")
                 implementation(kotlin("stdlib-common"))