Skip to content

Commit ee5bf5e

Browse files
authored
Bump Kotlin version to 2.0.20-RC (#2756)
1 parent 2bf6665 commit ee5bf5e

File tree

14 files changed

+25
-40
lines changed

14 files changed

+25
-40
lines changed

core/api/kotlinx-serialization-core.klib.api

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -780,8 +780,6 @@ open class kotlinx.serialization/SerializationException : kotlin/IllegalArgument
780780
}
781781

782782
sealed class <#A: kotlin/Any?, #B: kotlin/Any?, #C: kotlin/Any?, #D: kotlin.collections/MutableMap<#A, #B>> kotlinx.serialization.internal/MapLikeSerializer : kotlinx.serialization.internal/AbstractCollectionSerializer<kotlin.collections/Map.Entry<#A, #B>, #C, #D> { // kotlinx.serialization.internal/MapLikeSerializer|null[0]
783-
constructor <init>(kotlinx.serialization/KSerializer<#A>, kotlinx.serialization/KSerializer<#B>) // kotlinx.serialization.internal/MapLikeSerializer.<init>|<init>(kotlinx.serialization.KSerializer<1:0>;kotlinx.serialization.KSerializer<1:1>){}[0]
784-
785783
abstract val descriptor // kotlinx.serialization.internal/MapLikeSerializer.descriptor|{}descriptor[0]
786784
abstract fun <get-descriptor>(): kotlinx.serialization.descriptors/SerialDescriptor // kotlinx.serialization.internal/MapLikeSerializer.descriptor.<get-descriptor>|<get-descriptor>(){}[0]
787785
final val keySerializer // kotlinx.serialization.internal/MapLikeSerializer.keySerializer|{}keySerializer[0]
@@ -796,8 +794,6 @@ sealed class <#A: kotlin/Any?, #B: kotlin/Any?, #C: kotlin/Any?, #D: kotlin.coll
796794
}
797795

