From d71224b40b4c4467f4876ace3505cae8bdf6da8d Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Thu, 26 May 2022 19:41:43 -0400
Subject: [PATCH] Adjust R8 optimization configs to fix extension issues

Related: https://issuetracker.google.com/issues/233779072
---
 app/proguard-android-optimize.txt | 1 -
 app/proguard-rules.pro            | 7 +++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/proguard-android-optimize.txt b/app/proguard-android-optimize.txt
index ad490a86c4..1a85da105a 100644
--- a/app/proguard-android-optimize.txt
+++ b/app/proguard-android-optimize.txt
@@ -1,4 +1,3 @@
--allowaccessmodification
 -dontusemixedcaseclassnames
 -verbose
 
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index ed60b8ed31..b36d3f7d51 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1,11 +1,11 @@
 -dontobfuscate
 
-# Keep extension's common dependencies
--keep class eu.kanade.tachiyomi.source.** { public protected *; } # Avoid access modification
+# Keep common dependencies used in extensions
 -keep,allowoptimization class eu.kanade.tachiyomi.** { public protected *; }
 -keep,allowoptimization class androidx.preference.** { *; }
 -keep,allowoptimization class kotlin.** { public protected *; }
 -keep,allowoptimization class kotlinx.coroutines.** { public protected *; }
+-keep,allowoptimization class kotlinx.serialization.** { public protected *; }
 -keep,allowoptimization class okhttp3.** { public protected *; }
 -keep,allowoptimization class okio.** { public protected *; }
 -keep,allowoptimization class rx.** { public protected *; }
@@ -14,6 +14,9 @@
 -keep,allowoptimization class app.cash.quickjs.** { public protected *; }
 -keep,allowoptimization class uy.kohesive.injekt.** { public protected *; }
 
+# Avoid optimizations, including access modification
+-keep class * { <fields>; <methods>; }
+
 ##---------------Begin: proguard configuration for RxJava 1.x  ----------
 -dontwarn sun.misc.**