Downgrade R8 to avoid extension issues

This commit is contained in:
arkon 2022-05-26 22:33:18 -04:00
parent b0360b83d4
commit e1e1c20dbe
3 changed files with 6 additions and 4 deletions

View file

@ -8,6 +8,7 @@
"androidx.work:work-runtime-ktx", "androidx.work:work-runtime-ktx",
"info.android15.nucleus:nucleus-support-v7", "info.android15.nucleus:nucleus-support-v7",
"info.android15.nucleus:nucleus", "info.android15.nucleus:nucleus",
"com.android.tools:r8",
"com.google.guava:guava" "com.google.guava:guava"
] ]
} }

View file

@ -2,7 +2,7 @@
# Keep common dependencies used in extensions # Keep common dependencies used in extensions
-keep,allowoptimization class eu.kanade.tachiyomi.** { public protected *; } -keep,allowoptimization class eu.kanade.tachiyomi.** { public protected *; }
-keep,allowoptimization class androidx.preference.** { *; } -keep,allowoptimization class androidx.preference.** { public protected *; }
-keep,allowoptimization class kotlin.** { public protected *; } -keep,allowoptimization class kotlin.** { public protected *; }
-keep,allowoptimization class kotlinx.coroutines.** { public protected *; } -keep,allowoptimization class kotlinx.coroutines.** { public protected *; }
-keep,allowoptimization class kotlinx.serialization.** { public protected *; } -keep,allowoptimization class kotlinx.serialization.** { public protected *; }
@ -14,9 +14,6 @@
-keep,allowoptimization class app.cash.quickjs.** { public protected *; } -keep,allowoptimization class app.cash.quickjs.** { public protected *; }
-keep,allowoptimization class uy.kohesive.injekt.** { 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 ---------- ##---------------Begin: proguard configuration for RxJava 1.x ----------
-dontwarn sun.misc.** -dontwarn sun.misc.**

View file

@ -1,5 +1,9 @@
buildscript { buildscript {
dependencies { 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.android.shortcut.gradle)
classpath(libs.google.services.gradle) classpath(libs.google.services.gradle)
classpath(libs.aboutLibraries.gradle) classpath(libs.aboutLibraries.gradle)