From 3587feb8fa23ab07be48520d34e5036647e1dd39 Mon Sep 17 00:00:00 2001 From: Jays2Kings Date: Tue, 26 Apr 2022 00:03:20 -0400 Subject: [PATCH] Remove all usage of gson and retrofit We made it! --- app/build.gradle.kts | 5 ----- app/proguard-rules.pro | 1 - app/src/main/java/eu/kanade/tachiyomi/AppModule.kt | 3 --- buildSrc/src/main/kotlin/Dependencies.kt | 3 --- 4 files changed, 12 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 29f8ff97db..96b497126a 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -155,17 +155,12 @@ dependencies { debugImplementation("com.github.ChuckerTeam.Chucker:library:$chuckerVersion") releaseImplementation("com.github.ChuckerTeam.Chucker:library-no-op:$chuckerVersion") - // REST - implementation("com.squareup.retrofit2:retrofit:${Versions.RETROFIT}") - implementation("com.squareup.retrofit2:converter-gson:${Versions.RETROFIT}") - implementation(kotlin("reflect", version = Versions.kotlin)) // JSON val kotlinSerialization = "1.3.2" implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:${kotlinSerialization}") implementation("org.jetbrains.kotlinx:kotlinx-serialization-protobuf:${kotlinSerialization}") - implementation("com.google.code.gson:gson:2.8.7") implementation("com.github.salomonbrys.kotson:kotson:2.5.0") // JavaScript engine diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 089369db4e..38a6dd64a2 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -25,7 +25,6 @@ -dontwarn okhttp3.** -dontwarn okio.** -dontwarn javax.annotation.** --dontwarn retrofit2.Platform$Java8 # RxJava 1.1.0 diff --git a/app/src/main/java/eu/kanade/tachiyomi/AppModule.kt b/app/src/main/java/eu/kanade/tachiyomi/AppModule.kt index 3f1bdb9a8a..b68ef879e1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/AppModule.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/AppModule.kt @@ -2,7 +2,6 @@ package eu.kanade.tachiyomi import android.app.Application import androidx.core.content.ContextCompat -import com.google.gson.Gson import eu.kanade.tachiyomi.data.cache.ChapterCache import eu.kanade.tachiyomi.data.cache.CoverCache import eu.kanade.tachiyomi.data.database.DatabaseHelper @@ -47,8 +46,6 @@ class AppModule(val app: Application) : InjektModule { addSingletonFactory { TrackManager(app) } - addSingletonFactory { Gson() } - addSingletonFactory { Json { ignoreUnknownKeys = true } } addSingletonFactory { ChapterFilter() } diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 28783f4513..90c0d5c728 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -1,7 +1,6 @@ object Versions { const val NUCLEUS = "3.0.0" const val OSS_LICENSE = "17.0.0" - const val RETROFIT = "2.7.2" const val ROBO_ELECTRIC = "3.1.4" const val RX_BINDING = "1.0.1" const val androidAppCompat = "1.1.0" @@ -17,7 +16,6 @@ object Versions { const val firebaseCrashlytics = "17.2.1" const val googleServices = "4.3.3" const val gradleVersions = "0.29.0" - const val gson = "2.8.6" const val injekt = "65b0440" const val junit = "4.13" const val kotlin = "1.6.10" @@ -29,7 +27,6 @@ object Versions { const val okio = "2.10.0" const val photoView = "2.3.0" const val reactiveNetwork = "0.13.0" - const val retrofit = "2.7.2" const val rxAndroid = "1.2.1" const val rxBinding = "1.0.1" const val rxJava = "1.3.8"