diff options
author | Robert Jaros <rjaros@finn.pl> | 2019-01-28 17:54:05 +0100 |
---|---|---|
committer | Robert Jaros <rjaros@finn.pl> | 2019-01-28 17:54:05 +0100 |
commit | 960e60e24734fec82e21144502cf971423df9e62 (patch) | |
tree | 7eeaacd6c084be7db15e46beac1e988674020477 | |
parent | 378b2437bf95e0e01462b702a26bebe7d6a3b185 (diff) | |
download | kvision-960e60e24734fec82e21144502cf971423df9e62.tar.gz kvision-960e60e24734fec82e21144502cf971423df9e62.tar.bz2 kvision-960e60e24734fec82e21144502cf971423df9e62.zip |
Dependencies upgrade (Kotlin 1.3.20 and others).
Fixed deprecations.
-rw-r--r-- | gradle.properties | 10 | ||||
-rw-r--r-- | src/main/kotlin/pl/treksoft/kvision/types/Date.kt | 8 | ||||
-rw-r--r-- | src/main/kotlin/pl/treksoft/kvision/utils/JSON.kt | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/gradle.properties b/gradle.properties index 9b4d8cd8..9395fbf5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,15 +1,15 @@ group=pl.treksoft version=0.0.22 -kotlinVersion=1.3.11 +kotlinVersion=1.3.20 javaVersion=1.8 -coroutinesVersion=1.0.1 -serializationVersion=0.9.1 -frontendPluginVersion=0.0.37 +coroutinesVersion=1.1.1 +serializationVersion=0.10.0 +frontendPluginVersion=0.0.44 dokkaVersion=0.9.17 detektVersion=1.0.0.RC9.2 junitVersion=4.12 joobyVersion=1.5.1 -springBootVersion=2.0.4.RELEASE +springBootVersion=2.1.2.RELEASE pac4jVersion=3.3.0 kweryVersion=0.17 dependencyManagementPluginVersion=1.0.4.RELEASE diff --git a/src/main/kotlin/pl/treksoft/kvision/types/Date.kt b/src/main/kotlin/pl/treksoft/kvision/types/Date.kt index 99511dee..153003ab 100644 --- a/src/main/kotlin/pl/treksoft/kvision/types/Date.kt +++ b/src/main/kotlin/pl/treksoft/kvision/types/Date.kt @@ -59,11 +59,11 @@ actual fun Date.toStringF(format: String): String { object DateSerializer : KSerializer<Date> { override val descriptor: SerialDescriptor = SerialClassDescImpl("kotlin.js.Date") - override fun deserialize(input: Decoder): Date { - return input.decodeString().toDateF(KV_JSON_DATE_FORMAT) + override fun deserialize(decoder: Decoder): Date { + return decoder.decodeString().toDateF(KV_JSON_DATE_FORMAT) } - override fun serialize(output: Encoder, obj: Date) { - output.encodeString(obj.toStringF(KV_JSON_DATE_FORMAT)) + override fun serialize(encoder: Encoder, obj: Date) { + encoder.encodeString(obj.toStringF(KV_JSON_DATE_FORMAT)) } } diff --git a/src/main/kotlin/pl/treksoft/kvision/utils/JSON.kt b/src/main/kotlin/pl/treksoft/kvision/utils/JSON.kt index a826d343..4dc1ccd9 100644 --- a/src/main/kotlin/pl/treksoft/kvision/utils/JSON.kt +++ b/src/main/kotlin/pl/treksoft/kvision/utils/JSON.kt @@ -23,18 +23,18 @@ package pl.treksoft.kvision.utils import kotlinx.serialization.ImplicitReflectionSerializer import kotlinx.serialization.context.SimpleModule -import kotlinx.serialization.json.JSON +import kotlinx.serialization.json.Json import kotlinx.serialization.serializer import pl.treksoft.kvision.types.DateSerializer import kotlin.js.Date object JSON { - val plain = JSON().apply { + val plain = Json().apply { install(SimpleModule(Date::class, DateSerializer)) } - val nonstrict = JSON(strictMode = false).apply { + val nonstrict = Json(strictMode = false).apply { install(SimpleModule(Date::class, DateSerializer)) } |