1
0
mirror of https://github.com/etesync/android synced 2024-12-24 15:38:09 +00:00

build.gradle: bump okhttp3 version.

This commit is contained in:
Tom Hacohen 2019-01-12 12:31:24 +00:00
parent 141c3bccda
commit c259e9bede
2 changed files with 9 additions and 7 deletions

View File

@ -156,7 +156,7 @@ dependencies {
implementation "com.madgag.spongycastle:core:$spongyCastleVersion" implementation "com.madgag.spongycastle:core:$spongyCastleVersion"
implementation "com.madgag.spongycastle:prov:$spongyCastleVersion" implementation "com.madgag.spongycastle:prov:$spongyCastleVersion"
def okhttp3Version = "3.8.0" def okhttp3Version = "3.12.1"
implementation "com.squareup.okhttp3:logging-interceptor:$okhttp3Version" implementation "com.squareup.okhttp3:logging-interceptor:$okhttp3Version"
implementation 'com.google.code.gson:gson:1.7.2' implementation 'com.google.code.gson:gson:1.7.2'

View File

@ -33,12 +33,14 @@
-keep,includedescriptorclasses class net.fortuna.ical4j.** { *; } # keep all model classes (properties/factories, created at runtime) -keep,includedescriptorclasses class net.fortuna.ical4j.** { *; } # keep all model classes (properties/factories, created at runtime)
# okhttp # okhttp
-dontwarn java.nio.file.** # not available on Android # JSR 305 annotations are for embedding nullability information.
-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement -dontwarn javax.annotation.**
-dontnote com.android.org.conscrypt.SSLParametersImpl # A resource is loaded with a relative path so the package of this class must be preserved.
-dontnote org.apache.harmony.xnet.provider.jsse.SSLParametersImpl -keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
-dontnote dalvik.system.CloseGuard # Animal Sniffer compileOnly dependency to ensure APIs are compatible with older versions of Java.
-dontnote sun.security.ssl.SSLContextImpl -dontwarn org.codehaus.mojo.animal_sniffer.*
# OkHttp platform used only on JVM and when Conscrypt dependency is available.
-dontwarn okhttp3.internal.platform.ConscryptPlatform
# DAVdroid + libs # DAVdroid + libs
-keep,includedescriptorclasses class syncadapter.** { *; } # all DAVdroid code and deps are required -keep,includedescriptorclasses class syncadapter.** { *; } # all DAVdroid code and deps are required