Kotlin bump 1 7 (#2)

* Bumped versions
* Adjusted clients
* Adjusted clients for new ktor version
* Adjusted response parsing
* Added fix to handle error object.

README.md

@@ -1,6 +1,6 @@
 # JSON-RPC Kotlin Client 
 
-[![Kotlin](https://img.shields.io/badge/kotlin-1.5.30-blue.svg)](http://kotlinlang.org) 
+[![Kotlin](https://img.shields.io/badge/kotlin-1.7.10-blue.svg)](http://kotlinlang.org) 
 ![badge][badge-android] 
 ![badge][badge-native] 
 ![badge][badge-js]

build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
-    kotlin("multiplatform") version "1.5.30-M1"
-    kotlin("plugin.serialization") version "1.5.30"
+    kotlin("multiplatform") version "1.7.10"
+    kotlin("plugin.serialization") version "1.7.10"
     id("com.android.library")
     id("org.jlleitschuh.gradle.ktlint") version "10.0.0"
     `maven-publish`
@@ -22,7 +22,6 @@ val developerEmail: String by project
 
 repositories {
     google()
-    jcenter()
     mavenCentral()
 }
 
@@ -35,10 +34,13 @@ kotlin {
         publishLibraryVariants("release", "debug")
     }
     ios("ios") {
-        binaries {
-            framework {
-                baseName = "jsonrpc"
-            }
+        binaries.framework {
+            baseName = "jsonrpc"
+        }
+    }
+    iosSimulatorArm64 {
+        binaries.framework {
+            baseName = "jsonrpc"
         }
     }
     js(IR) {
@@ -52,11 +54,11 @@ kotlin {
         val commonMain by getting {
             dependencies {
                 implementation("io.ktor:ktor-client-core:$ktor_version")
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinx_coroutines_version")
-                implementation("io.ktor:ktor-client-serialization:$ktor_version")
+                implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor_version")
                 implementation("io.ktor:ktor-client-logging:$ktor_version")
-                implementation("ch.qos.logback:logback-classic:1.2.5")
-                implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.2.2")
+                implementation("io.ktor:ktor-client-content-negotiation:$ktor_version")
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinx_coroutines_version")
+//                implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.10")
                 implementation("co.touchlab:kermit:$kermit_version")
             }
         }
@@ -68,7 +70,7 @@ kotlin {
         val androidMain by getting {
             dependencies {
                 implementation("io.ktor:ktor-client-android:$ktor_version")
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinx_coroutines_version")
+                //implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinx_coroutines_version")
             }
         }
         val androidTest by getting {
@@ -82,6 +84,12 @@ kotlin {
             }
         }
         val iosTest by getting
+        val iosSimulatorArm64Main by getting
+        iosSimulatorArm64Main.dependsOn(iosMain)
+
+        val iosSimulatorArm64Test by getting
+        iosSimulatorArm64Test.dependsOn(iosTest)
+
         val jsMain by getting {
             dependencies {
                 implementation("io.ktor:ktor-client-js:$ktor_version")

gradle.properties

@@ -7,11 +7,11 @@ org.gradle.jvmargs=-Xmx1536m
 org.gradle.parallel=true
 
 # versions
-project_version=0.0.1
+project_version=0.0.2
 android_build_tools=4.1.3
-kotlin_version=1.5.30-M1
-kotlinx_coroutines_version=1.5.0-native-mt
-ktor_version=1.6.2
+kotlin_version=1.7.10
+kotlinx_coroutines_version=1.6.3-native-mt
+ktor_version=2.1.0
 kermit_version=0.3.0-m1
 
 android_compile_sdk_version=28
@@ -33,3 +33,6 @@ developerId=Reedyuk
 developerName=Andrew Reed
 developerEmail=[email protected]
 developerOrganisationUrl=https://github.com/Reedyuk/
+
+kotlin.native.binary.memoryModel=experimental
+kotlin.native.binary.freezing=disabled