From 3241092fb36cb20ab2dd981977b24d22647ab0d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Sat, 25 May 2019 11:00:53 -0400
Subject: [PATCH] proguard: preserve ezvcard
Change-Id: Ib2bda59478dfd5f43a4ac18fb3a9ab137b2b7209
---
ring-android/app/build.gradle | 4 ++--
ring-android/app/proguard-rules.pro | 10 ++--------
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/ring-android/app/build.gradle b/ring-android/app/build.gradle
index 99703e848..3d6f03106 100644
--- a/ring-android/app/build.gradle
+++ b/ring-android/app/build.gradle
@@ -8,8 +8,8 @@ android {
defaultConfig {
minSdkVersion 21
targetSdkVersion 28
- versionCode 164
- versionName "20190525-6"
+ versionCode 165
+ versionName "20190525-7"
}
sourceSets {
diff --git a/ring-android/app/proguard-rules.pro b/ring-android/app/proguard-rules.pro
index 4f78caef4..fffa5f32c 100644
--- a/ring-android/app/proguard-rules.pro
+++ b/ring-android/app/proguard-rules.pro
@@ -36,14 +36,8 @@
-dontwarn freemarker.**
# EZVcard
--dontwarn ezvcard.io.json.**
--keep,includedescriptorclasses class ezvcard.io.json.JCardModule { *; }
--keepclassmembers class ezvcard.io.json.JCardModule { *; }
--keep,includedescriptorclasses enum ezvcard.io.json.JCardModule { *; }
--keepclassmembers enum ezvcard.io.json.JCardModule { *; }
--keep,includedescriptorclasses interface ezvcard.io.json.JCardModule { *; }
--keepclassmembers interface ezvcard.io.json.JCardModule { *; }
--keep class ezvcard.property.** { *; }
+-keep,includedescriptorclasses class ezvcard.** { *; }
+-keepclassmembers class ezvcard.** { *; }
# barcodescanner
-keep,includedescriptorclasses class com.journeyapps.barcodescanner.** { *; }
--
GitLab