From 4a3070265a76d1a236abbcd5682ae753c31cffc8 Mon Sep 17 00:00:00 2001 From: Ivan Iskandar <12537387+ivaniskandar@users.noreply.github.com> Date: Sat, 17 Sep 2022 21:26:02 +0700 Subject: [PATCH] Upgrade AGP 7.3.0 (#8016) --- app/proguard-rules.pro | 9 ++++++++- build.gradle.kts | 4 ---- gradle/androidx.versions.toml | 2 +- source-api/build.gradle.kts | 1 + source-api/consumer-proguard.pro | 5 +++++ 5 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 source-api/consumer-proguard.pro diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index b7ea055e4e..a2f6ee8fe8 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -1,7 +1,6 @@ -dontobfuscate # Keep common dependencies used in extensions --keep,allowoptimization class eu.kanade.tachiyomi.** { public protected *; } -keep,allowoptimization class androidx.preference.** { public protected *; } -keep,allowoptimization class kotlin.** { public protected *; } -keep,allowoptimization class kotlinx.coroutines.** { public protected *; } @@ -13,6 +12,14 @@ -keep,allowoptimization class app.cash.quickjs.** { public protected *; } -keep,allowoptimization class uy.kohesive.injekt.** { public protected *; } +# From extensions-lib +-keep,allowoptimization class eu.kanade.tachiyomi.network.interceptor.RateLimitInterceptorKt { public protected *; } +-keep,allowoptimization class eu.kanade.tachiyomi.network.interceptor.SpecificHostRateLimitInterceptorKt { public protected *; } +-keep,allowoptimization class eu.kanade.tachiyomi.network.NetworkHelper { public protected *; } +-keep,allowoptimization class eu.kanade.tachiyomi.network.OkHttpExtensionsKt { public protected *; } +-keep,allowoptimization class eu.kanade.tachiyomi.network.RequestsKt { public protected *; } +-keep,allowoptimization class eu.kanade.tachiyomi.AppInfo { public protected *; } + ##---------------Begin: proguard configuration for RxJava 1.x ---------- -dontwarn sun.misc.** diff --git a/build.gradle.kts b/build.gradle.kts index 4857f9f9b6..24626c8380 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,9 +1,5 @@ buildscript { dependencies { - // Pinning to older version of R8 due to weird forced optimizations in newer versions in - // version bundled with AGP - // https://mvnrepository.com/artifact/com.android.tools/r8?repo=google - classpath("com.android.tools:r8:3.1.66") classpath(libs.android.shortcut.gradle) classpath(libs.google.services.gradle) classpath(libs.aboutLibraries.gradle) diff --git a/gradle/androidx.versions.toml b/gradle/androidx.versions.toml index 8252e42ad6..0a44c40810 100644 --- a/gradle/androidx.versions.toml +++ b/gradle/androidx.versions.toml @@ -1,5 +1,5 @@ [versions] -agp_version = "7.2.2" +agp_version = "7.3.0" lifecycle_version = "2.5.1" [libraries] diff --git a/source-api/build.gradle.kts b/source-api/build.gradle.kts index 21e5b2951b..89b281543f 100644 --- a/source-api/build.gradle.kts +++ b/source-api/build.gradle.kts @@ -11,6 +11,7 @@ android { defaultConfig { minSdk = AndroidConfig.minSdk targetSdk = AndroidConfig.targetSdk + consumerProguardFile("consumer-proguard.pro") } compileOptions { diff --git a/source-api/consumer-proguard.pro b/source-api/consumer-proguard.pro new file mode 100644 index 0000000000..32647e2faf --- /dev/null +++ b/source-api/consumer-proguard.pro @@ -0,0 +1,5 @@ +-keep,allowoptimization class eu.kanade.tachiyomi.source.model.** { public protected *; } +-keep,allowoptimization class eu.kanade.tachiyomi.source.online.** { public protected *; } +-keep class eu.kanade.tachiyomi.source.** extends eu.kanade.tachiyomi.source.Source { public protected *; } + +-keep,allowoptimization class eu.kanade.tachiyomi.util.JsoupExtensionsKt { public protected *; }