From 3c533807ec6a830f2d0c06c167f4b6b71ded8aea Mon Sep 17 00:00:00 2001
From: Sam Stern <samstern@google.com>
Date: Fri, 13 Sep 2019 11:25:56 -0700
Subject: [PATCH 1/2] Preserve unused classes

Change-Id: I59f179e31da39ad1b3cd80a5c514187978a0fa5e
---
 auth/build.gradle.kts      |  1 +
 database/build.gradle.kts  |  1 +
 firestore/build.gradle.kts |  1 +
 storage/build.gradle.kts   | 10 ++++++++++
 4 files changed, 13 insertions(+)

diff --git a/auth/build.gradle.kts b/auth/build.gradle.kts
index 368c31a53..b51522bf5 100644
--- a/auth/build.gradle.kts
+++ b/auth/build.gradle.kts
@@ -4,6 +4,7 @@ android {
     buildTypes {
         named("release").configure {
             postprocessing {
+                isRemoveUnusedCode = false
                 consumerProguardFiles("auth-proguard.pro")
             }
         }
diff --git a/database/build.gradle.kts b/database/build.gradle.kts
index 0e4151c0e..634e1bd54 100644
--- a/database/build.gradle.kts
+++ b/database/build.gradle.kts
@@ -8,6 +8,7 @@ android {
     buildTypes {
         named("release").configure {
             postprocessing {
+                isRemoveUnusedCode = false
                 consumerProguardFiles("proguard-rules.pro")
             }
         }
diff --git a/firestore/build.gradle.kts b/firestore/build.gradle.kts
index 911b6b23e..e100356f1 100644
--- a/firestore/build.gradle.kts
+++ b/firestore/build.gradle.kts
@@ -9,6 +9,7 @@ android {
     buildTypes {
         named("release").configure {
             postprocessing {
+                isRemoveUnusedCode = false
                 consumerProguardFiles("proguard-rules.pro")
             }
         }
diff --git a/storage/build.gradle.kts b/storage/build.gradle.kts
index c547b53d5..7543105e5 100644
--- a/storage/build.gradle.kts
+++ b/storage/build.gradle.kts
@@ -1,3 +1,13 @@
+android {
+    buildTypes {
+        named("release").configure {
+            postprocessing {
+                isRemoveUnusedCode = false
+            }
+        }
+    }
+}
+
 dependencies {
     api(Config.Libs.Misc.glide)
 

From 847052a070fc2ca70564edd4c8a6dc09e8e7455b Mon Sep 17 00:00:00 2001
From: Sam Stern <samstern@google.com>
Date: Fri, 13 Sep 2019 12:26:20 -0700
Subject: [PATCH 2/2] Get off of postprocessing DSL

Change-Id: I72bc7d7bcd4ee9d1deca5d3da38bd7dfac83a5b2
---
 auth/build.gradle.kts      | 6 ++----
 common/build.gradle.kts    | 9 +++++++++
 database/build.gradle.kts  | 6 ++----
 firestore/build.gradle.kts | 6 ++----
 storage/build.gradle.kts   | 5 ++---
 5 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/auth/build.gradle.kts b/auth/build.gradle.kts
index b51522bf5..39225454e 100644
--- a/auth/build.gradle.kts
+++ b/auth/build.gradle.kts
@@ -3,10 +3,8 @@ import com.android.build.gradle.internal.dsl.TestOptions
 android {
     buildTypes {
         named("release").configure {
-            postprocessing {
-                isRemoveUnusedCode = false
-                consumerProguardFiles("auth-proguard.pro")
-            }
+            isMinifyEnabled = false
+            consumerProguardFiles("proguard-rules.pro")
         }
     }
 
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index 165b6f445..1b8d1db33 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -1,3 +1,12 @@
+android {
+    buildTypes {
+        named("release").configure {
+            isMinifyEnabled = false
+            consumerProguardFiles("proguard-rules.pro")
+        }
+    }
+}
+
 dependencies {
     api(Config.Libs.Arch.runtime)
     api(Config.Libs.Arch.viewModel)
diff --git a/database/build.gradle.kts b/database/build.gradle.kts
index 634e1bd54..587cdf577 100644
--- a/database/build.gradle.kts
+++ b/database/build.gradle.kts
@@ -7,10 +7,8 @@ android {
 
     buildTypes {
         named("release").configure {
-            postprocessing {
-                isRemoveUnusedCode = false
-                consumerProguardFiles("proguard-rules.pro")
-            }
+            isMinifyEnabled = false
+            consumerProguardFiles("proguard-rules.pro")
         }
     }
 }
diff --git a/firestore/build.gradle.kts b/firestore/build.gradle.kts
index e100356f1..ec8569bc2 100644
--- a/firestore/build.gradle.kts
+++ b/firestore/build.gradle.kts
@@ -8,10 +8,8 @@ android {
 
     buildTypes {
         named("release").configure {
-            postprocessing {
-                isRemoveUnusedCode = false
-                consumerProguardFiles("proguard-rules.pro")
-            }
+            isMinifyEnabled = false
+            consumerProguardFiles("proguard-rules.pro")
         }
     }
 }
diff --git a/storage/build.gradle.kts b/storage/build.gradle.kts
index 7543105e5..75bdf40ab 100644
--- a/storage/build.gradle.kts
+++ b/storage/build.gradle.kts
@@ -1,9 +1,8 @@
 android {
     buildTypes {
         named("release").configure {
-            postprocessing {
-                isRemoveUnusedCode = false
-            }
+            isMinifyEnabled = false
+            consumerProguardFiles("proguard-rules.pro")
         }
     }
 }