Skip to content

Commit 2caf485

Browse files
committed
Update the version of kotlinx.serialization to 1.8.0 (using kotlin 2.1.0)
1 parent 0853714 commit 2caf485

File tree

3 files changed

+16
-12
lines changed

3 files changed

+16
-12
lines changed

core/base/src/commonMain/kotlin/nl/adaptivity/xmlutil/XmlSerializer.kt

+5
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ package nl.adaptivity.xmlutil
2222

2323
import kotlinx.serialization.ExperimentalSerializationApi
2424
import kotlinx.serialization.KSerializer
25+
import kotlinx.serialization.SealedSerializationApi
2526
import kotlinx.serialization.descriptors.SerialDescriptor
2627
import kotlinx.serialization.descriptors.SerialKind
2728

@@ -64,6 +65,8 @@ public annotation class XmlSerialDescriptorMarker
6465
* This descriptor is internal as implementation is brittle. If you want an instance use
6566
* [SerialDescriptor.xml].
6667
*/
68+
@OptIn(SealedSerializationApi::class, ExperimentalSubclassOptIn::class)
69+
@SubclassOptInRequired(SealedSerializationApi::class)
6770
@XmlUtilInternal
6871
public interface XmlSerialDescriptor : SerialDescriptor {
6972
public val delegate: SerialDescriptor
@@ -81,6 +84,7 @@ public interface XmlSerialDescriptor : SerialDescriptor {
8184
listOf(XmlSerialDescriptorMarker()) + delegate.annotations
8285
}
8386

87+
@OptIn(SealedSerializationApi::class)
8488
private class ExtXmlSerialDescriptor(
8589
override val delegate: SerialDescriptor,
8690
xmlDescriptor: SerialDescriptor = delegate,
@@ -106,6 +110,7 @@ private class ExtXmlSerialDescriptor(
106110
override val isNullable: Boolean get() = delegate.isNullable
107111
}
108112

113+
@OptIn(SealedSerializationApi::class)
109114
private class BaseXmlSerialDescriptor(
110115
override val delegate: SerialDescriptor,
111116
override val serialQName: QName?

serialutil/api/serialutil.api

-5
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,6 @@ public final class nl/adaptivity/serialutil/SimpleSerialClassDesc : kotlinx/seri
110110
public fun getKind ()Lkotlinx/serialization/descriptors/SerialKind;
111111
public fun getSerialName ()Ljava/lang/String;
112112
public fun isElementOptional (I)Z
113-
public fun isInline ()Z
114-
public fun isNullable ()Z
115113
}
116114

117115
public final class nl/adaptivity/serialutil/SimpleSerialClassDescKt {
@@ -120,7 +118,6 @@ public final class nl/adaptivity/serialutil/SimpleSerialClassDescKt {
120118

121119
public final class nl/adaptivity/serialutil/SimpleSerialClassDescPrimitive : kotlinx/serialization/descriptors/SerialDescriptor {
122120
public fun <init> (Lkotlinx/serialization/descriptors/PrimitiveKind;Ljava/lang/String;)V
123-
public fun getAnnotations ()Ljava/util/List;
124121
public fun getElementAnnotations (I)Ljava/lang/Void;
125122
public synthetic fun getElementAnnotations (I)Ljava/util/List;
126123
public fun getElementDescriptor (I)Ljava/lang/Void;
@@ -133,8 +130,6 @@ public final class nl/adaptivity/serialutil/SimpleSerialClassDescPrimitive : kot
133130
public synthetic fun getKind ()Lkotlinx/serialization/descriptors/SerialKind;
134131
public fun getSerialName ()Ljava/lang/String;
135132
public fun isElementOptional (I)Z
136-
public fun isInline ()Z
137-
public fun isNullable ()Z
138133
}
139134

140135
public final class nl/adaptivity/serialutil/encoders/HashFormat : kotlinx/serialization/SerialFormat {

serialutil/src/commonMain/kotlin/nl/adaptivity/serialutil/SimpleSerialClassDesc.kt

+11-7
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import nl.adaptivity.serialutil.impl.maybeAnnotations
3030
import nl.adaptivity.serialutil.impl.name
3131
import kotlin.jvm.JvmName
3232

33-
@Deprecated("Use the standard library buildSerialDescriptor function")
33+
@Deprecated("Use the standard library buildSerialDescriptor function", level = DeprecationLevel.ERROR)
3434
@OptIn(InternalSerializationApi::class)
3535
@ExperimentalSerializationApi
3636
inline fun <reified T> simpleSerialClassDesc(
@@ -42,7 +42,7 @@ inline fun <reified T> simpleSerialClassDesc(
4242
}
4343
}
4444

45-
@Deprecated("Use the standard library buildSerialDescriptor function")
45+
@Deprecated("Use the standard library buildSerialDescriptor function", level = DeprecationLevel.ERROR)
4646
@OptIn(InternalSerializationApi::class)
4747
@ExperimentalSerializationApi
4848
inline fun <reified T> simpleSerialClassDesc(
@@ -77,6 +77,7 @@ inline fun <reified T> simpleSerialClassDesc(vararg elements: Pair<String, KSeri
7777
}
7878

7979
@ExperimentalSerializationApi
80+
@Deprecated("Use the standard library buildClassSerialDescriptor function")
8081
@JvmName("simpleSerialClassDescFromSerializer")
8182
inline fun <reified T> simpleSerialClassDesc(
8283
entityAnnotations: List<Annotation>,
@@ -98,6 +99,7 @@ inline fun <reified T> simpleSerialClassDesc(
9899
),
99100
DeprecationLevel.HIDDEN
100101
)
102+
@OptIn(SealedSerializationApi::class)
101103
@ExperimentalSerializationApi
102104
class SimpleSerialClassDescPrimitive(override val kind: PrimitiveKind, name: String) : SerialDescriptor {
103105
override val serialName: String = name
@@ -120,6 +122,7 @@ class SimpleSerialClassDescPrimitive(override val kind: PrimitiveKind, name: Str
120122
* as well, so exported, but not designed for use outside the xmlutil project.
121123
*/
122124
@Deprecated("This class is no longer needed, it can be replaced by buildSerialDescriptor and buildClassSerialDescriptor")
125+
@OptIn(SealedSerializationApi::class)
123126
@ExperimentalSerializationApi
124127
class SimpleSerialClassDesc(
125128
override val kind: SerialKind = StructureKind.CLASS,
@@ -162,12 +165,13 @@ class SimpleSerialClassDesc(
162165
}
163166

164167
@ExperimentalSerializationApi
165-
fun SerialDescriptor.withName(name: String): SerialDescriptor = RenameDesc(this, name)
166-
167-
@ExperimentalSerializationApi
168-
private class RenameDesc(val delegate: SerialDescriptor, override val serialName: String) : SerialDescriptor by delegate
168+
@Deprecated(
169+
"Use the kotlinx.serialization implementation instead",
170+
ReplaceWith("SerialDescriptor(name, this)", "kotlinx.serialization.descriptors.SerialDescriptor")
171+
)
172+
fun SerialDescriptor.withName(name: String): SerialDescriptor = SerialDescriptor(name, this)
169173

170-
abstract class DelegateSerializer<T>(val delegate: KSerializer<T>) : KSerializer<T> {
174+
public abstract class DelegateSerializer<T>(val delegate: KSerializer<T>) : KSerializer<T> {
171175
override val descriptor: SerialDescriptor get() = delegate.descriptor
172176

173177
override fun deserialize(decoder: Decoder): T = delegate.deserialize(decoder)

0 commit comments

Comments
 (0)