Add a hooked XmlWriter that closes the OutputStreamWriter that is created for the sink. This needs to be done here as appendables are

not closable.

Author: pdvrieze

core/kxio/src/commonMain/kotlin/nl/adaptivity/xmlutil/core/kxio/util.kt

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2024.
+ *
+ * This file is part of xmlutil.
+ *
+ * This file is licenced to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You should have received a copy of the license with the source distribution.
+ * Alternatively, you may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package nl.adaptivity.xmlutil.core.kxio
+
+import nl.adaptivity.xmlutil.XmlDelegatingWriter
+import nl.adaptivity.xmlutil.XmlWriter
+
+internal fun XmlWriter.onClose(handler: () -> Unit): XmlWriter {
+    return CloseHandlingWriter(this, handler)
+}
+
+internal class CloseHandlingWriter(delegate: XmlWriter, private val closeHandler: ()->Unit): XmlDelegatingWriter(delegate) {
+    override fun close() {
+        try {
+            super.close()
+        } finally {
+            closeHandler()
+        }
+    }
+}

core/kxio/src/jvmMain/kotlin/nl/adaptivity/xmlutil/core/kxio/accessors.jvm.kt

@@ -40,17 +40,15 @@ public actual fun IXmlStreaming.newWriter(
     repairNamespaces: Boolean,
     xmlDeclMode: XmlDeclMode,
 ): XmlWriter {
-    return OutputStreamWriter(target.asOutputStream(), Charsets.UTF_8).let { output ->
-        newWriter(output, repairNamespaces, xmlDeclMode)
-    }
+    val output = OutputStreamWriter(target.asOutputStream(), Charsets.UTF_8)
+    return newWriter(output, repairNamespaces, xmlDeclMode).onClose { output.close() }
 }
 
 public actual fun IXmlStreaming.newGenericWriter(
     target: Sink,
     repairNamespaces: Boolean,
     xmlDeclMode: XmlDeclMode,
 ): XmlWriter {
-    return OutputStreamWriter(target.asOutputStream(), Charsets.UTF_8).let { output ->
-        newGenericWriter(output, repairNamespaces, xmlDeclMode)
-    }
+    val output = OutputStreamWriter(target.asOutputStream(), Charsets.UTF_8)
+    return newGenericWriter(output, repairNamespaces, xmlDeclMode).onClose { output.close() }
 }

serialization-io/build.gradle.kts

@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2024.
+ *
+ * This file is part of xmlutil.
+ *
+ * This file is licenced to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You should have received a copy of the license with the source distribution.
+ * Alternatively, you may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import net.devrieze.gradle.ext.addNativeTargets
+import net.devrieze.gradle.ext.applyDefaultXmlUtilHierarchyTemplate
+import net.devrieze.gradle.ext.doPublish
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.HasConfigurableKotlinCompilerOptions
+
+plugins {
+    alias(libs.plugins.dokka)
+    id("projectPlugin")
+    kotlin("multiplatform")
+    `maven-publish`
+    signing
+    idea
+}
+
+val autoModuleName = "net.devrieze.xmlutil.serialization.kxio"
+
+kotlin {
+    explicitApi()
+    applyDefaultXmlUtilHierarchyTemplate()
+
+    jvm()
+    js {
+        browser()
+        compilerOptions {
+            sourceMap = true
+            verbose = true
+        }
+    }
+
+    targets.all {
+        @OptIn(ExperimentalKotlinGradlePluginApi::class)
+        if (this is HasConfigurableKotlinCompilerOptions<*>) {
+            compilerOptions {
+                freeCompilerArgs.add("-Xexpect-actual-classes")
+            }
+        }
+    }
+
+    sourceSets {
+        val commonMain by getting {
+            dependencies {
+                api(projects.serialization)
+//                api(projects.core.kxio)
+            }
+        }
+
+        val commonTest by getting {
+            dependencies {
+                implementation(kotlin("test"))
+                implementation(kotlin("test-annotations-common"))
+                implementation(projects.testutil)
+                implementation(projects.serialization)
+            }
+        }
+    }
+}
+
+addNativeTargets()
+
+doPublish("serialization-io")

settings.gradle.kts

@@ -63,6 +63,7 @@ include("coreAndroid")
 include("coreKXIO")
 
 include(":serialization")
+include(":serialization-io")
 include(":xmlserializable")
 include(":testutil")
 include(":examples")