From 1df893ba0221b8bbfb438f318389feed73a30c69 Mon Sep 17 00:00:00 2001 From: Daniel Leal Date: Thu, 11 Jan 2018 16:18:45 +0100 Subject: [PATCH] Define proguard rules for 'library-image-loader' in its own file --- app/proguard.pro | 5 ----- library-image-loader/build.gradle | 2 ++ library-image-loader/lib-proguard-rules.pro | 5 +++++ library/build.gradle | 2 -- library/lib-proguard-rules.pro | 1 - 5 files changed, 7 insertions(+), 8 deletions(-) create mode 100644 library-image-loader/lib-proguard-rules.pro delete mode 100644 library/lib-proguard-rules.pro diff --git a/app/proguard.pro b/app/proguard.pro index 9eee5753..e69de29b 100644 --- a/app/proguard.pro +++ b/app/proguard.pro @@ -1,5 +0,0 @@ --dontwarn okhttp3.** --dontwarn okio.** - --keep class com.caverock.androidsvg.** { *; } --dontwarn com.caverock.androidsvg.** \ No newline at end of file diff --git a/library-image-loader/build.gradle b/library-image-loader/build.gradle index 523c835e..a7fd1266 100644 --- a/library-image-loader/build.gradle +++ b/library-image-loader/build.gradle @@ -10,6 +10,8 @@ android { targetSdkVersion TARGET_SDK versionCode 1 versionName version + + consumerProguardFiles 'lib-proguard-rules.pro' } lintOptions { diff --git a/library-image-loader/lib-proguard-rules.pro b/library-image-loader/lib-proguard-rules.pro new file mode 100644 index 00000000..9eee5753 --- /dev/null +++ b/library-image-loader/lib-proguard-rules.pro @@ -0,0 +1,5 @@ +-dontwarn okhttp3.** +-dontwarn okio.** + +-keep class com.caverock.androidsvg.** { *; } +-dontwarn com.caverock.androidsvg.** \ No newline at end of file diff --git a/library/build.gradle b/library/build.gradle index 6929bf08..28d4c12d 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -11,8 +11,6 @@ android { targetSdkVersion TARGET_SDK versionCode 1 versionName version - - consumerProguardFiles 'lib-proguard-rules.pro' } libraryVariants.all { variant -> diff --git a/library/lib-proguard-rules.pro b/library/lib-proguard-rules.pro deleted file mode 100644 index 6aeb39dd..00000000 --- a/library/lib-proguard-rules.pro +++ /dev/null @@ -1 +0,0 @@ --keep class ru.noties.markwon.** { *; } \ No newline at end of file