From 47d49d1e0e0679506b384da681e1aa12bb21020f Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Thu, 3 Dec 2020 13:35:19 +0300 Subject: [PATCH] Minor change to meta serialization descriptors --- build.gradle.kts | 2 +- .../src/commonMain/kotlin/hep/dataforge/meta/MetaSerializer.kt | 2 +- .../commonMain/kotlin/hep/dataforge/values/ValueSerializer.kt | 1 - settings.gradle.kts | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 00f0dd33..6e9893cb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,7 +2,7 @@ plugins { id("ru.mipt.npm.project") } -val dataforgeVersion by extra("0.2.1-dev-1") +val dataforgeVersion by extra("0.2.1-dev-2") val bintrayRepo by extra("dataforge") val githubProject by extra("dataforge-core") diff --git a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/MetaSerializer.kt b/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/MetaSerializer.kt index b20adba8..9bf5560d 100644 --- a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/MetaSerializer.kt +++ b/dataforge-meta/src/commonMain/kotlin/hep/dataforge/meta/MetaSerializer.kt @@ -58,7 +58,7 @@ public object MetaSerializer : KSerializer { MetaItemSerializer//MetaItem.serializer(MetaSerializer) ) - override val descriptor: SerialDescriptor get() = mapSerializer.descriptor + override val descriptor: SerialDescriptor = buildClassSerialDescriptor("Meta") override fun deserialize(decoder: Decoder): Meta { return if (decoder is JsonDecoder) { diff --git a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/values/ValueSerializer.kt b/dataforge-meta/src/commonMain/kotlin/hep/dataforge/values/ValueSerializer.kt index 08b87c18..9dd15b7d 100644 --- a/dataforge-meta/src/commonMain/kotlin/hep/dataforge/values/ValueSerializer.kt +++ b/dataforge-meta/src/commonMain/kotlin/hep/dataforge/values/ValueSerializer.kt @@ -27,7 +27,6 @@ public object ValueSerializer : KSerializer { } } - override fun deserialize(decoder: Decoder): Value { val isList = decoder.decodeBoolean() return if (isList) { diff --git a/settings.gradle.kts b/settings.gradle.kts index 1d15b239..ac734625 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -27,7 +27,7 @@ pluginManagement { include( ":dataforge-meta", ":dataforge-io", -// ":dataforge-io:dataforge-io-yaml", + ":dataforge-io:dataforge-io-yaml", ":dataforge-context", ":dataforge-data", // ":dataforge-output",