From bdb55ef8817557e1d4bb4eda1120949ef42a8b54 Mon Sep 17 00:00:00 2001 From: arkon 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 --- app/proguard-rules.pro | 27 +-------------------------- gradle/androidx.versions.toml | 2 +- 2 files changed, 2 insertions(+), 27 deletions(-) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 62c68321a9..ed60b8ed31 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -1,6 +1,7 @@ -dontobfuscate # 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 *; } @@ -9,8 +10,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 *; } @@ -34,30 +33,6 @@ -dontnote rx.internal.util.PlatformDependent ##---------------End: proguard configuration for RxJava 1.x ---------- -##---------------Begin: proguard configuration for Gson ---------- -# Gson uses generic type information stored in a class file when working with fields. Proguard -# removes such information by default, so configure it to keep all of it. --keepattributes Signature - -# For using GSON @Expose annotation --keepattributes *Annotation* - -# Gson specific classes --dontwarn sun.misc.** - -# Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory, -# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter) --keep class * extends com.google.gson.TypeAdapter --keep class * implements com.google.gson.TypeAdapterFactory --keep class * implements com.google.gson.JsonSerializer --keep class * implements com.google.gson.JsonDeserializer - -# Prevent R8 from leaving Data object members always null --keepclassmembers,allowobfuscation class * { - @com.google.gson.annotations.SerializedName ; -} -##---------------End: proguard configuration for Gson ---------- - ##---------------Begin: proguard configuration for kotlinx.serialization ---------- -keepattributes *Annotation*, InnerClasses -dontnote kotlinx.serialization.AnnotationsKt # core serialization annotations diff --git a/gradle/androidx.versions.toml b/gradle/androidx.versions.toml index b46ef77548..c973777671 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]