Quellcode durchsuchen

Downgrade R8 to avoid extension issues

arkon vor 2 Jahren
Ursprung
Commit
e1e1c20dbe
3 geänderte Dateien mit 6 neuen und 4 gelöschten Zeilen
  1. 1 0
      .github/renovate.json
  2. 1 4
      app/proguard-rules.pro
  3. 4 0
      build.gradle.kts

+ 1 - 0
.github/renovate.json

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

+ 1 - 4
app/proguard-rules.pro

@@ -2,7 +2,7 @@
 
 # Keep common dependencies used in extensions
 -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 kotlinx.coroutines.** { public protected *; }
 -keep,allowoptimization class kotlinx.serialization.** { public protected *; }
@@ -14,9 +14,6 @@
 -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.**
 

+ 4 - 0
build.gradle.kts

@@ -1,5 +1,9 @@
 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)