From 82332207d23d9be47a3cd2b251a953e64ad84453 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 10 Jun 2018 22:39:24 -0400 Subject: [PATCH] Fix proguard issues with ezvcard --- presentation/build.gradle | 8 +++++++- presentation/proguard-rules.pro | 6 ++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/presentation/build.gradle b/presentation/build.gradle index 1fe5f2fe9..2fa99db03 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -113,6 +113,13 @@ dependencies { kapt "com.google.dagger:dagger-android-processor:$dagger_version" compileOnly "javax.annotation:jsr250-api:1.0" + // ezvcard + implementation('com.googlecode.ez-vcard:ez-vcard:0.10.4', { + exclude group: "org.jsoup", module: "jsoup" + exclude group: "org.freemarker", module: "freemarker" + exclude group: "com.fasterxml.jackson.core", module: "jackson-core" + }) + // realm implementation("io.realm:android-adapters:$realm_adapters_version") { transitive = false } kapt "io.realm:realm-annotations:$realm_version" @@ -139,7 +146,6 @@ dependencies { implementation "com.github.chrisbanes:PhotoView:2.0.0" implementation "com.f2prateek.rx.preferences2:rx-preferences:$rx_preferences_version" implementation "com.google.android:flexbox:0.3.1" - implementation 'com.googlecode.ez-vcard:ez-vcard:0.10.4' implementation "com.jakewharton.timber:timber:$timber_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" implementation project(":android-smsmms") diff --git a/presentation/proguard-rules.pro b/presentation/proguard-rules.pro index 698eeab1d..53eb4da5c 100644 --- a/presentation/proguard-rules.pro +++ b/presentation/proguard-rules.pro @@ -5,5 +5,11 @@ -dontwarn android.net.ConnectivityManager -dontwarn android.net.LinkProperties +# ez-vcard +-dontwarn ezvcard.** +-dontwarn org.apache.log.** +-dontwarn org.apache.log4j.** +-dontwarn org.python.core.** + # okio -dontwarn okio.** \ No newline at end of file