Merge branch 'dev' into multisite

8 years ago · 971762b081
parent 685f0624eb 53ab9af20f
commit 971762b081
2 changed files with 2 additions and 1 deletions
--- a/Clover/app/build.gradle
+++ b/Clover/app/build.gradle
@ -124,7 +124,7 @@ android {
 }

 dependencies {
-    def supportVersion = '25.4.0'
+    def supportVersion = '26.1.0'

    implementation "com.android.support:support-v13:${supportVersion}"
    implementation "com.android.support:appcompat-v7:${supportVersion}"
--- a/Clover/app/proguard.cfg
+++ b/Clover/app/proguard.cfg
@ -86,6 +86,7 @@

 # OkHttp and LeakCanary
 -dontwarn java.nio.**
+-dontwarn javax.annotation.**
 -dontwarn org.codehaus.mojo.**
 # LeakCanary uses removed method (checks the API level)
 -dontwarn com.squareup.leakcanary.DisplayLeakService