Skip to content

Commit 663c419

Browse files
pdvriezepdvrieze
committedMay 18, 2024·
Update to Kotlin 2.0.0-RC3
·
v0.91.0-RC1v0.90.0-RC1
1 parent 3af221c commit 663c419

File tree

30 files changed

+463
-481
lines changed

30 files changed

+463
-481
lines changed
 

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ reports
33
out
44
local.properties
55
build
6+
.kotlin
67
.gradle
78
.idea/libraries
89
.idea/dataSources.ids

‎core/base/api/base.klib.api

+59-63
Large diffs are not rendered by default.

‎core/base/build.gradle.kts

+3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
* under the License.
1919
*/
2020

21+
import kotlinx.validation.api.klib.KlibSignatureVersion
2122
import net.devrieze.gradle.ext.addNativeTargets
23+
import net.devrieze.gradle.ext.applyDefaultXmlUtilHierarchyTemplate
2224
import net.devrieze.gradle.ext.doPublish
2325
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
2426

@@ -40,6 +42,7 @@ config {
4042
val autoModuleName = "net.devrieze.xmlutil.core"
4143

4244
kotlin {
45+
applyDefaultXmlUtilHierarchyTemplate()
4346
explicitApi()
4447

4548
components.configureEach {

‎core/base/src/commonDomMain/kotlin/nl/adaptivity/xmlutil/core/impl/multiplatform/multiplatform.commonDom.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public actual abstract class Writer : Appendable {
6868

6969
actual abstract override fun append(value: Char): Appendable
7070

71-
actual override fun append(value: CharSequence?): Appendable {
71+
actual open override fun append(value: CharSequence?): Appendable {
7272
return append(value, 0, value?.length ?: 0)
7373
}
7474

@@ -86,15 +86,15 @@ public actual open class StringWriter : Writer() {
8686
return buffer.toString()
8787
}
8888

89-
override fun append(value: Char): Appendable = apply {
89+
actual open override fun append(value: Char): Appendable = apply {
9090
buffer.append(value)
9191
}
9292

9393
override fun append(value: CharSequence?): Appendable = apply {
9494
buffer.append(value)
9595
}
9696

97-
override fun append(
97+
actual override fun append(
9898
value: CharSequence?,
9999
startIndex: Int,
100100
endIndex: Int
@@ -126,7 +126,7 @@ public actual open class StringReader(private val source: CharSequence) : Reader
126126
else -> source[pos++].code
127127
}
128128

129-
override fun read(buf: CharArray, offset: Int, len: Int): Int {
129+
actual override fun read(buf: CharArray, offset: Int, len: Int): Int {
130130
if (pos >= source.length) return -1
131131
val count = minOf(len, source.length - pos)
132132
for (i in 0 until count) {

‎core/base/src/commonMain/kotlin/nl/adaptivity/xmlutil/core/impl/multiplatform/multiplatform.kt

+11-7
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,17 @@ public expect val KClass<*>.maybeAnnotations: List<Annotation>
5858
@XmlUtilInternal
5959
public expect abstract class Writer : Appendable {
6060
public open fun write(text: String)
61-
override fun append(value: CharSequence?): Appendable
62-
abstract override fun append(value: Char): Appendable
63-
abstract override fun append(value: CharSequence?, startIndex: Int, endIndex: Int): Appendable
61+
open override fun append(value: CharSequence?): Appendable
62+
abstract open override fun append(value: Char): Appendable
63+
abstract open override fun append(value: CharSequence?, startIndex: Int, endIndex: Int): Appendable
6464
public open fun flush()
6565
}
6666

6767
@XmlUtilInternal
6868
public expect open class StringWriter() : Writer {
6969
override fun toString(): String
70+
override fun append(value: Char): Appendable
71+
override fun append(value: CharSequence?, startIndex: Int, endIndex: Int): Appendable
7072
}
7173

7274
@XmlUtilInternal
@@ -83,20 +85,22 @@ public expect abstract class OutputStream : Closeable {
8385
@XmlUtilInternal
8486
public expect abstract class Reader {
8587
public open fun read(): Int
86-
public abstract fun read(buf: CharArray, offset: Int, len: Int): Int
88+
public open abstract fun read(buf: CharArray, offset: Int, len: Int): Int
8789
}
8890

8991
@XmlUtilInternal
9092
public expect abstract class InputStream : Closeable {
9193
public open fun read(buffer: ByteArray, offset: Int, len: Int): Int
9294

93-
public fun read(b: ByteArray): Int
95+
public open fun read(b: ByteArray): Int
9496
public abstract fun read(): Int
95-
public override fun close()
97+
public open override fun close()
9698
}
9799

98100
@XmlUtilInternal
99-
public expect open class StringReader(source: String) : Reader
101+
public expect open class StringReader(source: String) : Reader {
102+
override fun read(buf: CharArray, offset: Int, len: Int): Int
103+
}
100104

101105
@XmlUtilInternal
102106
@MpJvmDefaultWithoutCompatibility

‎core/base/src/jsMain/kotlin/nl/adaptivity/xmlutil/core/impl/multiplatform/multiplatform.js.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public actual abstract class Writer : Appendable {
7878
append(text)
7979
}
8080

81-
actual override fun append(value: CharSequence?): Appendable {
81+
actual open override fun append(value: CharSequence?): Appendable {
8282
return append(value, 0, value?.length ?: 0)
8383
}
8484

@@ -96,15 +96,15 @@ public actual open class StringWriter : Writer() {
9696
return buffer.toString()
9797
}
9898

99-
override fun append(value: Char): Appendable = apply {
99+
actual override fun append(value: Char): Appendable = apply {
100100
buffer.append(value)
101101
}
102102

103103
override fun append(value: CharSequence?): Appendable = apply {
104104
buffer.append(value)
105105
}
106106

107-
override fun append(
107+
actual override fun append(
108108
value: CharSequence?,
109109
startIndex: Int,
110110
endIndex: Int
@@ -135,7 +135,7 @@ public actual open class StringReader(source: CharSequence) : Reader() {
135135
else -> source[srcOffset++].code
136136
}
137137

138-
override fun read(buf: CharArray, offset: Int, len: Int): Int {
138+
actual override fun read(buf: CharArray, offset: Int, len: Int): Int {
139139
if (srcOffset >= source.length) return -1
140140
val count = minOf(len, source.length - srcOffset)
141141
for (i in 0 until count) {
@@ -162,7 +162,7 @@ public actual abstract class InputStream : Closeable {
162162
return len
163163
}
164164

165-
public actual fun read(b: ByteArray): Int {
165+
public actual open fun read(b: ByteArray): Int {
166166
return read(b, 0, b.size)
167167
}
168168

‎core/base/src/jvmMain/kotlin/nl/adaptivity/xmlutil/XmlReaderExt.jvm.kt

-36
This file was deleted.

‎core/base/src/jvmMain/kotlin/nl/adaptivity/xmlutil/XmlReaderExt.kt

+11-1
Original file line numberDiff line numberDiff line change
@@ -111,4 +111,14 @@ public fun XmlReader.toCharArrayWriter(): CharArrayWriter {
111111
}
112112
}
113113

114-
internal expect fun XmlReader.toCharArrayWriterImpl(): CharArrayWriter
114+
internal fun XmlReader.toCharArrayWriterImpl(): CharArrayWriter {
115+
return CharArrayWriter().also {
116+
@Suppress("DEPRECATION")
117+
XmlStreaming.newWriter(it as Appendable).use { out ->
118+
while (hasNext()) {
119+
next()
120+
writeCurrent(out)
121+
}
122+
}
123+
}
124+
}

‎core/base/src/jvmMain/kotlin/nl/adaptivity/xmlutil/core/impl/multiplatform/multiplatform.javaShared.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ package nl.adaptivity.xmlutil.core.impl.multiplatform
2222

2323
import kotlin.reflect.KClass
2424

25-
public actual val KClass<*>.name: String get() = javaCompat.name
25+
public actual val KClass<*>.name: String get() = java.name
2626

2727
public typealias URI = java.net.URI
2828

29-
public actual val KClass<*>.maybeAnnotations: List<Annotation> get() = javaCompat.annotations.toList()
29+
public actual val KClass<*>.maybeAnnotations: List<Annotation> get() = java.annotations.toList()
3030

‎core/base/src/jvmMain/kotlin/nl/adaptivity/xmlutil/core/impl/multiplatform/utils.kt

+3-14
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626

2727
package nl.adaptivity.xmlutil.core.impl.multiplatform
2828

29-
import kotlin.reflect.KClass
3029
import java.io.StringWriter as JavaStringWriter
3130

3231
public actual typealias AutoCloseable = java.lang.AutoCloseable
@@ -43,7 +42,7 @@ public actual abstract class Writer : Appendable {
4342

4443
actual abstract override fun append(value: CharSequence?, startIndex: Int, endIndex: Int): Appendable
4544

46-
actual override fun append(value: CharSequence?): Appendable {
45+
actual open override fun append(value: CharSequence?): Appendable {
4746
return append(value, 0, value?.length ?: 0)
4847
}
4948

@@ -54,13 +53,13 @@ public actual abstract class Writer : Appendable {
5453
public actual open class StringWriter actual constructor() : Writer() {
5554
private val delegate = JavaStringWriter()
5655

57-
override fun append(value: Char): Appendable {
56+
actual override fun append(value: Char): Appendable {
5857
delegate.append(value)
5958
return this
6059
}
6160

6261
@Suppress("PARAMETER_NAME_CHANGED_ON_OVERRIDE", "KotlinRedundantDiagnosticSuppress")
63-
override fun append(value: CharSequence?, startIndex: Int, endIndex: Int): Appendable {
62+
actual override fun append(value: CharSequence?, startIndex: Int, endIndex: Int): Appendable {
6463
delegate.append(value, startIndex, endIndex)
6564
return this
6665
}
@@ -75,13 +74,3 @@ public actual typealias StringReader = java.io.StringReader
7574

7675
public actual typealias InputStream = java.io.InputStream
7776
public actual typealias OutputStream = java.io.OutputStream
78-
79-
internal expect val <T : Any> KClass<T>.javaCompat: Class<T>
80-
81-
internal expect val <T : Any> T.javaClassCompat: Class<T>
82-
83-
84-
85-
internal actual val <T : Any> KClass<T>.javaCompat: Class<T> get() = this.java
86-
internal actual val <T : Any> T.javaClassCompat: Class<T>
87-
get() = javaClass

‎core/base/src/jvmMain/kotlin/nl/adaptivity/xmlutil/util/DefaultSerializationProvider.kt

+7-9
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,12 @@ package nl.adaptivity.xmlutil.util
2525
import nl.adaptivity.xmlutil.XmlReader
2626
import nl.adaptivity.xmlutil.XmlSerializable
2727
import nl.adaptivity.xmlutil.XmlWriter
28-
import nl.adaptivity.xmlutil.core.impl.multiplatform.javaClassCompat
29-
import nl.adaptivity.xmlutil.core.impl.multiplatform.javaCompat
3028
import kotlin.reflect.KClass
3129

3230
@Deprecated("This should be done in the xmlserializable module")
3331
public class DefaultSerializationProvider : CoreCompatSerializationProvider {
3432
override fun <T : Any> serializer(type: KClass<T>): SerializationProvider.XmlSerializerFun<T>? {
35-
if (XmlSerializable::class.javaCompat.isAssignableFrom(type.javaCompat)) {
33+
if (XmlSerializable::class.java.isAssignableFrom(type.java)) {
3634
@Suppress("UNCHECKED_CAST") // the system isn't smart enough that this means T is a subtype
3735
return (SerializableSerializer as SerializationProvider.XmlSerializerFun<T>)
3836
} else {
@@ -41,20 +39,20 @@ public class DefaultSerializationProvider : CoreCompatSerializationProvider {
4139
}
4240

4341
override fun <T : Any> deSerializer(type: KClass<T>): SerializationProvider.XmlDeserializerFun? {
44-
val a = type.javaCompat.annotations
45-
.firstOrNull { it.javaClassCompat.name == "nl.adaptivity.xmlutil.xmlserializable.XmlDeserializer" }
42+
val a = type.java.annotations
43+
.firstOrNull { it.javaClass.name == "nl.adaptivity.xmlutil.xmlserializable.XmlDeserializer" }
4644
return a?.let { DeserializerFun }
4745
}
4846

4947
private object DeserializerFun : SerializationProvider.XmlDeserializerFun {
5048
override fun <T : Any> invoke(input: XmlReader, type: KClass<T>): T {
51-
val a = type.javaCompat.annotations
52-
.first { it.javaClassCompat.name == "nl.adaptivity.xmlutil.xmlserializable.XmlDeserializer" }
53-
val factoryClass = a.javaClassCompat.getMethod("value").invoke(a) as Class<*>
49+
val a = type.java.annotations
50+
.first { it.javaClass.name == "nl.adaptivity.xmlutil.xmlserializable.XmlDeserializer" }
51+
val factoryClass = a.javaClass.getMethod("value").invoke(a) as Class<*>
5452
val factory = factoryClass.getConstructor().newInstance()
5553

5654
@Suppress("UNCHECKED_CAST")
57-
return factoryClass.getMethod("deserialize", XmlReader::class.javaCompat)
55+
return factoryClass.getMethod("deserialize", XmlReader::class.java)
5856
.invoke(factory, input) as T
5957
}
6058
}

‎core/base/src/nativeMain/kotlin/nl/adaptivity/xmlutil/core/impl/multiplatform/InputStream.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public actual abstract class InputStream : Closeable {
4646
return len
4747
}
4848

49-
public actual fun read(b: ByteArray): Int {
49+
public actual open fun read(b: ByteArray): Int {
5050
return read(b, 0, b.size)
5151
}
5252

‎core/base/src/wasmCommonMain/kotlin/nl/adaptivity/xmlutil/core/impl/multiplatform/multiplatform.wasmJs.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public actual abstract class InputStream : Closeable {
8383
return len
8484
}
8585

86-
public actual fun read(b: ByteArray): Int {
86+
public actual open fun read(b: ByteArray): Int {
8787
return read(b, 0, b.size)
8888
}
8989

‎gradle/libs.versions.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ binaryValidator = "0.15.0-Beta.2"
44
dokka = "1.9.20"
55
javaVersion = "8"
66
junit5-jupiter = "5.10.2"
7-
kotlin = "1.9.23"
8-
kotlinx-serialization = "1.6.3"
7+
kotlin = "2.0.0-RC3"
8+
kotlinx-serialization = "1.7.0-RC"
99
kxml2 = "2.3.0"
1010
woodstox = "6.6.2"
1111
xmlutil = "0.90.0-SNAPSHOT"

‎kotlin-js-store/yarn.lock

+213-193
Large diffs are not rendered by default.

‎project-plugins/src/main/kotlin/io/github/xmlutil/plugin/ProjectPlugin.kt

+7-8
Original file line numberDiff line numberDiff line change
@@ -91,17 +91,16 @@ class ProjectPlugin: Plugin<Project> {
9191
configureCompilerOptions(project, "project ${project.name}")
9292
}
9393

94-
94+
sourceSets.configureEach {
95+
languageSettings {
96+
configureLanguageSettings()
97+
}
98+
}
9599
target {
96100
attributes {
97101
attribute(TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE, project.envJvm)
98102
attribute(KotlinPlatformType.attribute, KotlinPlatformType.jvm)
99103
}
100-
sourceSets.configureEach {
101-
languageSettings {
102-
configureLanguageSettings()
103-
}
104-
}
105104
mavenPublication {
106105
version = xmlutil_version
107106
project.logger.info("Setting maven publication ($artifactId) version to $xmlutil_version")
@@ -122,7 +121,7 @@ class ProjectPlugin: Plugin<Project> {
122121
sourceSets.configureEach {
123122
languageSettings {
124123
configureLanguageSettings()
125-
apiVersion = if (isJvm) "1.8" else "1.9"
124+
apiVersion = if (isJvm) "1.8" else "2.0"
126125
}
127126
}
128127
mavenPublication {
@@ -175,7 +174,7 @@ class ProjectPlugin: Plugin<Project> {
175174

176175
private fun KotlinCommonCompilerOptions.configureCompilerOptions(project: Project, name: String) {
177176
progressiveMode = true
178-
languageVersion = KotlinVersion.KOTLIN_1_9
177+
languageVersion = KotlinVersion.KOTLIN_2_0
179178
if (this is KotlinJvmCompilerOptions) {
180179
project.logger.info("Setting common compilation options for $name")
181180
jvmTarget = JvmTarget.JVM_1_8

‎project-plugins/src/main/kotlin/net/devrieze/gradle/ext/nativeTargets.kt

+2-5
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ import org.gradle.kotlin.dsl.getByName
2828
import org.gradle.kotlin.dsl.withType
2929
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
3030
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
31-
import org.jetbrains.kotlin.gradle.kpm.external.ExternalVariantApi
32-
import org.jetbrains.kotlin.gradle.kpm.external.project
3331
import org.jetbrains.kotlin.gradle.plugin.*
3432
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
3533
import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeHostTest
@@ -88,7 +86,8 @@ private val defaultXmlUtilHierarchyTemplate = KotlinHierarchyTemplate {
8886
group("commonDom") {
8987

9088
group("wasmCommon") {
91-
withWasm()
89+
withWasmJs()
90+
withWasmWasi()
9291
}
9392

9493
group("native") {
@@ -230,9 +229,7 @@ fun Project.addNativeTargets(includeWasm: Boolean = true, includeWasi: Boolean =
230229
}
231230
}
232231

233-
@OptIn(ExternalVariantApi::class)
234232
project.logger.debug("Registering :${project.name}:nativeTest")
235-
@OptIn(ExternalVariantApi::class)
236233
project.tasks.register("nativeTest") {
237234
group = "verification"
238235
val testTasks = tasks.withType<KotlinNativeTest>().filter {

‎serialization/api/android/serialization.api

+2-2
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public final class nl/adaptivity/xmlutil/serialization/ElementSerializer : nl/ad
119119
public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
120120
public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lorg/w3c/dom/Element;
121121
public synthetic fun deserializeXML (Lkotlinx/serialization/encoding/Decoder;Lnl/adaptivity/xmlutil/XmlReader;Ljava/lang/Object;Z)Ljava/lang/Object;
122-
public fun deserializeXML (Lkotlinx/serialization/encoding/Decoder;Lnl/adaptivity/xmlutil/XmlReader;Lorg/w3c/dom/Element;Z)Lnl/adaptivity/xmlutil/core/impl/idom/IElement;
122+
public fun deserializeXML (Lkotlinx/serialization/encoding/Decoder;Lnl/adaptivity/xmlutil/XmlReader;Lorg/w3c/dom/Element;Z)Lorg/w3c/dom/Element;
123123
public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
124124
public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
125125
public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lorg/w3c/dom/Element;)V
@@ -161,7 +161,7 @@ public final class nl/adaptivity/xmlutil/serialization/NodeSerializer : nl/adapt
161161
public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
162162
public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lorg/w3c/dom/Node;
163163
public synthetic fun deserializeXML (Lkotlinx/serialization/encoding/Decoder;Lnl/adaptivity/xmlutil/XmlReader;Ljava/lang/Object;Z)Ljava/lang/Object;
164-
public fun deserializeXML (Lkotlinx/serialization/encoding/Decoder;Lnl/adaptivity/xmlutil/XmlReader;Lorg/w3c/dom/Node;Z)Lnl/adaptivity/xmlutil/core/impl/idom/INode;
164+
public fun deserializeXML (Lkotlinx/serialization/encoding/Decoder;Lnl/adaptivity/xmlutil/XmlReader;Lorg/w3c/dom/Node;Z)Lorg/w3c/dom/Node;
165165
public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
166166
public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
167167
public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lorg/w3c/dom/Node;)V

‎serialization/api/jvm/serialization.api

+2-2
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public final class nl/adaptivity/xmlutil/serialization/ElementSerializer : nl/ad
119119
public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
120120
public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lorg/w3c/dom/Element;
121121
public synthetic fun deserializeXML (Lkotlinx/serialization/encoding/Decoder;Lnl/adaptivity/xmlutil/XmlReader;Ljava/lang/Object;Z)Ljava/lang/Object;
122-
public fun deserializeXML (Lkotlinx/serialization/encoding/Decoder;Lnl/adaptivity/xmlutil/XmlReader;Lorg/w3c/dom/Element;Z)Lnl/adaptivity/xmlutil/core/impl/idom/IElement;
122+
public fun deserializeXML (Lkotlinx/serialization/encoding/Decoder;Lnl/adaptivity/xmlutil/XmlReader;Lorg/w3c/dom/Element;Z)Lorg/w3c/dom/Element;
123123
public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
124124
public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
125125
public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lorg/w3c/dom/Element;)V
@@ -161,7 +161,7 @@ public final class nl/adaptivity/xmlutil/serialization/NodeSerializer : nl/adapt
161161
public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
162162
public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lorg/w3c/dom/Node;
163163
public synthetic fun deserializeXML (Lkotlinx/serialization/encoding/Decoder;Lnl/adaptivity/xmlutil/XmlReader;Ljava/lang/Object;Z)Ljava/lang/Object;
164-
public fun deserializeXML (Lkotlinx/serialization/encoding/Decoder;Lnl/adaptivity/xmlutil/XmlReader;Lorg/w3c/dom/Node;Z)Lnl/adaptivity/xmlutil/core/impl/idom/INode;
164+
public fun deserializeXML (Lkotlinx/serialization/encoding/Decoder;Lnl/adaptivity/xmlutil/XmlReader;Lorg/w3c/dom/Node;Z)Lorg/w3c/dom/Node;
165165
public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
166166
public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
167167
public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lorg/w3c/dom/Node;)V

‎serialization/api/serialization.klib.api

+111-111
Large diffs are not rendered by default.

‎serialization/build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ dependencies {
232232

233233
apiValidation {
234234
klib {
235+
strictValidation = false
235236
enabled = true
236237
}
237238
nonPublicMarkers.apply {

‎serialization/src/androidMain/kotlin/nl/adaptivity/xmlutil/serialization/ElementSerializer.android.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public actual object ElementSerializer : XmlSerializer<Element1> {
6161
input: XmlReader,
6262
previousValue: Element1?,
6363
isValueChild: Boolean
64-
): IElement {
64+
): Element1 {
6565
return delegate.deserializeXML(decoder, input, previousValue as Element2?, isValueChild) as IElement
6666
}
6767

‎serialization/src/androidMain/kotlin/nl/adaptivity/xmlutil/serialization/NodeSerializer.android.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public actual object NodeSerializer : XmlSerializer<Node1> {
6161
input: XmlReader,
6262
previousValue: Node1?,
6363
isValueChild: Boolean
64-
): INode {
64+
): Node1 {
6565
return delegate.deserializeXML(decoder, input, previousValue as INode, isValueChild) as INode
6666
}
6767
}

‎serialization/src/commonDomMain/kotlin/nl/adaptivity/xmlutil/serialization/ElementSerializer.commonDom.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public actual object ElementSerializer : XmlSerializer<Element> {
4242
@OptIn(ExperimentalSerializationApi::class)
4343
override val descriptor: SerialDescriptor get() = SerialDescriptor("org.w3c.dom.Element", delegate.descriptor)
4444

45-
override fun deserialize(decoder: Decoder): IElement {
45+
override fun deserialize(decoder: Decoder): Element {
4646
return delegate.deserialize(decoder) as IElement
4747
}
4848

@@ -56,7 +56,7 @@ public actual object ElementSerializer : XmlSerializer<Element> {
5656
input: XmlReader,
5757
previousValue: Element?,
5858
isValueChild: Boolean
59-
): IElement {
59+
): Element {
6060
return delegate.deserializeXML(decoder, input, previousValue as Element2, isValueChild) as IElement
6161
}
6262

‎serialization/src/commonDomMain/kotlin/nl/adaptivity/xmlutil/serialization/NodeSerializer.commonDom.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public actual object NodeSerializer : XmlSerializer<Node1> {
5151
delegate.serializeXML(encoder, output, v, isValueChild)
5252
}
5353

54-
override fun deserialize(decoder: Decoder): INode {
54+
override fun deserialize(decoder: Decoder): Node1 {
5555
return delegate.deserialize(decoder) as INode
5656
}
5757

@@ -60,7 +60,7 @@ public actual object NodeSerializer : XmlSerializer<Node1> {
6060
input: XmlReader,
6161
previousValue: Node1?,
6262
isValueChild: Boolean
63-
): INode {
63+
): Node1 {
6464
return delegate.deserializeXML(decoder, input, previousValue as INode, isValueChild) as INode
6565
}
6666

‎serialization/src/commonJvmMain/kotlin/nl/adaptivity/xmlutil/serialization/ElementSerializer.commonJvm.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public actual object ElementSerializer : XmlSerializer<Element1> {
6161
input: XmlReader,
6262
previousValue: Element1?,
6363
isValueChild: Boolean
64-
): IElement {
64+
): Element1 {
6565
return delegate.deserializeXML(decoder, input, previousValue as Element2?, isValueChild) as IElement
6666
}
6767

‎serialization/src/commonJvmMain/kotlin/nl/adaptivity/xmlutil/serialization/NodeSerializer.commonJvm.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public actual object NodeSerializer : XmlSerializer<Node1> {
6161
input: XmlReader,
6262
previousValue: Node1?,
6363
isValueChild: Boolean
64-
): INode {
64+
): Node1 {
6565
return delegate.deserializeXML(decoder, input, previousValue as INode, isValueChild) as INode
6666
}
6767
}

‎serialization/src/jsMain/kotlin/nl/adaptivity/xmlutil/serialization/ElementSerializer.js.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public actual object ElementSerializer : XmlSerializer<Element1> {
5151
return delegate.serializeXML(encoder, output, e, isValueChild)
5252
}
5353

54-
override fun deserialize(decoder: Decoder): IElement {
54+
override fun deserialize(decoder: Decoder): Element1 {
5555
return delegate.deserialize(decoder) as IElement
5656
}
5757

@@ -60,7 +60,7 @@ public actual object ElementSerializer : XmlSerializer<Element1> {
6060
input: XmlReader,
6161
previousValue: Element1?,
6262
isValueChild: Boolean
63-
): IElement {
63+
): Element1 {
6464
return delegate.deserializeXML(decoder, input, previousValue as Element2, isValueChild) as IElement
6565
}
6666
}

‎serialization/src/jsMain/kotlin/nl/adaptivity/xmlutil/serialization/NodeSerializer.js.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public actual object NodeSerializer : XmlSerializer<Node1> {
5151
delegate.serializeXML(encoder, output, v, isValueChild)
5252
}
5353

54-
override fun deserialize(decoder: Decoder): INode {
54+
override fun deserialize(decoder: Decoder): Node1 {
5555
return delegate.deserialize(decoder) as INode
5656
}
5757

@@ -60,7 +60,7 @@ public actual object NodeSerializer : XmlSerializer<Node1> {
6060
input: XmlReader,
6161
previousValue: Node1?,
6262
isValueChild: Boolean
63-
): INode {
63+
): Node1 {
6464
return delegate.deserializeXML(decoder, input, previousValue as INode, isValueChild) as INode
6565
}
6666

‎serialutil/api/serialutil.klib.api

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ final class nl.adaptivity.serialutil.encoders/HashFormat : kotlinx.serialization
3838
final fun <get-serializersModule>(): kotlinx.serialization.modules/SerializersModule // nl.adaptivity.serialutil.encoders/HashFormat.serializersModule.<get-serializersModule>|<get-serializersModule>(){}[0]
3939
}
4040
final class nl.adaptivity.serialutil/SimpleSerialClassDesc : kotlinx.serialization.descriptors/SerialDescriptor { // nl.adaptivity.serialutil/SimpleSerialClassDesc|null[0]
41-
constructor <init>(kotlin/String, kotlinx.serialization.descriptors/SerialKind =..., kotlin.collections/List<kotlin/Annotation>, kotlin/Array<out kotlin/Pair<kotlin/String, kotlinx.serialization/KSerializer<*>>>...) // nl.adaptivity.serialutil/SimpleSerialClassDesc.<init>|<init>(kotlin.String;kotlinx.serialization.descriptors.SerialKind;kotlin.collections.List<kotlin.Annotation>;kotlin.Array<out|kotlin.Pair<kotlin.String,kotlinx.serialization.KSerializer<*>>>...){}[0]
42-
constructor <init>(kotlinx.serialization.descriptors/SerialKind =..., kotlin/String, kotlin.collections/List<kotlin/Annotation>, kotlin/Array<out kotlin/Pair<kotlin/String, kotlinx.serialization.descriptors/SerialDescriptor>>...) // nl.adaptivity.serialutil/SimpleSerialClassDesc.<init>|<init>(kotlinx.serialization.descriptors.SerialKind;kotlin.String;kotlin.collections.List<kotlin.Annotation>;kotlin.Array<out|kotlin.Pair<kotlin.String,kotlinx.serialization.descriptors.SerialDescriptor>>...){}[0]
41+
constructor <init>(kotlin/String, kotlinx.serialization.descriptors/SerialKind = ..., kotlin.collections/List<kotlin/Annotation>, kotlin/Array<out kotlin/Pair<kotlin/String, kotlinx.serialization/KSerializer<*>>>...) // nl.adaptivity.serialutil/SimpleSerialClassDesc.<init>|<init>(kotlin.String;kotlinx.serialization.descriptors.SerialKind;kotlin.collections.List<kotlin.Annotation>;kotlin.Array<out|kotlin.Pair<kotlin.String,kotlinx.serialization.KSerializer<*>>>...){}[0]
42+
constructor <init>(kotlinx.serialization.descriptors/SerialKind = ..., kotlin/String, kotlin.collections/List<kotlin/Annotation>, kotlin/Array<out kotlin/Pair<kotlin/String, kotlinx.serialization.descriptors/SerialDescriptor>>...) // nl.adaptivity.serialutil/SimpleSerialClassDesc.<init>|<init>(kotlinx.serialization.descriptors.SerialKind;kotlin.String;kotlin.collections.List<kotlin.Annotation>;kotlin.Array<out|kotlin.Pair<kotlin.String,kotlinx.serialization.descriptors.SerialDescriptor>>...){}[0]
4343
final fun getElementAnnotations(kotlin/Int): kotlin.collections/List<kotlin/Annotation> // nl.adaptivity.serialutil/SimpleSerialClassDesc.getElementAnnotations|getElementAnnotations(kotlin.Int){}[0]
4444
final fun getElementDescriptor(kotlin/Int): kotlinx.serialization.descriptors/SerialDescriptor // nl.adaptivity.serialutil/SimpleSerialClassDesc.getElementDescriptor|getElementDescriptor(kotlin.Int){}[0]
4545
final fun getElementIndex(kotlin/String): kotlin/Int // nl.adaptivity.serialutil/SimpleSerialClassDesc.getElementIndex|getElementIndex(kotlin.String){}[0]
@@ -71,7 +71,7 @@ final class nl.adaptivity.serialutil/SimpleSerialClassDescPrimitive : kotlinx.se
7171
final fun <get-serialName>(): kotlin/String // nl.adaptivity.serialutil/SimpleSerialClassDescPrimitive.serialName.<get-serialName>|<get-serialName>(){}[0]
7272
}
7373
final fun (kotlinx.serialization.descriptors/SerialDescriptor).nl.adaptivity.serialutil/withName(kotlin/String): kotlinx.serialization.descriptors/SerialDescriptor // nl.adaptivity.serialutil/withName|withName@kotlinx.serialization.descriptors.SerialDescriptor(kotlin.String){}[0]
74-
final fun (kotlinx.serialization.encoding/CompositeDecoder).nl.adaptivity.serialutil/readNullableString(kotlinx.serialization.descriptors/SerialDescriptor, kotlin/Int, kotlin/String? =...): kotlin/String? // nl.adaptivity.serialutil/readNullableString|readNullableString@kotlinx.serialization.encoding.CompositeDecoder(kotlinx.serialization.descriptors.SerialDescriptor;kotlin.Int;kotlin.String?){}[0]
74+
final fun (kotlinx.serialization.encoding/CompositeDecoder).nl.adaptivity.serialutil/readNullableString(kotlinx.serialization.descriptors/SerialDescriptor, kotlin/Int, kotlin/String? = ...): kotlin/String? // nl.adaptivity.serialutil/readNullableString|readNullableString@kotlinx.serialization.encoding.CompositeDecoder(kotlinx.serialization.descriptors.SerialDescriptor;kotlin.Int;kotlin.String?){}[0]
7575
final fun (kotlinx.serialization.encoding/CompositeEncoder).nl.adaptivity.serialutil/encodeNullableStringElement(kotlinx.serialization.descriptors/SerialDescriptor, kotlin/Int, kotlin/String?) // nl.adaptivity.serialutil/encodeNullableStringElement|encodeNullableStringElement@kotlinx.serialization.encoding.CompositeEncoder(kotlinx.serialization.descriptors.SerialDescriptor;kotlin.Int;kotlin.String?){}[0]
7676
final fun (kotlinx.serialization.encoding/CompositeEncoder).nl.adaptivity.serialutil/writeNullableStringElementValue(kotlinx.serialization.descriptors/SerialDescriptor, kotlin/Int, kotlin/String?) // nl.adaptivity.serialutil/writeNullableStringElementValue|writeNullableStringElementValue@kotlinx.serialization.encoding.CompositeEncoder(kotlinx.serialization.descriptors.SerialDescriptor;kotlin.Int;kotlin.String?){}[0]
7777
final fun (kotlinx.serialization.encoding/Decoder).nl.adaptivity.serialutil/readNullableString(): kotlin/String? // nl.adaptivity.serialutil/readNullableString|readNullableString@kotlinx.serialization.encoding.Decoder(){}[0]

0 commit comments

Comments
 (0)
Please sign in to comment.