Using default proguard file in combination with custom (#329)

e7mac · web-flow · commit 03ad95d3a584 · 2019-02-06T17:06:00.000-08:00
diff --git a/AndroidSDKCore/build.gradle b/AndroidSDKCore/build.gradle
@@ -25,7 +25,7 @@ android {
     }
     buildTypes {
         release {
-            proguardFiles PROGUARD_FILES
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), PROGUARD_FILES
         }
     }
 }
diff --git a/AndroidSDKFcm/build.gradle b/AndroidSDKFcm/build.gradle
@@ -16,7 +16,7 @@ android {
     buildTypes {
         release {
             minifyEnabled true
-            proguardFiles 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 }
diff --git a/AndroidSDKGcm/build.gradle b/AndroidSDKGcm/build.gradle
@@ -16,7 +16,7 @@ android {
     buildTypes {
         release {
             minifyEnabled true
-            proguardFiles 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 }
diff --git a/AndroidSDKLocation/build.gradle b/AndroidSDKLocation/build.gradle
@@ -16,7 +16,7 @@ android {
     buildTypes {
         release {
             minifyEnabled true
-            proguardFiles 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 }
diff --git a/AndroidSDKPush/build.gradle b/AndroidSDKPush/build.gradle
@@ -15,7 +15,7 @@ android {
 
     buildTypes {
         release {
-            proguardFiles 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ android {`
`25`	`25`	`}`
`26`	`26`	`buildTypes {`
`27`	`27`	`release {`
`28`		`- proguardFiles PROGUARD_FILES`
	`28`	`+ proguardFiles getDefaultProguardFile('proguard-android.txt'), PROGUARD_FILES`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ android {`
`16`	`16`	`buildTypes {`
`17`	`17`	`release {`
`18`	`18`	`minifyEnabled true`
`19`		`- proguardFiles 'proguard-rules.pro'`
	`19`	`+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ android {`
`15`	`15`
`16`	`16`	`buildTypes {`
`17`	`17`	`release {`
`18`		`- proguardFiles 'proguard-rules.pro'`
	`18`	`+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`	`}`