From 6b96b5dbfa3427261ede496b47db7cc4bd791c0d Mon Sep 17 00:00:00 2001
From: Zongle Wang <wangzongler@gmail.com>
Date: Tue, 19 Mar 2024 10:31:11 +0800
Subject: [PATCH] Retrofit 2.10.0 (#4138)

https://github.com/square/retrofit/releases/tag/2.10.0
---
 build.gradle                                                | 5 +++--
 lawnchair/src/app/lawnchair/bugreport/KatbinService.kt      | 2 +-
 lawnchair/src/app/lawnchair/search/data/SearchRequest.kt    | 2 +-
 .../ui/preferences/data/liveinfo/LiveInformationRequest.kt  | 2 +-
 proguard.pro                                                | 6 ------
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index fa96f86dc0..1d97c0b020 100644
--- a/build.gradle
+++ b/build.gradle
@@ -388,8 +388,9 @@ dependencies {
     implementation "com.patrykmichalik.opto:core:$optoVersion"
     implementation "com.patrykmichalik.opto:compose:$optoVersion"
     implementation "androidx.datastore:datastore-preferences:1.0.0"
-    implementation "com.squareup.retrofit2:retrofit:2.9.0"
-    implementation "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0"
+    def retrofitVersion = "2.10.0"
+    implementation "com.squareup.retrofit2:retrofit:$retrofitVersion"
+    implementation "com.squareup.retrofit2:converter-kotlinx-serialization:$retrofitVersion"
 
     def roomVersion = '2.6.1'
     implementation "androidx.room:room-runtime:$roomVersion"
diff --git a/lawnchair/src/app/lawnchair/bugreport/KatbinService.kt b/lawnchair/src/app/lawnchair/bugreport/KatbinService.kt
index c8ebe4e284..43f3661bb1 100644
--- a/lawnchair/src/app/lawnchair/bugreport/KatbinService.kt
+++ b/lawnchair/src/app/lawnchair/bugreport/KatbinService.kt
@@ -1,10 +1,10 @@
 package app.lawnchair.bugreport
 
 import app.lawnchair.util.kotlinxJson
-import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
 import kotlinx.serialization.Serializable
 import okhttp3.MediaType.Companion.toMediaType
 import retrofit2.Retrofit
+import retrofit2.converter.kotlinx.serialization.asConverterFactory
 import retrofit2.create
 import retrofit2.http.Body
 import retrofit2.http.POST
diff --git a/lawnchair/src/app/lawnchair/search/data/SearchRequest.kt b/lawnchair/src/app/lawnchair/search/data/SearchRequest.kt
index e530260b43..8e5c408df4 100644
--- a/lawnchair/src/app/lawnchair/search/data/SearchRequest.kt
+++ b/lawnchair/src/app/lawnchair/search/data/SearchRequest.kt
@@ -16,7 +16,6 @@ import app.lawnchair.util.isHidden
 import app.lawnchair.util.isRegularFile
 import app.lawnchair.util.kotlinxJson
 import app.lawnchair.util.mimeType2Extension
-import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
 import java.lang.reflect.Modifier
 import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.Dispatchers
@@ -30,6 +29,7 @@ import okio.Path.Companion.toPath
 import org.json.JSONArray
 import retrofit2.Response
 import retrofit2.Retrofit
+import retrofit2.converter.kotlinx.serialization.asConverterFactory
 import retrofit2.create
 
 private val retrofit = Retrofit.Builder()
diff --git a/lawnchair/src/app/lawnchair/ui/preferences/data/liveinfo/LiveInformationRequest.kt b/lawnchair/src/app/lawnchair/ui/preferences/data/liveinfo/LiveInformationRequest.kt
index 9bdba5ae0a..ec61e893c3 100644
--- a/lawnchair/src/app/lawnchair/ui/preferences/data/liveinfo/LiveInformationRequest.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/data/liveinfo/LiveInformationRequest.kt
@@ -3,7 +3,6 @@ package app.lawnchair.ui.preferences.data.liveinfo
 import android.util.Log
 import app.lawnchair.ui.preferences.data.liveinfo.model.LiveInformation
 import app.lawnchair.util.kotlinxJson
-import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.json.Json
@@ -11,6 +10,7 @@ import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.ResponseBody
 import retrofit2.Response
 import retrofit2.Retrofit
+import retrofit2.converter.kotlinx.serialization.asConverterFactory
 import retrofit2.create
 
 private val retrofit = Retrofit.Builder()
diff --git a/proguard.pro b/proguard.pro
index 0bf6eb6ae5..b3855f5b58 100644
--- a/proguard.pro
+++ b/proguard.pro
@@ -48,9 +48,3 @@
 
 # TODO: Remove this after the change in https://github.com/ChickenHook/RestrictionBypass/pull/9 has been released.
 -keep class org.chickenhook.restrictionbypass.** { *; }
-
-# TODO: These rules could be removed after Retrofit 2.10.0 released.
-# https://github.com/square/retrofit/blob/ef8d867ffb34b419355a323e11ba89db1904f8c2/retrofit/src/main/resources/META-INF/proguard/retrofit2.pro#L38-L45
--if interface * { @retrofit2.http.* public *** *(...); }
--keep,allowoptimization,allowshrinking,allowobfuscation class <3>
--keep,allowoptimization,allowshrinking,allowobfuscation class kotlin.coroutines.Continuation