From b08235cdd76ce40dacd817fce7cf067c1381c252 Mon Sep 17 00:00:00 2001 From: Yusuke Matsubara Date: Sat, 2 Jul 2016 12:11:37 +0900 Subject: [PATCH 1/2] enable minify --- commons/app/build.gradle | 2 +- commons/app/proguard-rules.txt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 commons/app/proguard-rules.txt diff --git a/commons/app/build.gradle b/commons/app/build.gradle index 1deb3b8fd..54bd5622c 100644 --- a/commons/app/build.gradle +++ b/commons/app/build.gradle @@ -35,7 +35,7 @@ android { buildTypes { release { - minifyEnabled false + minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } } diff --git a/commons/app/proguard-rules.txt b/commons/app/proguard-rules.txt new file mode 100644 index 000000000..430f462f2 --- /dev/null +++ b/commons/app/proguard-rules.txt @@ -0,0 +1,3 @@ +-dontobfuscate +-ignorewarnings + From 9da2a1f6b1a906991ba55181aa2a07522d856cec Mon Sep 17 00:00:00 2001 From: Yusuke Matsubara Date: Sat, 2 Jul 2016 12:52:36 +0900 Subject: [PATCH 2/2] Tighter exceptions in proguard-rules.txt; Update Acra Acra pre-4.7.0 had issues with Android API 23 when Proguard is enabled: https://github.com/ACRA/acra/issues/301 --- commons/app/proguard-rules.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/commons/app/proguard-rules.txt b/commons/app/proguard-rules.txt index 430f462f2..8993107fa 100644 --- a/commons/app/proguard-rules.txt +++ b/commons/app/proguard-rules.txt @@ -1,3 +1,3 @@ -dontobfuscate --ignorewarnings - +-keep class org.apache.http.** { *; } +-dontwarn org.apache.http.** \ No newline at end of file