From 357b4673f8b693104d149a6eb34657d882cc1885 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Sat, 14 May 2022 19:40:08 -0400
Subject: [PATCH] Update to AGP 7.2.0 again

- Disable optimizations on eu.kanade.tachiyomi.source.** classes to avoid access modifications causing mismatches between the app and extensions
- Remove Gson and Kotson Proguard rules, since we don't have those dependencies anymore

(cherry picked from commit bdb55ef8817557e1d4bb4eda1120949ef42a8b54)

# Conflicts:
#	app/proguard-rules.pro
---
 app/proguard-rules.pro        | 3 +--
 gradle/androidx.versions.toml | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 3b71cbafa..d0cd57a42 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -68,6 +68,7 @@
 }
 
 # Keep extension's common dependencies
+-keep class eu.kanade.tachiyomi.source.** { public protected *; } # Avoid access modification
 -keep,allowoptimization class eu.kanade.tachiyomi.** { public protected *; }
 -keep,allowoptimization class androidx.preference.** { *; }
 -keep,allowoptimization class kotlin.** { public protected *; }
@@ -76,8 +77,6 @@
 -keep,allowoptimization class okio.** { public protected *; }
 -keep,allowoptimization class rx.** { public protected *; }
 -keep,allowoptimization class org.jsoup.** { public protected *; }
--keep,allowoptimization class com.google.gson.** { public protected *; }
--keep,allowoptimization class com.github.salomonbrys.kotson.** { public protected *; }
 -keep,allowoptimization class com.squareup.duktape.** { public protected *; }
 -keep,allowoptimization class app.cash.quickjs.** { public protected *; }
 -keep,allowoptimization class uy.kohesive.injekt.** { public protected *; }
diff --git a/gradle/androidx.versions.toml b/gradle/androidx.versions.toml
index b46ef7754..c97377767 100644
--- a/gradle/androidx.versions.toml
+++ b/gradle/androidx.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp_version = "7.1.3"
+agp_version = "7.2.0"
 lifecycle_version = "2.5.0-rc01"
 
 [libraries]