Merge remote-tracking branch 'origin/master'

nitzanj · nitzanj · commit 2eb7f652701f · 2018-05-30T11:40:32.000+03:00
diff --git a/lib/build.gradle b/lib/build.gradle
@@ -17,6 +17,7 @@ android {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            consumerProguardFiles 'proguard-rules.pro'
         }
     }
 
@@ -135,4 +136,4 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
 artifacts {
     archives javadocJar
     archives sourcesJar
-}
+}
diff --git a/lib/proguard-rules.pro b/lib/proguard-rules.pro
@@ -0,0 +1 @@
+-keep class com.cloudinary.android.*Strategy

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ android {`
`17`	`17`	`release {`
`18`	`18`	`minifyEnabled false`
`19`	`19`	`proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'`
	`20`	`+ consumerProguardFiles 'proguard-rules.pro'`
`20`	`21`	`}`
`21`	`22`	`}`
`22`	`23`
`@@ -135,4 +136,4 @@ task javadocJar(type: Jar, dependsOn: javadoc) {`
`135`	`136`	`artifacts {`
`136`	`137`	`archives javadocJar`
`137`	`138`	`archives sourcesJar`
`138`		`-}`
	`139`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+-keep class com.cloudinary.android.*Strategy`