From 6bcddcb330dbe574a7a5172c63abefaf3ca0d5b2 Mon Sep 17 00:00:00 2001 From: Phillip Hsu Date: Tue, 13 Jun 2017 16:13:36 -0700 Subject: [PATCH] Make library AAR buildable with Proguard for release build type. --- bottomsheetpickers/build.gradle | 5 +++++ bottomsheetpickers/proguard-rules.pro | 4 ++++ sample/build.gradle | 3 ++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/bottomsheetpickers/build.gradle b/bottomsheetpickers/build.gradle index 0c4bfc9..b759d2f 100644 --- a/bottomsheetpickers/build.gradle +++ b/bottomsheetpickers/build.gradle @@ -34,6 +34,11 @@ android { versionCode rootProject.ext.versionCode versionName rootProject.ext.versionName vectorDrawables.useSupportLibrary = true + // TODO: If we ever remove the duplicate number pad classes in this library and instead + // import our NumberPadTimePicker library, we can safely remove this line. The remaining + // classes in this library have no issue building with Proguard for release build type, + // so we don't have any exclusion rules to add. + consumerProguardFiles 'proguard-rules.pro' } } diff --git a/bottomsheetpickers/proguard-rules.pro b/bottomsheetpickers/proguard-rules.pro index 6e37b71..820d3dc 100644 --- a/bottomsheetpickers/proguard-rules.pro +++ b/bottomsheetpickers/proguard-rules.pro @@ -15,3 +15,7 @@ #-keepclassmembers class fqcn.of.javascript.interface.for.webview { # public *; #} + +# TODO: If we ever remove the duplicate number pad classes in this library and instead +# import our NumberPadTimePicker library, we can safely remove this line. +-dontwarn com.philliphsu.bottomsheetpickers.time.numberpad.** \ No newline at end of file diff --git a/sample/build.gradle b/sample/build.gradle index eea8545..6bc93b6 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -14,7 +14,8 @@ android { } buildTypes { release { - minifyEnabled false + minifyEnabled true + shrinkResources true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } }