Merge branch 'dev' into multisite

multisite
Floens 8 years ago
commit 971762b081
  1. 2
      Clover/app/build.gradle
  2. 1
      Clover/app/proguard.cfg

@ -124,7 +124,7 @@ android {
} }
dependencies { dependencies {
def supportVersion = '25.4.0' def supportVersion = '26.1.0'
implementation "com.android.support:support-v13:${supportVersion}" implementation "com.android.support:support-v13:${supportVersion}"
implementation "com.android.support:appcompat-v7:${supportVersion}" implementation "com.android.support:appcompat-v7:${supportVersion}"

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

Loading…
Cancel
Save