From 960e60e24734fec82e21144502cf971423df9e62 Mon Sep 17 00:00:00 2001
From: Robert Jaros <rjaros@finn.pl>
Date: Mon, 28 Jan 2019 17:54:05 +0100
Subject: Dependencies upgrade (Kotlin 1.3.20 and others). Fixed deprecations.

---
 src/main/kotlin/pl/treksoft/kvision/types/Date.kt | 8 ++++----
 src/main/kotlin/pl/treksoft/kvision/utils/JSON.kt | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/main/kotlin')

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))
     }
 
-- 
cgit