798796
sealed class <#A: kotlin/Any?, #B: kotlin/Any?, #C: kotlin/Any?> kotlinx.serialization.internal/AbstractCollectionSerializer : kotlinx.serialization/KSerializer<#B> { // kotlinx.serialization.internal/AbstractCollectionSerializer|null[0]
799-
constructor <init>() // kotlinx.serialization.internal/AbstractCollectionSerializer.<init>|<init>(){}[0]
800-
801797
abstract fun (#B).collectionIterator(): kotlin.collections/Iterator<#A> // kotlinx.serialization.internal/AbstractCollectionSerializer.collectionIterator|collectionIterator@1:1(){}[0]
802798
abstract fun (#B).collectionSize(): kotlin/Int // kotlinx.serialization.internal/AbstractCollectionSerializer.collectionSize|collectionSize@1:1(){}[0]
803799
abstract fun (#B).toBuilder(): #C // kotlinx.serialization.internal/AbstractCollectionSerializer.toBuilder|toBuilder@1:1(){}[0]
@@ -813,8 +809,6 @@ sealed class <#A: kotlin/Any?, #B: kotlin/Any?, #C: kotlin/Any?> kotlinx.seriali
813809
}
814810

815811
sealed class <#A: kotlin/Any?, #B: kotlin/Any?, #C: kotlin/Any?> kotlinx.serialization.internal/CollectionLikeSerializer : kotlinx.serialization.internal/AbstractCollectionSerializer<#A, #B, #C> { // kotlinx.serialization.internal/CollectionLikeSerializer|null[0]
816-
constructor <init>(kotlinx.serialization/KSerializer<#A>) // kotlinx.serialization.internal/CollectionLikeSerializer.<init>|<init>(kotlinx.serialization.KSerializer<1:0>){}[0]
817-
818812
abstract val descriptor // kotlinx.serialization.internal/CollectionLikeSerializer.descriptor|{}descriptor[0]
819813
abstract fun <get-descriptor>(): kotlinx.serialization.descriptors/SerialDescriptor // kotlinx.serialization.internal/CollectionLikeSerializer.descriptor.<get-descriptor>|<get-descriptor>(){}[0]
820814

@@ -825,8 +819,6 @@ sealed class <#A: kotlin/Any?, #B: kotlin/Any?, #C: kotlin/Any?> kotlinx.seriali
825819
}
826820

827821
sealed class <#A: kotlin/Any?, #B: kotlin/Any?, #C: kotlin/Any?> kotlinx.serialization.internal/KeyValueSerializer : kotlinx.serialization/KSerializer<#C> { // kotlinx.serialization.internal/KeyValueSerializer|null[0]
828-
constructor <init>(kotlinx.serialization/KSerializer<#A>, kotlinx.serialization/KSerializer<#B>) // kotlinx.serialization.internal/KeyValueSerializer.<init>|<init>(kotlinx.serialization.KSerializer<1:0>;kotlinx.serialization.KSerializer<1:1>){}[0]
829-
830822
abstract val key // kotlinx.serialization.internal/KeyValueSerializer.key|@1:2{}key[0]
831823
abstract fun (#C).<get-key>(): #A // kotlinx.serialization.internal/KeyValueSerializer.key.<get-key>|<get-key>@1:2(){}[0]
832824
abstract val value // kotlinx.serialization.internal/KeyValueSerializer.value|@1:2{}value[0]
@@ -842,16 +834,12 @@ sealed class <#A: kotlin/Any?, #B: kotlin/Any?, #C: kotlin/Any?> kotlinx.seriali
842834
}
843835

844836
sealed class kotlinx.serialization.descriptors/PolymorphicKind : kotlinx.serialization.descriptors/SerialKind { // kotlinx.serialization.descriptors/PolymorphicKind|null[0]
845-
constructor <init>() // kotlinx.serialization.descriptors/PolymorphicKind.<init>|<init>(){}[0]
846-
847837
final object OPEN : kotlinx.serialization.descriptors/PolymorphicKind // kotlinx.serialization.descriptors/PolymorphicKind.OPEN|null[0]
848838

849839
final object SEALED : kotlinx.serialization.descriptors/PolymorphicKind // kotlinx.serialization.descriptors/PolymorphicKind.SEALED|null[0]
850840
}
851841

852842
sealed class kotlinx.serialization.descriptors/PrimitiveKind : kotlinx.serialization.descriptors/SerialKind { // kotlinx.serialization.descriptors/PrimitiveKind|null[0]
853-
constructor <init>() // kotlinx.serialization.descriptors/PrimitiveKind.<init>|<init>(){}[0]
854-
855843
final object BOOLEAN : kotlinx.serialization.descriptors/PrimitiveKind // kotlinx.serialization.descriptors/PrimitiveKind.BOOLEAN|null[0]
856844

857845
final object BYTE : kotlinx.serialization.descriptors/PrimitiveKind // kotlinx.serialization.descriptors/PrimitiveKind.BYTE|null[0]
@@ -872,8 +860,6 @@ sealed class kotlinx.serialization.descriptors/PrimitiveKind : kotlinx.serializa
872860
}
873861

874862
sealed class kotlinx.serialization.descriptors/SerialKind { // kotlinx.serialization.descriptors/SerialKind|null[0]
875-
constructor <init>() // kotlinx.serialization.descriptors/SerialKind.<init>|<init>(){}[0]
876-
877863
open fun hashCode(): kotlin/Int // kotlinx.serialization.descriptors/SerialKind.hashCode|hashCode(){}[0]
878864
open fun toString(): kotlin/String // kotlinx.serialization.descriptors/SerialKind.toString|toString(){}[0]
879865

@@ -883,8 +869,6 @@ sealed class kotlinx.serialization.descriptors/SerialKind { // kotlinx.serializa
883869
}
884870

885871
sealed class kotlinx.serialization.descriptors/StructureKind : kotlinx.serialization.descriptors/SerialKind { // kotlinx.serialization.descriptors/StructureKind|null[0]
886-
constructor <init>() // kotlinx.serialization.descriptors/StructureKind.<init>|<init>(){}[0]
887-
888872
final object CLASS : kotlinx.serialization.descriptors/StructureKind // kotlinx.serialization.descriptors/StructureKind.CLASS|null[0]
889873

890874
final object LIST : kotlinx.serialization.descriptors/StructureKind // kotlinx.serialization.descriptors/StructureKind.LIST|null[0]
@@ -895,8 +879,6 @@ sealed class kotlinx.serialization.descriptors/StructureKind : kotlinx.serializa
895879
}
896880

897881
sealed class kotlinx.serialization.modules/SerializersModule { // kotlinx.serialization.modules/SerializersModule|null[0]
898-
constructor <init>() // kotlinx.serialization.modules/SerializersModule.<init>|<init>(){}[0]
899-
900882
abstract fun <#A1: kotlin/Any> getContextual(kotlin.reflect/KClass<#A1>, kotlin.collections/List<kotlinx.serialization/KSerializer<*>> = ...): kotlinx.serialization/KSerializer<#A1>? // kotlinx.serialization.modules/SerializersModule.getContextual|getContextual(kotlin.reflect.KClass<0:0>;kotlin.collections.List<kotlinx.serialization.KSerializer<*>>){0§<kotlin.Any>}[0]
901883
abstract fun <#A1: kotlin/Any> getPolymorphic(kotlin.reflect/KClass<in #A1>, #A1): kotlinx.serialization/SerializationStrategy<#A1>? // kotlinx.serialization.modules/SerializersModule.getPolymorphic|getPolymorphic(kotlin.reflect.KClass<in|0:0>;0:0){0§<kotlin.Any>}[0]
902884
abstract fun <#A1: kotlin/Any> getPolymorphic(kotlin.reflect/KClass<in #A1>, kotlin/String?): kotlinx.serialization/DeserializationStrategy<#A1>? // kotlinx.serialization.modules/SerializersModule.getPolymorphic|getPolymorphic(kotlin.reflect.KClass<in|0:0>;kotlin.String?){0§<kotlin.Any>}[0]

core/jvmTest/src/kotlinx/serialization/InterfaceContextualSerializerTestJvm.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ class InterfaceContextualSerializerTestJvm {
3838
assertEquals(PolymorphicKind.OPEN, serializer(typeTokenOf<JApiError>()).descriptor.kind)
3939
}
4040

41+
@Suppress("UNCHECKED_CAST")
4142
@Test
4243
fun testContextual() {
4344
val module = serializersModuleOf(JApiError::class, MyApiErrorSerializer)

core/jvmTest/src/kotlinx/serialization/features/SerializerJvmSpecificTest.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@ class SerializerJvmSpecificTest {
1919

2020
interface ImplicitInterface
2121

22+
@Suppress("SERIALIZER_TYPE_INCOMPATIBLE")
2223
@Serializable(with = PolymorphicSerializer::class)
2324
interface ExplicitInterface
2425

26+
@Suppress("SERIALIZER_TYPE_INCOMPATIBLE")
2527
@Serializable
2628
class Holder(
2729
val iif: ImplicitInterface,

formats/cbor/api/kotlinx-serialization-cbor.klib.api

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,6 @@ final class kotlinx.serialization.cbor/CborConfiguration { // kotlinx.serializat
119119
}
120120

121121
sealed class kotlinx.serialization.cbor/Cbor : kotlinx.serialization/BinaryFormat { // kotlinx.serialization.cbor/Cbor|null[0]
122-
constructor <init>(kotlinx.serialization.cbor/CborConfiguration, kotlinx.serialization.modules/SerializersModule) // kotlinx.serialization.cbor/Cbor.<init>|<init>(kotlinx.serialization.cbor.CborConfiguration;kotlinx.serialization.modules.SerializersModule){}[0]
123-
124122
final val configuration // kotlinx.serialization.cbor/Cbor.configuration|{}configuration[0]
125123
final fun <get-configuration>(): kotlinx.serialization.cbor/CborConfiguration // kotlinx.serialization.cbor/Cbor.configuration.<get-configuration>|<get-configuration>(){}[0]
126124
open val serializersModule // kotlinx.serialization.cbor/Cbor.serializersModule|{}serializersModule[0]

formats/json-tests/commonTest/src/kotlinx/serialization/features/ContextAndPolymorphicTest.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,11 @@ class ContextAndPolymorphicTest {
129129
assertEquals("BinaryPayload", resolvedToBinary.serialName)
130130
}
131131

132+
private val jsonArrayWithDefaults = Json { useArrayPolymorphism = true; encodeDefaults = true }
133+
132134
@Test
133135
fun testContextualSerializerUsesDefaultIfModuleIsEmpty() {
134-
val s = Json { useArrayPolymorphism = true; encodeDefaults = true }.encodeToString(EnhancedData.serializer(), value)
136+
val s = jsonArrayWithDefaults.encodeToString(EnhancedData.serializer(), value)
135137
assertEquals("""{"data":{"a":100500,"b":42},"stringPayload":{"s":"string"},"binaryPayload":"62696E617279"}""", s)
136138
}
137139
}

formats/json-tests/commonTest/src/kotlinx/serialization/features/UseSerializersTest.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,11 @@ data class Carrier2(
2121
)
2222

2323
class UseSerializersTest {
24+
private val jsonWithDefaults = Json { encodeDefaults = true }
25+
2426
@Test
2527
fun testOnFile() {
26-
val str = Json { encodeDefaults = true }.encodeToString(
28+
val str = jsonWithDefaults.encodeToString(
2729
Carrier2.serializer(),
2830
Carrier2(IntHolder(42), 2, 2, IntHolder(42))
2931
)

formats/json-tests/commonTest/src/kotlinx/serialization/json/JsonCoerceInputValuesTest.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ class JsonCoerceInputValuesTest : JsonTestBase() {
4949
isLenient = true
5050
}
5151

52+
private val jsonNonLenient = Json(json) { isLenient = false }
53+
54+
5255
private fun <T> doTest(inputs: List<String>, expected: T, serializer: KSerializer<T>) {
5356
for (input in inputs) {
5457
parametrizedTest(json) {
@@ -84,7 +87,7 @@ class JsonCoerceInputValuesTest : JsonTestBase() {
8487
json.decodeFromString(WithEnum.serializer(), """{"e":{"x":"definitely not a valid enum value"}}""")
8588
}
8689
assertFailsWithSerial("JsonDecodingException") { // test user still sees exception on missing quotes
87-
Json(json) { isLenient = false }.decodeFromString(WithEnum.serializer(), """{"e":unknown_value}""")
90+
jsonNonLenient.decodeFromString(WithEnum.serializer(), """{"e":unknown_value}""")
8891
}
8992
}
9093

formats/json-tests/commonTest/src/kotlinx/serialization/json/JsonEncoderDecoderRecursiveTest.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,12 @@ class JsonEncoderDecoderRecursiveTest : JsonTestBase() {
4747
assertEquals(inputDataString, ev)
4848
}
4949

50+
private val jsonPretty = Json { prettyPrint = true }
51+
5052
@Test
5153
fun testWriteDataStringIndented() = parametrizedTest { jsonTestingMode ->
5254
val outputData = Event(0, Either.Right(Payload(42, 43, "Hello world")), 1000)
53-
val ev = Json { prettyPrint = true }.encodeToString(Event.serializer(), outputData, jsonTestingMode)
55+
val ev = jsonPretty.encodeToString(Event.serializer(), outputData, jsonTestingMode)
5456
assertEquals("""{
5557
| "id": 0,
5658
| "payload": {

formats/json-tests/commonTest/src/kotlinx/serialization/json/polymorphic/JsonPolymorphismExceptionTest.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,9 @@ class JsonPolymorphismExceptionTest : JsonTestBase() {
3131
}
3232
}
3333

34+
val json = Json { serializersModule = serialModule }
3435
assertFailsWithSerial("JsonDecodingException") {
35-
Json { serializersModule = serialModule }.decodeFromString(Base.serializer(), """{"type":"derived","nested":null}""", jsonTestingMode)
36+
json.decodeFromString(Base.serializer(), """{"type":"derived","nested":null}""", jsonTestingMode)
3637
}
3738
}
3839

@@ -44,8 +45,9 @@ class JsonPolymorphismExceptionTest : JsonTestBase() {
4445
}
4546
}
4647

48+
val json = Json { serializersModule = serialModule }
4749
assertFailsWithSerial("JsonDecodingException") {
48-
Json { serializersModule = serialModule }.decodeFromString(Base.serializer(), """{"nested":{}}""", jsonTestingMode)
50+
json.decodeFromString(Base.serializer(), """{"nested":{}}""", jsonTestingMode)
4951
}
5052
}
5153
}

formats/json-tests/jvmTest/src/kotlinx/serialization/JvmMissingFieldsExceptionTest.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,12 @@ class JvmMissingFieldsExceptionTest {
9898
subclass(ChildA::class)
9999
}
100100
}
101+
val json = Json {
102+
serializersModule = module
103+
}
101104

102105
assertFailsWithMessages(listOf("p2", "c3")) {
103-
Json {
104-
serializersModule = module
105-
}.decodeFromString<PolymorphicWrapper>("""{"nested": {"type": "a", "p1": 1, "c1": 11}}""")
106+
json.decodeFromString<PolymorphicWrapper>("""{"nested": {"type": "a", "p1": 1, "c1": 11}}""")
106107
}
107108
}
108109

0 commit comments

Comments
 (0)