From d3f45c41fdf986de218676b4ad0743abfa2c203a Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 22 Feb 2021 18:37:49 +0600 Subject: [PATCH 1/3] start 0.4.1 --- CHANGELOG.md | 2 ++ gradle.properties | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d3bab17..4fa2ebc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # SDI changelogs +## 0.4.1 + ## 0.4.0 * Fix of [#6](https://github.com/InsanusMokrassar/SDI/issues/6) diff --git a/gradle.properties b/gradle.properties index cdafddb..627983c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,4 +9,4 @@ klassindex_version=4.1.0-rc.1 github_release_plugin_version=2.2.12 group=dev.inmo -version=0.4.0 +version=0.4.1 From c8cae5c941c485ebe86128bb64cecd6b9dc4a748 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 22 Feb 2021 18:38:51 +0600 Subject: [PATCH 2/3] update serialization --- CHANGELOG.md | 2 ++ gradle.properties | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4fa2ebc..2db5885 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## 0.4.1 +* `Serialization`: `1.1.0-RC` -> `1.1.0` + ## 0.4.0 * Fix of [#6](https://github.com/InsanusMokrassar/SDI/issues/6) diff --git a/gradle.properties b/gradle.properties index 627983c..93900c7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.parallel=true kotlin.incremental.multiplatform=true kotlin_version=1.4.30 -kotlin_serialisation_runtime_version=1.1.0-RC +kotlin_serialisation_runtime_version=1.1.0 klassindex_version=4.1.0-rc.1 github_release_plugin_version=2.2.12 From dbd9c1b48483382a778124c1bf7a7fdbc50ffbc8 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 22 Feb 2021 18:42:08 +0600 Subject: [PATCH 3/3] ModuleSerializer now can be instantiated automatically --- CHANGELOG.md | 2 ++ .../kotlin/dev/inmo/sdi/ModuleSerializer.kt | 11 +++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2db5885..4885ce2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ ## 0.4.1 * `Serialization`: `1.1.0-RC` -> `1.1.0` +* `ModuleSerializer` now can be instantiated automatically + ## 0.4.0 diff --git a/src/commonMain/kotlin/dev/inmo/sdi/ModuleSerializer.kt b/src/commonMain/kotlin/dev/inmo/sdi/ModuleSerializer.kt index ee35f16..389081a 100644 --- a/src/commonMain/kotlin/dev/inmo/sdi/ModuleSerializer.kt +++ b/src/commonMain/kotlin/dev/inmo/sdi/ModuleSerializer.kt @@ -94,9 +94,16 @@ internal data class SerializationContext( @Serializer(Module::class) class ModuleSerializer( - private val moduleBuilder: (SerializersModuleBuilder.() -> Unit)? = null, - private vararg val additionalClassesToInclude: KClass<*> + private val additionalClassesToInclude: Iterable>, + private val moduleBuilder: (SerializersModuleBuilder.() -> Unit)? = null ) : KSerializer { + constructor() : this(emptyList()) // to be able to create default instance + + constructor( + moduleBuilder: (SerializersModuleBuilder.() -> Unit)? = null, + vararg additionalClassesToInclude: KClass<*>, + ) : this(additionalClassesToInclude.toList(), moduleBuilder) + private val jsonObjectSerializer = JsonObject.serializer() override val descriptor: SerialDescriptor = jsonObjectSerializer.descriptor