Merge branch 'connyduck-prod-build-fixes'

app/build.gradle

@@ -26,6 +26,11 @@ android {
     lintOptions {
         disable 'MissingTranslation'
     }
+    packagingOptions { //remove metadata files of jsoup library from final build
+        exclude 'META-INF/CHANGES'
+        exclude 'META-INF/LICENSE'
+        exclude 'META-INF/README.md'
+    }
 }
 
 ext.supportLibraryVersion = '26.0.0'

app/proguard-rules.pro

@@ -18,10 +18,16 @@
 
 ## for okhttp
 -dontwarn okio.**
+-dontwarn javax.annotation.Nullable
+-dontwarn javax.annotation.ParametersAreNonnullByDefault
 
 ## for picasso
 -dontwarn com.squareup.okhttp.**
 
+##for keep
+-dontwarn android.arch.util.paging.CountedDataSource
+-dontwarn android.arch.persistence.room.paging.LimitOffsetDataSource
+
 ## for retrofit
 -dontwarn retrofit2.**
 -keep class retrofit2.** { *; }
@@ -45,13 +51,13 @@
 -keepattributes SourceFile,LineNumberTable
 
 # remove all logging from production apk
-#-assumenosideeffects class android.util.Log {
-#    public static *** getStackTraceString(...);
-#    public static *** d(...);
-#    public static *** w(...);
-#    public static *** v(...);
-#    public static *** i(...);
-#}
+-assumenosideeffects class android.util.Log {
+    public static *** getStackTraceString(...);
+    public static *** d(...);
+    public static *** w(...);
+    public static *** v(...);
+    public static *** i(...);
+}
 
 # for jsoup
 -keep public class org.jsoup.** {