Prepare 0.91.3 release.

Author: pdvrieze

.github/workflows/publish-snapshot.yml

@@ -0,0 +1,50 @@
+name: Publish snapshot
+on:
+    push:
+        branches:
+            - 'dev'
+    workflow_dispatch:
+jobs:
+    build-and-publish:
+        runs-on: macos-latest
+        env:
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            GPG_PRIV_KEY: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
+            GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
+        steps:
+            -   name: Checkout
+                uses: actions/checkout@v4.2.2
+            -   name: Cached konan
+                uses: actions/cache@v4.2.3
+                with:
+                    path: ~/.konan
+                    key: ${{ runner.os }}-konan-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
+                    restore-keys: ${{ runner.os }}-konan-
+            -   name: Set up JDK 11
+                uses: actions/setup-java@v4
+                with:
+                    java-version: '11'
+                    distribution: 'temurin'
+            -   id: cache-gradle-windows
+                name: Set up gradle
+                uses: gradle/actions/setup-gradle@v4
+            -   name: Check
+                run: ./gradlew -PexcludeSchema nativeTest --stacktrace
+                shell: bash
+            -   name: Store reports
+                if: failure()
+                uses: actions/upload-artifact@v4
+                with:
+                    name: reports
+                    path: |
+                        **/build/reports/
+                        **/build/test-results/
+            -   name: Assemble
+                run: ./gradlew assemble -PexcludeSchema -Pnative.deploy=all --stacktrace
+            -   name: Javadoc jar
+                run: ./gradlew javadocJar -PexcludeSchema -Pnative.deploy=all --stacktrace
+            -   name: Sources Jar
+                run: ./gradlew kotlinSourcesJar -PexcludeSchema -Pnative.deploy=all --stacktrace
+            -   name: Upload
+                run: ./gradlew publishAllPublicationsToMavenSnapshotRepository -PexcludeSchema -Possrh.username='${{ secrets.OSSRH_USERNAME }}' -Possrh.password='${{ secrets.OSSRH_PASSWORD }}' -Pnative.deploy=all --stacktrace
+                shell: bash

.github/workflows/deploy-to-packages.yml .github/workflows/upload_release.yml.github/workflows/deploy-to-packages.yml renamed to .github/workflows/upload_release.yml

@@ -1,8 +1,6 @@
-name: Create and publish a package
+name: Upload release
 on:
     push:
-        branches:
-            - 'dev'
         tags:
             - 'v[0-9]*'
     workflow_dispatch:

.idea/runConfigurations/xmlutil__check_.xml

