From 94717ee351561ac7f0e5a01badbd2c5ee027b31b Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 17 Aug 2021 10:30:50 +0600 Subject: [PATCH 1/3] start 0.5.21 --- CHANGELOG.md | 2 ++ gradle.properties | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5abe1a574f1..11f6764e911 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## 0.5.21 + ## 0.5.20 * `Repos`: diff --git a/gradle.properties b/gradle.properties index 9463c6c6975..340fba28e7a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 From ef73c24a0c15e7966bb112fafe0f58b1f22757f8 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 17 Aug 2021 10:35:45 +0600 Subject: [PATCH 2/3] fixes in TypedSerializer --- CHANGELOG.md | 4 ++++ .../typed_serializer/TypedSerializer.kt | 16 ++++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 11f6764e911..278461ed165 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## 0.5.21 +* `Serialization` + * `Typed Serializer`: + * `TypedSerializer` Descriptor serial name has been fixed + ## 0.5.20 * `Repos`: 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 ) { From 5749e003771622c4e6b0043e65d7cf9c668d8761 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 17 Aug 2021 10:36:15 +0600 Subject: [PATCH 3/3] update klock --- CHANGELOG.md | 2 ++ gradle.properties | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 278461ed165..082464fedd5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## 0.5.21 +* `Versions` + * `Klock`: `2.3.1` -> `2.3.2` * `Serialization` * `Typed Serializer`: * `TypedSerializer` Descriptor serial name has been fixed diff --git a/gradle.properties b/gradle.properties index 340fba28e7a..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