From d7835e4082706bdec18a69c6819f87d15ad08e27 Mon Sep 17 00:00:00 2001
From: "Thomas W." <thomasdewitt@outlook.com>
Date: Thu, 30 Jan 2025 20:30:39 +0100
Subject: [PATCH] chore: use square kotlinx serialization converter (#7051)

---
 app/build.gradle.kts                                           | 2 +-
 app/src/main/java/com/github/libretube/api/RetrofitInstance.kt | 2 +-
 gradle/libs.versions.toml                                      | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 528518992..9193c4634 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -128,7 +128,7 @@ dependencies {
     implementation(libs.logging.interceptor)
     implementation(libs.kotlinx.serialization)
     implementation(libs.kotlinx.datetime)
-    implementation(libs.kotlinx.serialization.retrofit)
+    implementation(libs.converter.kotlinx.serialization)
 
     /* NewPipe Extractor */
     implementation(libs.newpipeextractor)
diff --git a/app/src/main/java/com/github/libretube/api/RetrofitInstance.kt b/app/src/main/java/com/github/libretube/api/RetrofitInstance.kt
index 9d10f0782..2fd527bcc 100644
--- a/app/src/main/java/com/github/libretube/api/RetrofitInstance.kt
+++ b/app/src/main/java/com/github/libretube/api/RetrofitInstance.kt
@@ -3,11 +3,11 @@ package com.github.libretube.api
 import com.github.libretube.BuildConfig
 import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.helpers.PreferenceHelper
-import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
+import retrofit2.converter.kotlinx.serialization.asConverterFactory
 import retrofit2.create
 
 object RetrofitInstance {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 12c40347d..3cf08b72a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -21,7 +21,6 @@ coil = "2.7.0"
 room = "2.6.1"
 kotlinxSerialization = "1.6.3"
 kotlinxDatetime = "0.6.1"
-kotlinxRetrofit = "1.0.0"
 media = "1.7.0"
 media3 = "1.4.1"
 activity = "1.9.3"
@@ -61,6 +60,7 @@ androidx-media3-session = { group="androidx.media3", name="media3-session", vers
 androidx-media3-ui = { group="androidx.media3", name="media3-ui", version.ref="media3" }
 newpipeextractor = { module = "com.github.teamnewpipe:NewPipeExtractor", version.ref = "newpipeextractor" }
 square-retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" }
+converter-kotlinx-serialization = { group = "com.squareup.retrofit2", name = "converter-kotlinx-serialization", version.ref = "retrofit" }
 desugaring = { group = "com.android.tools", name = "desugar_jdk_libs_nio", version.ref = "desugaring" }
 coil = { group = "io.coil-kt", name = "coil", version.ref="coil" }
 lifecycle-viewmodel = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "lifecycle" }
@@ -71,7 +71,6 @@ room = { group = "androidx.room", name="room-ktx", version.ref = "room" }
 room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
 kotlinx-serialization = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerialization" }
 kotlinx-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", version.ref = "kotlinxDatetime" }
-kotlinx-serialization-retrofit = { group = "com.jakewharton.retrofit", name = "retrofit2-kotlinx-serialization-converter", version.ref = "kotlinxRetrofit" }
 androidx-uiautomator = { group = "androidx.test.uiautomator", name = "uiautomator", version.ref = "uiautomator" }
 androidx-benchmark-macro-junit4 = { group = "androidx.benchmark", name = "benchmark-macro-junit4", version.ref = "benchmarkMacroJunit4" }
 androidx-profileinstaller = { group = "androidx.profileinstaller", name = "profileinstaller", version.ref = "profileinstaller" }