@@ -1,5 +1,43 @@
+# 0.91.3
+*(Oct 28, 2025)<br />*
+
+Changes:
+- Change the behaviour of `defaultPolicy` to inherit the settings of
+  a previous policy even if it does not inherit `DefaultXmlSerializationPolicy`.
+  In rare cases this changes the behaviour (where a custom policy was
+  originally set (with different defaults), it didn't inherit the
+  default policy, and it is now replaced by a default policy).
+- In XmlWriter introduce a `safeCdsect` function that will handle embedded end
+  of cdata sequences by splitting the CDATA section into two sections. This is
+  now used in serialization to avoid serialization errors if the value contains
+  `]]>`.
+
+Fixes:
+- Fix serialization of cdata in the generic (and Android) xml writer. The writer
+  incorrectly escaped entities in cdata (#304), and did not correctly deal with
+  `]]>` in the cdata content (this is resolved by writing as two separate cdata
+  sections).
+- Make the default instance encodeToString (`XML.encodeToString`) use the
+  regular behaviour for handling null prefixes. This fixes the default empty
+  prefix being used if none is manually set (rather than the annotated prefix).  
+- Fix attributes not being prefixed with a namespace if their namespace prefix
+  is the default prefix for that namespace. As a workaround leave the prefix
+  different from its containers.
+- In pedantic mode, allow an `XmlSerialName` to use the `xml` prefix as long as 
+  its namespace is left default or maps to the xml namespace. Also force the
+  prefix used to be the standard prefix (although, depending on the xml writer
+  this may already be the case effectively).
+- For the generic parser / serializer make handling of newline/tabs in attribute
+  values standard compliant (#300). This means that when writing all will be
+  written as character entities to allow for preservation of the values. For
+  reading the entities are just resolved. Actual newline/tab content in
+  attribute values is normalized as space characters (where CRLF is still
+  replaced by a single space). As attribute values can be differen types than
+  CData this does not further normalize the value by collapsing whitespace
+  sequences.
+
 # 0.91.2
-*(July 27, 2025)
+*(July 27, 2025)<br />*
 
 Features:
 - Make `defaultPrimitiveOutputKind` and `defaultObjectOutputKind`
@@ -25,7 +63,7 @@ Fixes:
   but equivalent errors. 
 
 # 0.91.1
-*(May 15, 2025)
+*(May 15, 2025)<br />*
 
 Features:
 - Add an annotation `@XmlMapEntryName` to force map entries not to be
@@ -50,7 +88,7 @@ Fixes:
 - Further fixes on inline serialization with more cases.
 
 # 0.91.0
-*(April 1, 2025)
+*(April 1, 2025)<br />*
 Features:
 - Add `XmlKeyName` as annotation to set the name of the key used in
   maps. This just adds the capability to the default policy. Supports
@@ -69,7 +107,7 @@ Fixes:
   thus resulting in invalid cache keys.
 
 # 0.91.0-RC1
-
+*(March 4, 2025)<br />*
 Features:
 - Add a core-io and serialization-io modules that support using kotlinx.io
 - Add inline function shortcuts for encodeToString/decodeFromString with
@@ -143,6 +181,7 @@ Fixes:
   string. 
 
 # 0.90.3
+*(November 7, 2024)<br />*
 Changes:
 - In pedantic mode check that xml/xmlns are not used as names (they
   are always invalid). Note that namespaces can be specified using
@@ -158,11 +197,13 @@ Fixes:
   multithreading issues when reusing the format (recommended for speed)
 
 # 0.90.2 Mooor Rocketpower!
+*(October 15, 2024)<br />*
 Changes:
 - Update to Kotlin 2.0.21 / Kotlinx.serialization 1.7.3
 - Add support for Android native targets (@whyoleg in #242)
 
 # 0.90.2-beta1 Rocketpower!
+*(July 22, 2024)<br />*
 Changes:
 - Update to Kotlin 2.0.20 / kotlinx.serialization 1.7.2
 - Extensive optimization of decoding (serialization), parsing
@@ -207,10 +248,12 @@ Fixes:
 - Fix infinite recursion issue with xmlStreaming.newWriter / newReader
 
 # 0.90.1 Fix Android
+*(June 16, 2024)<br />*
+Fixes:
 - Fix android plugin dependency.
 
 # 0.90.0 2.0 will go
-*(June 13, 2024)
+*(June 13, 2024)<br />*
 Changes:
 - The core module no longer automatically includes Android/Jvm "native"
   parsers by default, but uses the platform independent implementation.
@@ -222,15 +265,19 @@ Changes:
   be removed at 1.0 release.
 
 # 0.90.0-RC3
+*(June 11, 2024)<br />*
+Fixes:
 - Fix issues with dependencies in new layout (#209) - XMPCore now
   builds/resolves.
 
 # 0.90.0-RC2
+*(June 7, 2024)<br />*
 Fixes:
 - Fix multithreading initialization on JVM targets, serviceLoaders are
   not thread-safe (#211). 
 
 # 0.90.0-RC1 – Supporting 2.0
+*(May 24, 2024)<br />*
 Changes:
 - Build with Kotlin 2.0.0
 - The core module has been changed to use default implementations for
@@ -276,7 +323,7 @@ Fixes:
   attributes.
 
 # 0.86.3
-*(December 14, 2023)
+*(December 14, 2023)<br />*
 Changes:
 - The `XmlStreaming` object in core is replaced by an interface `IXmlStreaming`
   with an accessor function `xmlStreaming` that provides an appropriate

Changelog.md

@@ -75,19 +75,19 @@ package. The `JVM` and `Android` packages provide the native
 implementations and depend on (publishing) the `jvmCommon` package.
 #### multiplatform (will default to multiplatform implementation for JVM/Android)
 ```
-   implementation("io.github.pdvrieze.xmlutil:core:0.91.2")
+   implementation("io.github.pdvrieze.xmlutil:core:0.91.3-SNAPSHOT")
 ```
 #### **Optional** JVM – uses the stax API _not available_ on Android
 ```
-   implementation("io.github.pdvrieze.xmlutil:core-jdk:0.91.2")
+   implementation("io.github.pdvrieze.xmlutil:core-jdk:0.91.3-SNAPSHOT")
 ```
 #### **Optional** Android – Uses the android streaming library
 ```
-   implementation("io.github.pdvrieze.xmlutil:core-android:0.91.2")
+   implementation("io.github.pdvrieze.xmlutil:core-android:0.91.3-SNAPSHOT")
 ```
 #### JS – Wraps DOM
 ```
-   implementation("io.github.pdvrieze.xmlutil:core-js:0.91.2")
+   implementation("io.github.pdvrieze.xmlutil:core-js:0.91.3-SNAPSHOT")
 ```
 
 #### Native
@@ -98,17 +98,17 @@ that mirrors the Java API)
 ### Serialization
 #### multiplatform (this coordinate should be used by default)
 ```
-   implementation("io.github.pdvrieze.xmlutil:serialization:0.91.2")
+   implementation("io.github.pdvrieze.xmlutil:serialization:0.91.3-SNAPSHOT")
 ```
 
 #### JVM (also works for Android)
 ```
-   implementation("io.github.pdvrieze.xmlutil:serialization-jvm:0.91.2")
+   implementation("io.github.pdvrieze.xmlutil:serialization-jvm:0.91.3-SNAPSHOT")
 ```
 
 #### js
 ```
-   implementation("io.github.pdvrieze.xmlutil:serialization-js:0.91.2")
+   implementation("io.github.pdvrieze.xmlutil:serialization-js:0.91.3-SNAPSHOT")
 ```
 
 ### -Ktor- (Deprecated)

README.md

@@ -19,8 +19,6 @@
  */
 
 import org.jetbrains.dokka.gradle.tasks.DokkaGenerateTask
-import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
-import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
 import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask
 
 buildscript {
@@ -32,9 +30,7 @@ buildscript {
 plugins {
     id("projectPlugin")
     alias(libs.plugins.kotlinMultiplatform) apply false
-//    kotlin("multiplatform")/* version "1.7.0"*/ //apply false
     idea
-//    kotlin("multiplatform") apply false
     `maven-publish`
     signing
     alias(libs.plugins.dokka)
@@ -45,32 +41,10 @@ description = "The overall project for cross-platform xml access"
 val xmlutil_version: String by project
 val kotlin_version: String get() = libs.versions.kotlin.get()
 
-plugins.withType<NodeJsRootPlugin> {
-    extensions.configure<NodeJsRootExtension> {
-//        nodeVersion = "21.2.0"
-        // This version is needed to be able to use/test/run the latest wasm opcodes
-//        version = "21.0.0-v8-canary202309143a48826a08"
-//        downloadBaseUrl = "https://nodejs.org/download/v8-canary"
-    }
-}
-
 tasks.withType<KotlinNpmInstallTask>().configureEach {
     args.add("--ignore-engines")
 }
 
-/*
-afterEvaluate {
-    rootProject.plugins.withType(YarnPlugin::class.java) {
-        rootProject.the<YarnRootExtension>().apply {
-//            resolution("minimist", "1.2.6")
-//            resolution("webpack", "5.76.0")
-//            resolution("qs", "6.11.0")
-//            resolution("follow-redirects", "1.14.8")
-        }
-    }
-}
-*/
-
 tasks.register<Copy>("pages") {
     group="documentation"
     val dokkaTasks = tasks.named<DokkaGenerateTask>("dokkaGeneratePublicationHtml")
@@ -81,13 +55,6 @@ tasks.register<Copy>("pages") {
     duplicatesStrategy = DuplicatesStrategy.INCLUDE
 }
 
-configurations.all {
-    resolutionStrategy {
-        force(libs.httpclient)
-        force("org.apache.httpcomponents:httpcore:${libs.versions.httpComponents.get()}")
-    }
-}
-
 buildScan {
     termsOfServiceUrl = "https://gradle.com/terms-of-service"
     termsOfServiceAgree = "yes"

build.gradle.kts

@@ -353,6 +353,7 @@ public abstract class nl/adaptivity/xmlutil/XmlDelegatingWriter : nl/adaptivity/
 	public fun namespaceAttr (Lnl/adaptivity/xmlutil/Namespace;)V
 	public fun processingInstruction (Ljava/lang/String;)V
 	public fun processingInstruction (Ljava/lang/String;Ljava/lang/String;)V
+	public fun safeCdsect (Ljava/lang/String;)V
 	public fun setIndent (I)V
 	public fun setIndentString (Ljava/lang/String;)V
 	public fun setPrefix (Ljava/lang/CharSequence;Ljava/lang/CharSequence;)V
@@ -785,6 +786,7 @@ public abstract interface class nl/adaptivity/xmlutil/XmlWriter : java/io/Closea
 	public fun namespaceAttr (Lnl/adaptivity/xmlutil/Namespace;)V
 	public abstract fun processingInstruction (Ljava/lang/String;)V
 	public fun processingInstruction (Ljava/lang/String;Ljava/lang/String;)V
+	public fun safeCdsect (Ljava/lang/String;)V
 	public fun setIndent (I)V
 	public abstract fun setIndentString (Ljava/lang/String;)V
 	public fun setPrefix (Ljava/lang/CharSequence;Ljava/lang/CharSequence;)V
@@ -800,6 +802,7 @@ public final class nl/adaptivity/xmlutil/XmlWriter$DefaultImpls {
 	public static fun namespaceAttr (Lnl/adaptivity/xmlutil/XmlWriter;Ljava/lang/CharSequence;Ljava/lang/CharSequence;)V
 	public static fun namespaceAttr (Lnl/adaptivity/xmlutil/XmlWriter;Lnl/adaptivity/xmlutil/Namespace;)V
 	public static fun processingInstruction (Lnl/adaptivity/xmlutil/XmlWriter;Ljava/lang/String;Ljava/lang/String;)V
+	public static fun safeCdsect (Lnl/adaptivity/xmlutil/XmlWriter;Ljava/lang/String;)V
 	public static fun setIndent (Lnl/adaptivity/xmlutil/XmlWriter;I)V
 	public static fun setPrefix (Lnl/adaptivity/xmlutil/XmlWriter;Ljava/lang/CharSequence;Ljava/lang/CharSequence;)V
 	public static synthetic fun startDocument$default (Lnl/adaptivity/xmlutil/XmlWriter;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Boolean;ILjava/lang/Object;)V

core/base/api/core.api

@@ -737,6 +737,7 @@ abstract interface nl.adaptivity.xmlutil/XmlWriter : nl.adaptivity.xmlutil.core.
     open fun namespaceAttr(kotlin/CharSequence, kotlin/CharSequence) // nl.adaptivity.xmlutil/XmlWriter.namespaceAttr|namespaceAttr(kotlin.CharSequence;kotlin.CharSequence){}[0]
     open fun namespaceAttr(nl.adaptivity.xmlutil/Namespace) // nl.adaptivity.xmlutil/XmlWriter.namespaceAttr|namespaceAttr(nl.adaptivity.xmlutil.Namespace){}[0]
     open fun processingInstruction(kotlin/String, kotlin/String) // nl.adaptivity.xmlutil/XmlWriter.processingInstruction|processingInstruction(kotlin.String;kotlin.String){}[0]
+    open fun safeCdsect(kotlin/String) // nl.adaptivity.xmlutil/XmlWriter.safeCdsect|safeCdsect(kotlin.String){}[0]
     open fun setPrefix(kotlin/CharSequence, kotlin/CharSequence) // nl.adaptivity.xmlutil/XmlWriter.setPrefix|setPrefix(kotlin.CharSequence;kotlin.CharSequence){}[0]
 }
 
@@ -778,6 +779,7 @@ abstract class nl.adaptivity.xmlutil/XmlDelegatingWriter : nl.adaptivity.xmlutil
     open fun namespaceAttr(nl.adaptivity.xmlutil/Namespace) // nl.adaptivity.xmlutil/XmlDelegatingWriter.namespaceAttr|namespaceAttr(nl.adaptivity.xmlutil.Namespace){}[0]
     open fun processingInstruction(kotlin/String) // nl.adaptivity.xmlutil/XmlDelegatingWriter.processingInstruction|processingInstruction(kotlin.String){}[0]
     open fun processingInstruction(kotlin/String, kotlin/String) // nl.adaptivity.xmlutil/XmlDelegatingWriter.processingInstruction|processingInstruction(kotlin.String;kotlin.String){}[0]
+    open fun safeCdsect(kotlin/String) // nl.adaptivity.xmlutil/XmlDelegatingWriter.safeCdsect|safeCdsect(kotlin.String){}[0]
     open fun setPrefix(kotlin/CharSequence, kotlin/CharSequence) // nl.adaptivity.xmlutil/XmlDelegatingWriter.setPrefix|setPrefix(kotlin.CharSequence;kotlin.CharSequence){}[0]
     open fun setPrefix(kotlin/String, kotlin/String) // nl.adaptivity.xmlutil/XmlDelegatingWriter.setPrefix|setPrefix(kotlin.String;kotlin.String){}[0]
     open fun startDocument(kotlin/String?, kotlin/String?, kotlin/Boolean?) // nl.adaptivity.xmlutil/XmlDelegatingWriter.startDocument|startDocument(kotlin.String?;kotlin.String?;kotlin.Boolean?){}[0]

core/base/api/core.klib.api

@@ -125,6 +125,18 @@ public interface XmlWriter : Closeable {
      */
     public fun cdsect(text: String)
 
+    /** Safe version of CDSect that writes multiple CD Sections to handle embedded `]]>` */
+    public fun safeCdsect(text: String) {
+        var idx = text.indexOf("]]>")
+        var start = 0
+        while (idx >= 0) {
+            cdsect(text.substring(start, idx + 2))
+            start = idx + 2
+            idx = text.indexOf("]]>", idx + 3)
+        }
+        if (start < text.length) cdsect(text.substring(start))
+    }
+
     /**
      * Write an entity reference
      * @param text the name of the reference. Must be a valid reference name.