Create 0.90.0-RC3

Merge branch 'refs/heads/dev' # Conflicts: # gradle/libs.versions.toml
pdvrieze · Jun 10, 2024 · 1401a21 · 1401a21
2 parents 3ff88b1 + 8aed54a
commit 1401a21
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 20 deletions.
diff --git 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/[email protected]
@@ -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/Changelog.md b/Changelog.md
@@ -1,3 +1,12 @@
+# 0.90.0-RC3
+- Fix issues with dependencies in new layout (#209) - XMPCore now
+  builds/resolves.
+
+# 0.90.0-RC2
+Fixes:
+- Fix multithreading initialization on JVM targets, serviceLoaders are
+  not thread-safe (#211). 
+
 # 0.90.0-RC1 – Supporting 2.0
 Changes:
 - Build with Kotlin 2.0.0

diff --git a/README.md b/README.md
@@ -81,19 +81,19 @@ repositories {
 ### Core
 #### multiplatform
 ```
-   implementation("io.github.pdvrieze.xmlutil:core:0.90.0-RC2")
+   implementation("io.github.pdvrieze.xmlutil:core:0.90.0-RC3")
 ```
 #### JVM – uses the stax API _not available_ on Android
 ```
-   implementation("io.github.pdvrieze.xmlutil:core-jvm:0.90.0-RC2")
+   implementation("io.github.pdvrieze.xmlutil:core-jvm:0.90.0-RC3")
 ```
 #### Android – Uses the android streaming library
 ```
-   implementation("io.github.pdvrieze.xmlutil:core-android:0.90.0-RC2")
+   implementation("io.github.pdvrieze.xmlutil:core-android:0.90.0-RC3")
 ```
 #### JS – Wraps DOM
 ```
-   implementation("io.github.pdvrieze.xmlutil:core-js:0.90.0-RC2")
+   implementation("io.github.pdvrieze.xmlutil:core-js:0.90.0-RC3")
 ```
 
 #### Native
@@ -104,19 +104,19 @@ that mirrors the Java API)
 ### Serialization
 #### multiplatform
 ```
-   implementation("io.github.pdvrieze.xmlutil:serialization:0.90.0-RC2")
+   implementation("io.github.pdvrieze.xmlutil:serialization:0.90.0-RC3")
 ```
 #### JVM
 ```
-   implementation("io.github.pdvrieze.xmlutil:serialization-jvm:0.90.0-RC2")
+   implementation("io.github.pdvrieze.xmlutil:serialization-jvm:0.90.0-RC3")
 ```
 #### Android
 ```
-   implementation("io.github.pdvrieze.xmlutil:serialization-android:0.90.0-RC2")
+   implementation("io.github.pdvrieze.xmlutil:serialization-android:0.90.0-RC3")
 ```
 #### js
 ```
-   implementation("io.github.pdvrieze.xmlutil:serialization-js:0.90.0-RC2")
+   implementation("io.github.pdvrieze.xmlutil:serialization-js:0.90.0-RC3")
 ```
 
 ### -Ktor- (Deprecated)

diff --git a/core/base/build.gradle.kts b/core/base/build.gradle.kts
@@ -40,6 +40,10 @@ plugins {
     alias(libs.plugins.binaryValidator)
 }
 
+base {
+    archivesName = "core"
+}
+
 config {
     applyLayout = false
 }
@@ -118,10 +122,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/core/compat/build.gradle.kts b/core/compat/build.gradle.kts
@@ -34,7 +34,7 @@ plugins {
 }
 
 base {
-    archivesName = "xmlutil"
+    archivesName = "compat"
 }
 
 val autoModuleName = "net.devrieze.xmlutil.core"

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -8,7 +8,7 @@ kotlin = "2.0.0"
 kotlinx-serialization = "1.7.0"
 kxml2 = "2.3.0"
 woodstox = "6.6.2"
-xmlutil = "0.90.0-RC2"
+xmlutil = "0.90.0-RC3"
 
 [libraries]
 woodstox = { module = "com.fasterxml.woodstox:woodstox-core", version.ref = "woodstox" }
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,7 +34,7 @@ plugins { @@
     }
     base {
-        archivesName = "xmlutil"
+        archivesName = "compat"
     }
     val autoModuleName = "net.devrieze.xmlutil.core"
@@ Expand Down @@