Skip to content

Commit 0b3d401

Browse files
sandwwraithsandwwraith
authored
Update to Kotlin 2.2 (#3031)
Api dump updated because of https://youtrack.jetbrains.com/issue/KT-73954
1 parent bd6689d commit 0b3d401

File tree

8 files changed

+35
-25
lines changed

8 files changed

+35
-25
lines changed

‎core/api/kotlinx-serialization-core.api

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,7 @@ public abstract class kotlinx/serialization/encoding/AbstractDecoder : kotlinx/s
371371
public final fun decodeByteElement (Lkotlinx/serialization/descriptors/SerialDescriptor;I)B
372372
public fun decodeChar ()C
373373
public final fun decodeCharElement (Lkotlinx/serialization/descriptors/SerialDescriptor;I)C
374+
public fun decodeCollectionSize (Lkotlinx/serialization/descriptors/SerialDescriptor;)I
374375
public fun decodeDouble ()D
375376
public final fun decodeDoubleElement (Lkotlinx/serialization/descriptors/SerialDescriptor;I)D
376377
public fun decodeEnum (Lkotlinx/serialization/descriptors/SerialDescriptor;)I
@@ -385,7 +386,10 @@ public abstract class kotlinx/serialization/encoding/AbstractDecoder : kotlinx/s
385386
public fun decodeNotNullMark ()Z
386387
public fun decodeNull ()Ljava/lang/Void;
387388
public final fun decodeNullableSerializableElement (Lkotlinx/serialization/descriptors/SerialDescriptor;ILkotlinx/serialization/DeserializationStrategy;Ljava/lang/Object;)Ljava/lang/Object;
389+
public fun decodeNullableSerializableValue (Lkotlinx/serialization/DeserializationStrategy;)Ljava/lang/Object;
390+
public fun decodeSequentially ()Z
388391
public fun decodeSerializableElement (Lkotlinx/serialization/descriptors/SerialDescriptor;ILkotlinx/serialization/DeserializationStrategy;Ljava/lang/Object;)Ljava/lang/Object;
392+
public fun decodeSerializableValue (Lkotlinx/serialization/DeserializationStrategy;)Ljava/lang/Object;
389393
public fun decodeSerializableValue (Lkotlinx/serialization/DeserializationStrategy;Ljava/lang/Object;)Ljava/lang/Object;
390394
public static synthetic fun decodeSerializableValue$default (Lkotlinx/serialization/encoding/AbstractDecoder;Lkotlinx/serialization/DeserializationStrategy;Ljava/lang/Object;ILjava/lang/Object;)Ljava/lang/Object;
391395
public fun decodeShort ()S
@@ -398,6 +402,7 @@ public abstract class kotlinx/serialization/encoding/AbstractDecoder : kotlinx/s
398402

399403
public abstract class kotlinx/serialization/encoding/AbstractEncoder : kotlinx/serialization/encoding/CompositeEncoder, kotlinx/serialization/encoding/Encoder {
400404
public fun <init> ()V
405+
public fun beginCollection (Lkotlinx/serialization/descriptors/SerialDescriptor;I)Lkotlinx/serialization/encoding/CompositeEncoder;
401406
public fun beginStructure (Lkotlinx/serialization/descriptors/SerialDescriptor;)Lkotlinx/serialization/encoding/CompositeEncoder;
402407
public fun encodeBoolean (Z)V
403408
public final fun encodeBooleanElement (Lkotlinx/serialization/descriptors/SerialDescriptor;IZ)V
@@ -417,15 +422,19 @@ public abstract class kotlinx/serialization/encoding/AbstractEncoder : kotlinx/s
417422
public final fun encodeIntElement (Lkotlinx/serialization/descriptors/SerialDescriptor;II)V
418423
public fun encodeLong (J)V
419424
public final fun encodeLongElement (Lkotlinx/serialization/descriptors/SerialDescriptor;IJ)V
425+
public fun encodeNotNullMark ()V
420426
public fun encodeNull ()V
421427
public fun encodeNullableSerializableElement (Lkotlinx/serialization/descriptors/SerialDescriptor;ILkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)V
428+
public fun encodeNullableSerializableValue (Lkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)V
422429
public fun encodeSerializableElement (Lkotlinx/serialization/descriptors/SerialDescriptor;ILkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)V
430+
public fun encodeSerializableValue (Lkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)V
423431
public fun encodeShort (S)V
424432
public final fun encodeShortElement (Lkotlinx/serialization/descriptors/SerialDescriptor;IS)V
425433
public fun encodeString (Ljava/lang/String;)V
426434
public final fun encodeStringElement (Lkotlinx/serialization/descriptors/SerialDescriptor;ILjava/lang/String;)V
427435
public fun encodeValue (Ljava/lang/Object;)V
428436
public fun endStructure (Lkotlinx/serialization/descriptors/SerialDescriptor;)V
437+
public fun shouldEncodeElementDefault (Lkotlinx/serialization/descriptors/SerialDescriptor;I)Z
429438
}
430439

431440
public abstract interface class kotlinx/serialization/encoding/ChunkedDecoder {
@@ -1004,6 +1013,8 @@ public class kotlinx/serialization/internal/PluginGeneratedSerialDescriptor : ko
10041013
public fun getSerialNames ()Ljava/util/Set;
10051014
public fun hashCode ()I
10061015
public fun isElementOptional (I)Z
1016+
public fun isInline ()Z
1017+
public fun isNullable ()Z
10071018
public final fun pushAnnotation (Ljava/lang/annotation/Annotation;)V
10081019
public final fun pushClassAnnotation (Ljava/lang/annotation/Annotation;)V
10091020
public fun toString ()Ljava/lang/String;
@@ -1094,6 +1105,7 @@ public abstract class kotlinx/serialization/internal/TaggedDecoder : kotlinx/ser
10941105
public final fun decodeByteElement (Lkotlinx/serialization/descriptors/SerialDescriptor;I)B
10951106
public final fun decodeChar ()C
10961107
public final fun decodeCharElement (Lkotlinx/serialization/descriptors/SerialDescriptor;I)C
1108+
public fun decodeCollectionSize (Lkotlinx/serialization/descriptors/SerialDescriptor;)I
10971109
public final fun decodeDouble ()D
10981110
public final fun decodeDoubleElement (Lkotlinx/serialization/descriptors/SerialDescriptor;I)D
10991111
public final fun decodeEnum (Lkotlinx/serialization/descriptors/SerialDescriptor;)I
@@ -1108,7 +1120,10 @@ public abstract class kotlinx/serialization/internal/TaggedDecoder : kotlinx/ser
11081120
public fun decodeNotNullMark ()Z
11091121
public final fun decodeNull ()Ljava/lang/Void;
11101122
public final fun decodeNullableSerializableElement (Lkotlinx/serialization/descriptors/SerialDescriptor;ILkotlinx/serialization/DeserializationStrategy;Ljava/lang/Object;)Ljava/lang/Object;
1123+
public fun decodeNullableSerializableValue (Lkotlinx/serialization/DeserializationStrategy;)Ljava/lang/Object;
1124+
public fun decodeSequentially ()Z
11111125
public final fun decodeSerializableElement (Lkotlinx/serialization/descriptors/SerialDescriptor;ILkotlinx/serialization/DeserializationStrategy;Ljava/lang/Object;)Ljava/lang/Object;
1126+
public fun decodeSerializableValue (Lkotlinx/serialization/DeserializationStrategy;)Ljava/lang/Object;
11121127
protected fun decodeSerializableValue (Lkotlinx/serialization/DeserializationStrategy;Ljava/lang/Object;)Ljava/lang/Object;
11131128
public final fun decodeShort ()S
11141129
public final fun decodeShortElement (Lkotlinx/serialization/descriptors/SerialDescriptor;I)S
@@ -1139,6 +1154,7 @@ public abstract class kotlinx/serialization/internal/TaggedDecoder : kotlinx/ser
11391154

11401155
public abstract class kotlinx/serialization/internal/TaggedEncoder : kotlinx/serialization/encoding/CompositeEncoder, kotlinx/serialization/encoding/Encoder {
11411156
public fun <init> ()V
1157+
public fun beginCollection (Lkotlinx/serialization/descriptors/SerialDescriptor;I)Lkotlinx/serialization/encoding/CompositeEncoder;
11421158
public fun beginStructure (Lkotlinx/serialization/descriptors/SerialDescriptor;)Lkotlinx/serialization/encoding/CompositeEncoder;
11431159
public final fun encodeBoolean (Z)V
11441160
public final fun encodeBooleanElement (Lkotlinx/serialization/descriptors/SerialDescriptor;IZ)V
@@ -1160,7 +1176,9 @@ public abstract class kotlinx/serialization/internal/TaggedEncoder : kotlinx/ser
11601176
public fun encodeNotNullMark ()V
11611177
public fun encodeNull ()V
11621178
public fun encodeNullableSerializableElement (Lkotlinx/serialization/descriptors/SerialDescriptor;ILkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)V
1179+
public fun encodeNullableSerializableValue (Lkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)V
11631180
public fun encodeSerializableElement (Lkotlinx/serialization/descriptors/SerialDescriptor;ILkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)V
1181+
public fun encodeSerializableValue (Lkotlinx/serialization/SerializationStrategy;Ljava/lang/Object;)V
11641182
public final fun encodeShort (S)V
11651183
public final fun encodeShortElement (Lkotlinx/serialization/descriptors/SerialDescriptor;IS)V
11661184
public final fun encodeString (Ljava/lang/String;)V
@@ -1187,6 +1205,7 @@ public abstract class kotlinx/serialization/internal/TaggedEncoder : kotlinx/ser
11871205
protected abstract fun getTag (Lkotlinx/serialization/descriptors/SerialDescriptor;I)Ljava/lang/Object;
11881206
protected final fun popTag ()Ljava/lang/Object;
11891207
protected final fun pushTag (Ljava/lang/Object;)V
1208+
public fun shouldEncodeElementDefault (Lkotlinx/serialization/descriptors/SerialDescriptor;I)Z
11901209
}
11911210

11921211
public final class kotlinx/serialization/internal/TripleSerializer : kotlinx/serialization/KSerializer {
@@ -1333,6 +1352,7 @@ public final class kotlinx/serialization/modules/SerializersModuleBuilder : kotl
13331352
public fun contextual (Lkotlin/reflect/KClass;Lkotlinx/serialization/KSerializer;)V
13341353
public final fun include (Lkotlinx/serialization/modules/SerializersModule;)V
13351354
public fun polymorphic (Lkotlin/reflect/KClass;Lkotlin/reflect/KClass;Lkotlinx/serialization/KSerializer;)V
1355+
public fun polymorphicDefault (Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function1;)V
13361356
public fun polymorphicDefaultDeserializer (Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function1;)V
13371357
public fun polymorphicDefaultSerializer (Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function1;)V
13381358
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
public abstract interface annotation class kotlinx/serialization/cbor/ByteString : java/lang/annotation/Annotation {
22
}
33

4-
public synthetic class kotlinx/serialization/cbor/ByteString$Impl : kotlinx/serialization/cbor/ByteString {
4+
public final synthetic class kotlinx/serialization/cbor/ByteString$Impl : kotlinx/serialization/cbor/ByteString {
55
public fun <init> ()V
66
}
77

@@ -21,7 +21,7 @@ public final class kotlinx/serialization/cbor/Cbor$Default : kotlinx/serializati
2121
public abstract interface annotation class kotlinx/serialization/cbor/CborArray : java/lang/annotation/Annotation {
2222
}
2323

24-
public synthetic class kotlinx/serialization/cbor/CborArray$Impl : kotlinx/serialization/cbor/CborArray {
24+
public final synthetic class kotlinx/serialization/cbor/CborArray$Impl : kotlinx/serialization/cbor/CborArray {
2525
public fun <init> ()V
2626
}
2727

@@ -96,7 +96,7 @@ public abstract interface annotation class kotlinx/serialization/cbor/CborLabel
9696
public abstract fun label ()J
9797
}
9898

99-
public synthetic class kotlinx/serialization/cbor/CborLabel$Impl : kotlinx/serialization/cbor/CborLabel {
99+
public final synthetic class kotlinx/serialization/cbor/CborLabel$Impl : kotlinx/serialization/cbor/CborLabel {
100100
public fun <init> (J)V
101101
public final synthetic fun label ()J
102102
}
@@ -125,7 +125,7 @@ public abstract interface annotation class kotlinx/serialization/cbor/KeyTags :
125125
public abstract fun tags ()[J
126126
}
127127

128-
public synthetic class kotlinx/serialization/cbor/KeyTags$Impl : kotlinx/serialization/cbor/KeyTags {
128+
public final synthetic class kotlinx/serialization/cbor/KeyTags$Impl : kotlinx/serialization/cbor/KeyTags {
129129
public synthetic fun <init> ([JLkotlin/jvm/internal/DefaultConstructorMarker;)V
130130
public final synthetic fun tags ()[J
131131
}
@@ -134,7 +134,7 @@ public abstract interface annotation class kotlinx/serialization/cbor/ObjectTags
134134
public abstract fun tags ()[J
135135
}
136136

137-
public synthetic class kotlinx/serialization/cbor/ObjectTags$Impl : kotlinx/serialization/cbor/ObjectTags {
137+
public final synthetic class kotlinx/serialization/cbor/ObjectTags$Impl : kotlinx/serialization/cbor/ObjectTags {
138138
public synthetic fun <init> ([JLkotlin/jvm/internal/DefaultConstructorMarker;)V
139139
public final synthetic fun tags ()[J
140140
}
@@ -143,7 +143,7 @@ public abstract interface annotation class kotlinx/serialization/cbor/ValueTags
143143
public abstract fun tags ()[J
144144
}
145145

146-
public synthetic class kotlinx/serialization/cbor/ValueTags$Impl : kotlinx/serialization/cbor/ValueTags {
146+
public final synthetic class kotlinx/serialization/cbor/ValueTags$Impl : kotlinx/serialization/cbor/ValueTags {
147147
public synthetic fun <init> ([JLkotlin/jvm/internal/DefaultConstructorMarker;)V
148148
public final synthetic fun tags ()[J
149149
}

‎formats/json/api/kotlinx-serialization-json.api

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public abstract interface annotation class kotlinx/serialization/json/JsonClassD
136136
public abstract fun discriminator ()Ljava/lang/String;
137137
}
138138

139-
public synthetic class kotlinx/serialization/json/JsonClassDiscriminator$Impl : kotlinx/serialization/json/JsonClassDiscriminator {
139+
public final synthetic class kotlinx/serialization/json/JsonClassDiscriminator$Impl : kotlinx/serialization/json/JsonClassDiscriminator {
140140
public fun <init> (Ljava/lang/String;)V
141141
public final synthetic fun discriminator ()Ljava/lang/String;
142142
}
@@ -265,7 +265,7 @@ public final class kotlinx/serialization/json/JsonEncoder$DefaultImpls {
265265
public abstract interface annotation class kotlinx/serialization/json/JsonIgnoreUnknownKeys : java/lang/annotation/Annotation {
266266
}
267267

268-
public synthetic class kotlinx/serialization/json/JsonIgnoreUnknownKeys$Impl : kotlinx/serialization/json/JsonIgnoreUnknownKeys {
268+
public final synthetic class kotlinx/serialization/json/JsonIgnoreUnknownKeys$Impl : kotlinx/serialization/json/JsonIgnoreUnknownKeys {
269269
public fun <init> ()V
270270
}
271271

@@ -278,7 +278,7 @@ public abstract interface annotation class kotlinx/serialization/json/JsonNames
278278
public abstract fun names ()[Ljava/lang/String;
279279
}
280280

281-
public synthetic class kotlinx/serialization/json/JsonNames$Impl : kotlinx/serialization/json/JsonNames {
281+
public final synthetic class kotlinx/serialization/json/JsonNames$Impl : kotlinx/serialization/json/JsonNames {
282282
public fun <init> ([Ljava/lang/String;)V
283283
public final synthetic fun names ()[Ljava/lang/String;
284284
}

‎formats/protobuf/api/kotlinx-serialization-protobuf.api

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,30 +34,30 @@ public abstract interface annotation class kotlinx/serialization/protobuf/ProtoN
3434
public abstract fun number ()I
3535
}
3636

37-
public synthetic class kotlinx/serialization/protobuf/ProtoNumber$Impl : kotlinx/serialization/protobuf/ProtoNumber {
37+
public final synthetic class kotlinx/serialization/protobuf/ProtoNumber$Impl : kotlinx/serialization/protobuf/ProtoNumber {
3838
public fun <init> (I)V
3939
public final synthetic fun number ()I
4040
}
4141

4242
public abstract interface annotation class kotlinx/serialization/protobuf/ProtoOneOf : java/lang/annotation/Annotation {
4343
}
4444

45-
public synthetic class kotlinx/serialization/protobuf/ProtoOneOf$Impl : kotlinx/serialization/protobuf/ProtoOneOf {
45+
public final synthetic class kotlinx/serialization/protobuf/ProtoOneOf$Impl : kotlinx/serialization/protobuf/ProtoOneOf {
4646
public fun <init> ()V
4747
}
4848

4949
public abstract interface annotation class kotlinx/serialization/protobuf/ProtoPacked : java/lang/annotation/Annotation {
5050
}
5151

52-
public synthetic class kotlinx/serialization/protobuf/ProtoPacked$Impl : kotlinx/serialization/protobuf/ProtoPacked {
52+
public final synthetic class kotlinx/serialization/protobuf/ProtoPacked$Impl : kotlinx/serialization/protobuf/ProtoPacked {
5353
public fun <init> ()V
5454
}
5555

5656
public abstract interface annotation class kotlinx/serialization/protobuf/ProtoType : java/lang/annotation/Annotation {
5757
public abstract fun type ()Lkotlinx/serialization/protobuf/ProtoIntegerType;
5858
}
5959

60-
public synthetic class kotlinx/serialization/protobuf/ProtoType$Impl : kotlinx/serialization/protobuf/ProtoType {
60+
public final synthetic class kotlinx/serialization/protobuf/ProtoType$Impl : kotlinx/serialization/protobuf/ProtoType {
6161
public fun <init> (Lkotlinx/serialization/protobuf/ProtoIntegerType;)V
6262
public final synthetic fun type ()Lkotlinx/serialization/protobuf/ProtoIntegerType;
6363
}

‎gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
kotlin = "2.1.20"
2+
kotlin = "2.2.0"
33
kover = "0.8.2"
44
dokka = "2.0.0"
55
knit = "0.5.0"

‎integration-test/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Copyright 2017-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
33
#
44

5-
mainKotlinVersion=2.1.20
5+
mainKotlinVersion=2.2.0
66
mainLibVersion=1.8.2-SNAPSHOT
77

88
kotlin.code.style=official

‎integration-test/kotlin-js-store/yarn.lock

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -461,11 +461,6 @@ to-regex-range@^5.0.1:
461461
dependencies:
462462
is-number "^7.0.0"
463463

464-
[email protected]:
465-
version "5.5.4"
466-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.4.tgz#d9852d6c82bad2d2eda4fd74a5762a8f5909e9ba"
467-
integrity sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==
468-
469464
workerpool@^6.5.1:
470465
version "6.5.1"
471466
resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.5.1.tgz#060f73b39d0caf97c6db64da004cd01b4c099544"

‎kotlin-js-store/yarn.lock

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -456,11 +456,6 @@ to-regex-range@^5.0.1:
456456
dependencies:
457457
is-number "^7.0.0"
458458

459-
[email protected]:
460-
version "5.5.4"
461-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.4.tgz#d9852d6c82bad2d2eda4fd74a5762a8f5909e9ba"
462-
integrity sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==
463-
464459
workerpool@^6.5.1:
465460
version "6.5.1"
466461
resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.5.1.tgz#060f73b39d0caf97c6db64da004cd01b4c099544"

0 commit comments

Comments
 (0)