From 4fcdb6f7280d6976882ea56a6b0927d8c0051e13 Mon Sep 17 00:00:00 2001
From: InsanusMokrassar <ovsyannikov.alexey95@gmail.com>
Date: Wed, 2 Dec 2020 14:08:19 +0600
Subject: [PATCH] update versions

---
 CHANGELOG.md                                    |  6 ++++++
 build.gradle                                    |  9 ++-------
 gradle.properties                               |  8 ++++----
 .../exceptions/TooManyRequestsException.kt      | 17 ++++++++---------
 .../utils/CommonMultivariantStringSerializer.kt |  3 ---
 5 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2456abd..b98ad2d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## 0.6.2
 
+* Versions updates:
+  * `Kotlin`: `1.4.10` -> `1.4.20`
+  * `Kotlin Serialisation`: `1.0.0-RC2` -> `1.0.1`
+  * `Kotlin Coroutines`: `1.3.9` -> `1.4.2`
+  * `Klock`: `1.12.1` -> `2.0.0`
+
 ## 0.6.1
 
 * Versions updates:
diff --git a/build.gradle b/build.gradle
index 9655028..abc8d13 100644
--- a/build.gradle
+++ b/build.gradle
@@ -44,7 +44,7 @@ kotlin {
                 implementation kotlin('stdlib')
 
                 api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
-                api "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlin_serialisation_runtime_version"
+                api "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlin_serialisation_version"
                 api "com.soywiz.korlibs.klock:klock:$klock_version"
                 api "io.ktor:ktor-client-core:$ktor_version"
             }
@@ -55,18 +55,13 @@ kotlin {
                 implementation kotlin('test-annotations-common')
             }
         }
-        jvmMain {
-            dependencies {
-                implementation kotlin('stdlib')
-            }
-        }
         jvmTest {
             dependencies {
                 implementation kotlin('test-junit')
                 implementation "io.ktor:ktor-client-okhttp:$ktor_version"
             }
         }
-        jsMain {
+        jsTest {
             dependencies {
                 implementation kotlin('test-js')
             }
diff --git a/gradle.properties b/gradle.properties
index 3fc8bfd..65b2b06 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,8 +1,8 @@
 kotlin.code.style=official
-kotlin_version=1.4.10
-kotlin_coroutines_version=1.3.9
-kotlin_serialisation_runtime_version=1.0.0-RC2
-klock_version=1.12.1
+kotlin_version=1.4.20
+kotlin_coroutines_version=1.4.2
+kotlin_serialisation_version=1.0.1
+klock_version=2.0.0
 ktor_version=1.4.1
 
 gradle_github_release_plugin_version=2.2.12
diff --git a/src/commonMain/kotlin/com/insanusmokrassar/SauceNaoAPI/exceptions/TooManyRequestsException.kt b/src/commonMain/kotlin/com/insanusmokrassar/SauceNaoAPI/exceptions/TooManyRequestsException.kt
index 8356d2a..d150009 100644
--- a/src/commonMain/kotlin/com/insanusmokrassar/SauceNaoAPI/exceptions/TooManyRequestsException.kt
+++ b/src/commonMain/kotlin/com/insanusmokrassar/SauceNaoAPI/exceptions/TooManyRequestsException.kt
@@ -9,18 +9,17 @@ import io.ktor.http.HttpStatusCode.Companion.TooManyRequests
 import io.ktor.utils.io.errors.IOException
 
 internal suspend fun ClientRequestException.sauceNaoAPIException(): Exception  {
-    val response = response ?: return this
-        return when (response.status) {
-            TooManyRequests -> {
-                val answerContent = response.readText()
-                when {
-                    answerContent.contains("daily limit") -> TooManyRequestsLongException(answerContent)
-                    else -> TooManyRequestsShortException(answerContent)
-                }
+    return when (response.status) {
+        TooManyRequests -> {
+            val answerContent = response.readText()
+            when {
+                answerContent.contains("daily limit") -> TooManyRequestsLongException(answerContent)
+                else -> TooManyRequestsShortException(answerContent)
             }
-            else -> this
         }
+        else -> this
     }
+}
 
 sealed class TooManyRequestsException(message: String, cause: Throwable? = null) : IOException(message, cause) {
     abstract val answerContent: String
diff --git a/src/commonMain/kotlin/com/insanusmokrassar/SauceNaoAPI/utils/CommonMultivariantStringSerializer.kt b/src/commonMain/kotlin/com/insanusmokrassar/SauceNaoAPI/utils/CommonMultivariantStringSerializer.kt
index a531c0d..5f8265b 100644
--- a/src/commonMain/kotlin/com/insanusmokrassar/SauceNaoAPI/utils/CommonMultivariantStringSerializer.kt
+++ b/src/commonMain/kotlin/com/insanusmokrassar/SauceNaoAPI/utils/CommonMultivariantStringSerializer.kt
@@ -7,11 +7,8 @@ import kotlinx.serialization.builtins.serializer
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.json.*
 
-
 @Serializer(String::class)
 object CommonMultivariantStringSerializer : KSerializer<String> by String.serializer() {
-    private val stringArraySerializer = ListSerializer(String.serializer())
-
     override fun deserialize(decoder: Decoder): String {
         return when (val parsed = JsonElement.serializer().deserialize(decoder)) {
             is JsonPrimitive -> parsed.content