From be1aa14b94e435488864aa77d895ad8d93865d7c Mon Sep 17 00:00:00 2001
From: Iván Ávalos <avalos@disroot.org>
Date: Sat, 16 Sep 2023 16:13:33 -0600
Subject: - [shared] Downgrade Kotlin to 1.8.22 due to Native issues - [shared]
 Upgrade Ktor to 2.3.4 and migrate code - [ios] Update view models to use
 @MainActor and Kotlin migrations

---
 shared/build.gradle.kts | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'shared/build.gradle.kts')

diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
index 94b8f09..67acdb8 100644
--- a/shared/build.gradle.kts
+++ b/shared/build.gradle.kts
@@ -5,17 +5,17 @@ plugins {
 }
 
 kotlin {
-    val ktor_version = "1.6.6"
+    val ktor_version = "2.3.4"
     val settings_version = "0.8.1"
 
-    androidTarget()
+    android()
 
     jvmToolchain(17)
     
     listOf(
         iosX64(),
         iosArm64(),
-        //iosSimulatorArm64() sure all ios dependencies support this target
+        iosSimulatorArm64()
     ).forEach {
         it.binaries.framework {
             baseName = "shared"
@@ -27,7 +27,8 @@ kotlin {
             dependencies {
                 implementation("io.ktor:ktor-client-core:$ktor_version")
                 implementation("io.ktor:ktor-client-logging:$ktor_version")
-                implementation("io.ktor:ktor-client-serialization:$ktor_version")
+                implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor_version")
+                implementation("io.ktor:ktor-client-content-negotiation:$ktor_version")
                 implementation("io.insert-koin:koin-core:3.1.4")
                 implementation("ch.qos.logback:logback-classic:1.2.6")
 
@@ -44,14 +45,14 @@ kotlin {
         }
         val iosX64Main by getting
         val iosArm64Main by getting
-        //val iosSimulatorArm64Main by getting
+        val iosSimulatorArm64Main by getting
         val iosMain by creating {
             dependsOn(commonMain)
             iosX64Main.dependsOn(this)
             iosArm64Main.dependsOn(this)
-            //iosSimulatorArm64Main.dependsOn(this)
+            iosSimulatorArm64Main.dependsOn(this)
 			dependencies {
-			    implementation("io.ktor:ktor-client-ios:$ktor_version")
+			    implementation("io.ktor:ktor-client-darwin:$ktor_version")
 			}
         }
     }
-- 
cgit v1.2.3