From a6a9b1354562a684257fdf9f2e6a1bc03dd75128 Mon Sep 17 00:00:00 2001 From: len Date: Wed, 6 Apr 2016 21:31:35 +0200 Subject: [PATCH] Fix proguard rules --- app/proguard-rules.pro | 55 ++++++------------------------------------ 1 file changed, 8 insertions(+), 47 deletions(-) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 0bbdd0063f..3b5677c1e7 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -2,9 +2,6 @@ -keep class eu.kanade.tachiyomi.injection.** { *; } -# Retrolambda --dontwarn java.lang.invoke.* - # OkHttp -keepattributes Signature -keepattributes *Annotation* @@ -19,25 +16,6 @@ -dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement -dontwarn okio.** -# ButterKnife 7 --keep class butterknife.** { *; } --dontwarn butterknife.internal.** --keep class **$$ViewBinder { *; } - --keepclasseswithmembernames class * { - @butterknife.* ; -} - --keepclasseswithmembernames class * { - @butterknife.* ; -} - -#Easy-Adapter v1.5.0 --keepattributes *Annotation* --keepclassmembers class * extends uk.co.ribot.easyadapter.ItemViewHolder { - public (...); - } - # Glide specific rules # # https://github.com/bumptech/glide -keep public class * implements com.bumptech.glide.module.GlideModule @@ -47,7 +25,6 @@ } # RxJava 1.1.0 - -dontwarn sun.misc.** -keepclassmembers class rx.internal.util.unsafe.*ArrayQueue*Field* { @@ -63,26 +40,17 @@ rx.internal.util.atomic.LinkedQueueNode consumerNode; } -# Retrofit 1.X +# Retrofit 2.X +## https://square.github.io/retrofit/ ## --keep class com.squareup.okhttp.** { *; } --keep class retrofit.** { *; } --keep interface com.squareup.okhttp.** { *; } - --dontwarn com.squareup.okhttp.** --dontwarn okio.** --dontwarn retrofit.** --dontwarn rx.** - --keepclasseswithmembers class * { - @retrofit.http.* ; -} - -# If in your rest service interface you use methods with Callback argument. +-dontwarn retrofit2.** +-keep class retrofit2.** { *; } +-keepattributes Signature -keepattributes Exceptions -# If your rest service methods throw custom exceptions, because you've defined an ErrorHandler. --keepattributes Signature +-keepclasseswithmembers class * { + @retrofit2.http.* ; +} # AppCombat -keep public class android.support.v7.widget.** { *; } @@ -93,13 +61,6 @@ public (android.content.Context); } -# Icepick --dontwarn icepick.** --keep class **$$Icepick { *; } --keepclasseswithmembernames class * { - @icepick.* ; -} - ## GSON 2.2.4 specific rules ## # Gson uses generic type information stored in a class file when working with fields. Proguard