Skip to content

Commit 4af6772

Browse files
committed
Merge remote-tracking branch 'origin/master' into 1.3.3-release
2 parents 984345b + ce8b05f commit 4af6772

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+943
-674
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ Uncomment and modify the last section in case you're serializing classes with na
193193
-if @kotlinx.serialization.Serializable class ** {
194194
static **$* *;
195195
}
196-
-keepclassmembers class <1>$<3> {
196+
-keepclassmembers class <2>$<3> {
197197
kotlinx.serialization.KSerializer serializer(...);
198198
}
199199

core/commonMain/src/kotlinx/serialization/descriptors/SerialDescriptors.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import kotlin.reflect.*
3939
*
4040
* class CustomSerializer<T>(tSerializer: KSerializer<T>): KSerializer<BoxedList<T>> {
4141
* // here we use tSerializer.descriptor because it represents T
42-
* override val descriptor = SerialDescriptor("pkg.BoxedList", CLASS, typeParamSerializer.descriptor) {
42+
* override val descriptor = SerialDescriptor("pkg.BoxedList", CLASS, tSerializer.descriptor) {
4343
* // here we have to wrap it with List first, because property has type List<T>
4444
* element("list", ListSerializer(tSerializer).descriptor) // or listSerialDescriptor(tSerializer.descriptor)
4545
* }

core/commonMain/src/kotlinx/serialization/encoding/Decoding.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,8 @@ public interface CompositeDecoder {
411411
* return descriptor.getElementIndex(nextKey) // getElementIndex can return UNKNOWN_NAME
412412
* }
413413
* ```
414+
*
415+
* If [decodeSequentially] returns `true`, the caller might skip calling this method.
414416
*/
415417
public fun decodeElementIndex(descriptor: SerialDescriptor): Int
416418

0 commit comments

Comments
 (0)