From 35bc91761ad1f8336f331c6b04cff8bf4d9ae064 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 24 Aug 2020 14:28:34 -0300
Subject: Upgrade to Kotlin 1.4

---
 .../src/main/java/net/taler/merchantlib/MerchantApi.kt        | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'merchant-lib/src/main/java/net/taler/merchantlib/MerchantApi.kt')

diff --git a/merchant-lib/src/main/java/net/taler/merchantlib/MerchantApi.kt b/merchant-lib/src/main/java/net/taler/merchantlib/MerchantApi.kt
index a4ca397..ea5b996 100644
--- a/merchant-lib/src/main/java/net/taler/merchantlib/MerchantApi.kt
+++ b/merchant-lib/src/main/java/net/taler/merchantlib/MerchantApi.kt
@@ -31,7 +31,6 @@ import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonConfiguration
 import net.taler.merchantlib.Response.Companion.response
 
 class MerchantApi(
@@ -116,10 +115,8 @@ fun getDefaultHttpClient(): HttpClient = HttpClient(OkHttp) {
 }
 
 fun getSerializer() = KotlinxSerializer(
-    Json(
-        JsonConfiguration(
-            encodeDefaults = false,
-            ignoreUnknownKeys = true
-        )
-    )
+    Json {
+        encodeDefaults = false
+        ignoreUnknownKeys = true
+    }
 )
-- 
cgit v1.2.3