From e5cd8e3a520ca3a81072fbceefe6fc6c80312d21 Mon Sep 17 00:00:00 2001
From: lihenggui <solo8web@gmail.com>
Date: Tue, 10 Dec 2024 11:25:26 -0800
Subject: [PATCH] Upgrade ktorfit to the latest version

---
 core/network/build.gradle.kts | 16 +++-------------
 gradle/libs.versions.toml     |  8 ++++----
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/core/network/build.gradle.kts b/core/network/build.gradle.kts
index 164d1fb3c..74cb07430 100644
--- a/core/network/build.gradle.kts
+++ b/core/network/build.gradle.kts
@@ -20,9 +20,10 @@ plugins {
     alias(libs.plugins.nowinandroid.kmp.library)
     alias(libs.plugins.nowinandroid.android.library.jacoco)
     alias(libs.plugins.nowinandroid.di.koin)
+    alias(libs.plugins.ksp)
     alias(libs.plugins.ktrofit)
     alias(libs.plugins.buildkonfig)
-    id("kotlinx-serialization")
+    alias(libs.plugins.kotlin.serialization)
     id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin")
 }
 
@@ -62,6 +63,7 @@ kotlin {
             implementation(libs.ktorfit.lib)
             implementation(libs.ktorfit.converters.call)
             implementation(libs.ktorfit.converters.flow)
+            implementation(libs.ktorfit.converters.response)
         }
         androidMain.dependencies {
             implementation(libs.ktor.client.android)
@@ -80,15 +82,3 @@ kotlin {
         }
     }
 }
-
-dependencies {
-    add("kspCommonMainMetadata", libs.ktorfit.ksp)
-    add("kspAndroid", libs.ktorfit.ksp)
-//    add("kspWasmJs", libs.ktorfit.ksp)
-    add("kspJvm", libs.ktorfit.ksp)
-    add("kspIosX64", libs.ktorfit.ksp)
-    add("kspIosArm64", libs.ktorfit.ksp)
-    add("kspIosSimulatorArm64", libs.ktorfit.ksp)
-    add("kspMacosX64", libs.ktorfit.ksp)
-    add("kspMacosArm64", libs.ktorfit.ksp)
-}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 90734f8ba..727d0d306 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -28,11 +28,11 @@ androidxWork = "2.10.1"
 coil = "3.0.3"
 dependencyGuard = "0.5.0"
 jacoco = "0.8.7"
-kotlin = "2.0.21"
+kotlin = "2.1.0"
 kotlinxCoroutines = "1.9.0"
 kotlinxDatetime = "0.6.1"
 kotlinxSerializationJson = "1.7.3"
-ksp = "2.0.21-1.0.28"
+ksp = "2.1.0-1.0.29"
 logback = "1.5.12"
 material3adaptive = "1.0.1"
 moduleGraph = "2.7.1"
@@ -54,7 +54,7 @@ kermit = "2.0.4"
 koin = "4.0.0"
 koin-annotations = "1.4.0-RC4"
 ktor = "3.0.1"
-ktrofit = "2.1.0"
+ktrofit = "2.2.0"
 buildKonfig = "0.15.2"
 lifecycle-viewmodel-compose = "2.8.4"
 navigation-compose = "2.8.0-alpha10"
@@ -163,10 +163,10 @@ ktor-client-java = { group = "io.ktor", name = "ktor-client-java", version.ref =
 ktor-client-js = { group = "io.ktor", name = "ktor-client-js", version.ref = "ktor" }
 ktor-client-winhttp = { group = "io.ktor", name = "ktor-client-winhttp", version.ref = "ktor" }
 ktor-serialization-kotlinx-json = { group = "io.ktor", name = "ktor-serialization-kotlinx-json", version.ref = "ktor" }
-ktorfit-ksp = { group = "de.jensklingenberg.ktorfit", name = "ktorfit-ksp", version.ref = "ktrofit" }
 ktorfit-lib = { group = "de.jensklingenberg.ktorfit", name = "ktorfit-lib", version.ref = "ktrofit" }
 ktorfit-converters-flow = { group = "de.jensklingenberg.ktorfit", name = "ktorfit-converters-flow", version.ref = "ktrofit" }
 ktorfit-converters-call = { group = "de.jensklingenberg.ktorfit", name = "ktorfit-converters-call", version.ref = "ktrofit" }
+ktorfit-converters-response = { group = "de.jensklingenberg.ktorfit", name = "ktorfit-converters-response", version.ref = "ktrofit" }
 buildkonfig-gradlePlugin = { group = "com.codingfeline.buildkonfig", name = "buildkonfig-gradle-plugin", version.ref = "buildKonfig" }
 jetbrains-compose-viewmodel = { group = "org.jetbrains.androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycle-viewmodel-compose" }
 jetbrains-compose-navigation = { group = "org.jetbrains.androidx.navigation", name = "navigation-compose", version.ref = "navigation-compose" }