diff --git a/CHANGELOG.md b/CHANGELOG.md index 5abe1a574f1..082464fedd5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## 0.5.21 + +* `Versions` + * `Klock`: `2.3.1` -> `2.3.2` +* `Serialization` + * `Typed Serializer`: + * `TypedSerializer` Descriptor serial name has been fixed + ## 0.5.20 * `Repos`: diff --git a/gradle.properties b/gradle.properties index 9463c6c6975..ddf92ed3350 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,7 @@ kotlin_exposed_version=0.33.1 ktor_version=1.6.2 -klockVersion=2.3.1 +klockVersion=2.3.2 github_release_plugin_version=2.2.12 @@ -45,5 +45,5 @@ dokka_version=1.5.0 # Project data group=dev.inmo -version=0.5.20 -android_code_version=61 +version=0.5.21 +android_code_version=62 diff --git a/serialization/typed_serializer/src/commonMain/kotlin/dev/inmo/micro_utils/serialization/typed_serializer/TypedSerializer.kt b/serialization/typed_serializer/src/commonMain/kotlin/dev/inmo/micro_utils/serialization/typed_serializer/TypedSerializer.kt index 9a54292e629..158d22994e5 100644 --- a/serialization/typed_serializer/src/commonMain/kotlin/dev/inmo/micro_utils/serialization/typed_serializer/TypedSerializer.kt +++ b/serialization/typed_serializer/src/commonMain/kotlin/dev/inmo/micro_utils/serialization/typed_serializer/TypedSerializer.kt @@ -8,11 +8,23 @@ import kotlin.reflect.KClass open class TypedSerializer( kClass: KClass, - presetSerializers: Map> = emptyMap() + presetSerializers: Map> = emptyMap(), ) : KSerializer { protected val serializers = presetSerializers.toMutableMap() @InternalSerializationApi - open override val descriptor: SerialDescriptor = buildSerialDescriptor( + override val descriptor: SerialDescriptor = buildSerialDescriptor( + "TypedSerializer", + SerialKind.CONTEXTUAL + ) { + element("type", String.serializer().descriptor) + element("value", ContextualSerializer(kClass).descriptor) + } + @InternalSerializationApi + @Deprecated( + "This descriptor was deprecated due to incorrect serial name. You may use it in case something require it, " + + "but it is strongly recommended to migrate onto new descriptor" + ) + protected val oldDescriptor: SerialDescriptor = buildSerialDescriptor( "TextSourceSerializer", SerialKind.CONTEXTUAL ) {