From 8e16f188fa0520a36f989027ff63534b7ee4bf9d Mon Sep 17 00:00:00 2001
From: Paul de Vrieze <paul.devrieze@gmail.com>
Date: Sun, 9 Jun 2024 15:28:52 +0100
Subject: [PATCH] Try to "fix" build by building everything on macOs.

---
 .github/workflows/deploy-to-packages.yml | 12 ++++--------
 core/base/build.gradle.kts               |  6 ++++--
 gradle/libs.versions.toml                |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/deploy-to-packages.yml b/.github/workflows/deploy-to-packages.yml
index af1819c90..8a89f18a7 100644
--- a/.github/workflows/deploy-to-packages.yml
+++ b/.github/workflows/deploy-to-packages.yml
@@ -31,7 +31,8 @@ jobs:
             GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
         strategy:
             matrix:
-                os: [ macOs-latest, windows-latest, ubuntu-latest ]
+#                os: [ macOs-latest, windows-latest, ubuntu-latest ]
+                os: [ macOs-latest ]
         steps:
             -   name: Checkout
                 uses: actions/checkout@v4.1.6
@@ -53,11 +54,6 @@ jobs:
                 if: matrix.os != 'ubuntu-latest'
                 run: ./gradlew nativeTest --stacktrace
                 shell: bash
-            -   name: Upload (macos / windows)
-                if: matrix.os != 'ubuntu-latest'
-                run: ./gradlew publishNative -Pxmlutil.repositoryId='${{ needs.create-staging-repository.outputs.repository_id }}' -Possrh.username='${{ secrets.OSSRH_USERNAME }}' -Possrh.password='${{ secrets.OSSRH_PASSWORD }}' -Pnative.deploy=host --stacktrace
-                shell: bash
-            # Linux / JVM / JS
             -   name: Check (ubuntu)
                 if: matrix.os == 'ubuntu-latest'
                 run: ./gradlew check --stacktrace
@@ -70,8 +66,8 @@ jobs:
                     path: |
                         **/build/reports/
                         **/build/test-results/
-            -   name: Upload (ubuntu)
-                if: matrix.os == 'ubuntu-latest'
+            -   name: Upload (macOs)
+                if: matrix.os == 'macOs-latest'
                 run: ./gradlew publish -Pxmlutil.repositoryId='${{ needs.create-staging-repository.outputs.repository_id }}' -Possrh.username='${{ secrets.OSSRH_USERNAME }}' -Possrh.password='${{ secrets.OSSRH_PASSWORD }}' -Pnative.deploy=all --stacktrace
                 shell: bash
 
diff --git a/core/base/build.gradle.kts b/core/base/build.gradle.kts
index ed2757d1d..0907fcb5a 100644
--- a/core/base/build.gradle.kts
+++ b/core/base/build.gradle.kts
@@ -118,10 +118,12 @@ kotlin {
     targets.all {
         val targetName = name
         mavenPublication {
-            artifactId = when (targetName) {
+            val newId = when (targetName) {
                 "jvm" -> "core-jvmCommon"
-                else -> artifactId.replace("base","core")
+                else -> artifactId.replace("base", "core")
             }
+            logger.lifecycle("Renamed artefact for $targetName from $artifactId to $newId")
+            artifactId = newId
         }
         @Suppress("OPT_IN_USAGE")
         when (val t = this) {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index daec6ca83..842f3e12d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -8,7 +8,7 @@ kotlin = "2.0.0"
 kotlinx-serialization = "1.7.0-RC"
 kxml2 = "2.3.0"
 woodstox = "6.6.2"
-xmlutil = "0.90.0-RC2-SNAPSHOT"
+xmlutil = "0.90.0-RC3-SNAPSHOT"
 
 [libraries]
 woodstox = { module = "com.fasterxml.woodstox:woodstox-core", version.ref = "woodstox" }