Splitting into pre and post proguard tests

Author: ashwinraghav

test-apps/README.md

@@ -29,5 +29,5 @@ This experimental directory contains apps that are used to smoke test Firebase A
 - From the /test-apps dir, run the tests
 
   ```
-  ./gradlew connectedReleaseAndroidTest -PfirebaseProjectId=<your_project_id> -PfirebaseToken=<your_firebase_token> -Pm2Repository=${PWD}/../build/m2repository/
+  ./gradlew connectedCheck -PtestBuildType=<release|debug> -PfirebaseProjectId=<your_project_id> -PfirebaseToken=<your_firebase_token> -Pm2Repository=${PWD}/../build/m2repository/
   ```

test-apps/build.gradle

@@ -19,7 +19,6 @@ buildscript {
         jcenter()
         mavenLocal()
         google()
-        maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.1.4'
@@ -33,6 +32,8 @@ plugins {
 }
 
 allprojects {
+    ext.testBuildType = project.getProperties().get("testBuildType", "debug")
+
     apply plugin: 'com.github.sherter.google-java-format'
     googleJavaFormat {
         toolVersion = '1.6'
@@ -108,7 +109,7 @@ allprojects {
             }
         }
         tasks.whenTaskAdded {
-            if ( it.name == 'connectedReleaseAndroidTest') {
+            if ( it.name == 'connectedCheck') {
                 it.dependsOn setupSmokeTest
                 it.dependsOn rootProject.tasks.findByName("dependencyUpdates")
             }

test-apps/database-test-app/build.gradle

@@ -17,7 +17,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    testBuildType "release"
+    testBuildType = project.testBuildType
     compileSdkVersion 27
 
     defaultConfig {
@@ -53,7 +53,8 @@ configurations.all {
 dependencies {
     // We intentionally use an open ended version to pick up any SNAPSHOT
     // versions published to the root project' s build/ directory.
-    implementation 'com.google.firebase:firebase-database:+'
+    implementation 'com.google.firebase:firebase-database:16.0.2'
+    implementation 'com.google.firebase:firebase-database:16.0.2:javadoc'
     implementation 'com.google.firebase:firebase-core:16+'
     implementation 'com.google.firebase:firebase-auth:16+'
 

test-apps/firestore-test-app/build.gradle

@@ -17,7 +17,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    testBuildType "release"
+    testBuildType = project.testBuildType
     compileSdkVersion 27
 
     defaultConfig {

test-apps/functions-test-app/build.gradle

@@ -17,8 +17,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    // Changes the test build type for instrumented tests to "stage".
-    testBuildType "release"
+    testBuildType = project.testBuildType
     compileSdkVersion 27
 
     defaultConfig {

test-apps/storage-test-app/build.gradle

@@ -17,7 +17,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    testBuildType "release"
+    testBuildType = project.testBuildType
     compileSdkVersion 27
 
     defaultConfig {