diff --git a/admob/app/build.gradle b/admob/app/build.gradle
index ac44f14976..996cc88341 100644
--- a/admob/app/build.gradle
+++ b/admob/app/build.gradle
@@ -4,12 +4,12 @@ apply plugin: 'kotlin-android-extensions'
 check.dependsOn 'assembleDebugAndroidTest'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "com.google.samples.quickstart.admobexample"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
 
@@ -29,15 +29,15 @@ android {
 }
 
 configurations.all {
-    resolutionStrategy.force 'com.android.support:support-annotations:27.1.1'
+    resolutionStrategy.force 'com.android.support:support-annotations:28.0.0'
 }
 
 dependencies {
     implementation project(":internal:lintchecks")
     implementation project(":internal:chooser")
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:support-v4:27.1.1'
-    implementation 'com.android.support:customtabs:27.1.1'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'com.android.support:customtabs:28.0.0'
 
     // [START gradle_play_config]
     implementation 'com.google.firebase:firebase-ads:15.0.1'
@@ -47,7 +47,7 @@ dependencies {
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
     androidTestImplementation 'com.android.support.test:rules:1.0.2'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.70"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71"
 }
 
 apply plugin: 'com.google.gms.google-services'
\ No newline at end of file
diff --git a/admob/app/src/androidTest/java/com/google/samples/quickstart/admobexample/InterstitialAdTest.java b/admob/app/src/androidTest/java/com/google/samples/quickstart/admobexample/InterstitialAdTest.java
index ee6342183d..be740cb664 100644
--- a/admob/app/src/androidTest/java/com/google/samples/quickstart/admobexample/InterstitialAdTest.java
+++ b/admob/app/src/androidTest/java/com/google/samples/quickstart/admobexample/InterstitialAdTest.java
@@ -5,7 +5,7 @@
 import android.support.test.espresso.ViewInteraction;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.LargeTest;
+import android.support.test.filters.LargeTest;
 
 import com.google.samples.quickstart.admobexample.java.MainActivity;
 
diff --git a/admob/build.gradle b/admob/build.gradle
index ca31c85f41..9787fad592 100644
--- a/admob/build.gradle
+++ b/admob/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.0'
         classpath 'com.google.gms:google-services:4.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/admob/gradle/wrapper/gradle-wrapper.properties b/admob/gradle/wrapper/gradle-wrapper.properties
index 933b6473ce..9d2dc020a2 100644
--- a/admob/gradle/wrapper/gradle-wrapper.properties
+++ b/admob/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
diff --git a/analytics/app/build.gradle b/analytics/app/build.gradle
index 08880be951..9dc5ab79f8 100644
--- a/analytics/app/build.gradle
+++ b/analytics/app/build.gradle
@@ -4,12 +4,12 @@ apply plugin: 'kotlin-android-extensions'
 check.dependsOn 'assembleDebugAndroidTest'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "com.google.firebase.quickstart.analytics"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
@@ -24,16 +24,16 @@ android {
 }
 
 configurations.all {
-    resolutionStrategy.force 'com.android.support:support-annotations:27.1.1'
+    resolutionStrategy.force 'com.android.support:support-annotations:28.0.0'
 }
 
 dependencies {
     implementation project(":internal:lintchecks")
     implementation project(":internal:chooser")
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.70"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71"
 
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:support-v4:27.1.1'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:support-v4:28.0.0'
 
     implementation 'com.google.firebase:firebase-core:16.0.3'
     implementation 'com.google.firebase:firebase-analytics:16.0.3'
diff --git a/analytics/app/src/androidTest/java/com/google/firebase/quickstart/analytics/MainActivityTest.java b/analytics/app/src/androidTest/java/com/google/firebase/quickstart/analytics/MainActivityTest.java
index 63efe596c7..194a22cf12 100644
--- a/analytics/app/src/androidTest/java/com/google/firebase/quickstart/analytics/MainActivityTest.java
+++ b/analytics/app/src/androidTest/java/com/google/firebase/quickstart/analytics/MainActivityTest.java
@@ -6,7 +6,7 @@
 import android.support.test.espresso.ViewInteraction;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.LargeTest;
+import android.support.test.filters.LargeTest;
 
 import com.google.firebase.quickstart.analytics.java.MainActivity;
 
diff --git a/analytics/build.gradle b/analytics/build.gradle
index 13b7f0a91e..ff81d0623e 100644
--- a/analytics/build.gradle
+++ b/analytics/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.0'
         classpath 'com.google.gms:google-services:4.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/analytics/gradle/wrapper/gradle-wrapper.properties b/analytics/gradle/wrapper/gradle-wrapper.properties
index 933b6473ce..9d2dc020a2 100644
--- a/analytics/gradle/wrapper/gradle-wrapper.properties
+++ b/analytics/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
diff --git a/app-indexing/app/build.gradle b/app-indexing/app/build.gradle
index 0220a5a540..5544a021d8 100644
--- a/app-indexing/app/build.gradle
+++ b/app-indexing/app/build.gradle
@@ -4,12 +4,12 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "com.google.samples.quickstart.app_indexing"
         minSdkVersion 18
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 2
         versionName "1.0"
 
@@ -24,20 +24,20 @@ android {
 }
 
 configurations.all {
-    resolutionStrategy.force 'com.android.support:support-annotations:27.1.1'
+    resolutionStrategy.force 'com.android.support:support-annotations:28.0.0'
 }
 
 dependencies {
     implementation project(":internal:lintchecks")
     implementation project(":internal:chooser")
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.70"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71"
     // [START app_indexing_gradle_dep]
     implementation 'com.google.firebase:firebase-appindexing:16.0.1'
     // [END app_indexing_gradle_dep]
     implementation 'com.google.firebase:firebase-core:16.0.3'
 
-    implementation 'com.android.support:support-v4:27.1.1'
-    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
 
     // Testing
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
diff --git a/app-indexing/build.gradle b/app-indexing/build.gradle
index 13b7f0a91e..ff81d0623e 100644
--- a/app-indexing/build.gradle
+++ b/app-indexing/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.0'
         classpath 'com.google.gms:google-services:4.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/app-indexing/gradle/wrapper/gradle-wrapper.properties b/app-indexing/gradle/wrapper/gradle-wrapper.properties
index 933b6473ce..9d2dc020a2 100644
--- a/app-indexing/gradle/wrapper/gradle-wrapper.properties
+++ b/app-indexing/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
diff --git a/auth/app/build.gradle b/auth/app/build.gradle
index b006192eb0..d0d7c407d0 100644
--- a/auth/app/build.gradle
+++ b/auth/app/build.gradle
@@ -4,13 +4,13 @@ apply plugin: 'kotlin-android-extensions'
 check.dependsOn 'assembleDebugAndroidTest'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
     flavorDimensions "minSdkVersion"
 
     defaultConfig {
         applicationId "com.google.firebase.quickstart.auth"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
@@ -30,7 +30,7 @@ android {
 }
 
 configurations.all {
-    resolutionStrategy.force 'com.android.support:support-annotations:27.1.1'
+    resolutionStrategy.force 'com.android.support:support-annotations:28.0.0'
 }
 
 dependencies {
@@ -39,10 +39,11 @@ dependencies {
     implementation 'com.android.support:multidex:1.0.3'
 
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:animated-vector-drawable:27.1.1'
-    implementation 'com.android.support:cardview-v7:27.1.1'
-    implementation 'com.android.support:design:27.1.1'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'com.android.support:animated-vector-drawable:28.0.0'
+    implementation 'com.android.support:cardview-v7:28.0.0'
+    implementation 'com.android.support:design:28.0.0'
 
     // Firebase Authentication
     implementation 'com.google.firebase:firebase-core:16.0.3'
@@ -57,8 +58,8 @@ dependencies {
 
     // Facebook Android SDK (only required for Facebook Login)
     // Used in FacebookLoginActivity.
-    implementation 'com.facebook.android:facebook-login:4.36.0'
-    implementation 'com.android.support:customtabs:27.1.1'
+    implementation 'com.facebook.android:facebook-login:4.36.1'
+    implementation 'com.android.support:customtabs:28.0.0'
 
     // Twitter Android SDK (only required for Twitter Login)
     implementation 'com.twitter.sdk.android:twitter-core:3.3.0'
diff --git a/auth/app/src/androidTest/java/com/google/firebase/quickstart/auth/AnonymousTest.java b/auth/app/src/androidTest/java/com/google/firebase/quickstart/auth/AnonymousTest.java
index 203e2760a6..d5a2abb43d 100644
--- a/auth/app/src/androidTest/java/com/google/firebase/quickstart/auth/AnonymousTest.java
+++ b/auth/app/src/androidTest/java/com/google/firebase/quickstart/auth/AnonymousTest.java
@@ -5,7 +5,7 @@
 import android.support.test.espresso.NoMatchingViewException;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.LargeTest;
+import android.support.test.filters.LargeTest;
 
 import com.google.firebase.quickstart.auth.java.AnonymousAuthActivity;
 
diff --git a/auth/app/src/androidTest/java/com/google/firebase/quickstart/auth/EmailPasswordTest.java b/auth/app/src/androidTest/java/com/google/firebase/quickstart/auth/EmailPasswordTest.java
index c97fd729be..20c5c7ca30 100644
--- a/auth/app/src/androidTest/java/com/google/firebase/quickstart/auth/EmailPasswordTest.java
+++ b/auth/app/src/androidTest/java/com/google/firebase/quickstart/auth/EmailPasswordTest.java
@@ -7,7 +7,7 @@
 import android.support.test.espresso.ViewInteraction;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.LargeTest;
+import android.support.test.filters.LargeTest;
 
 import com.google.firebase.quickstart.auth.java.EmailPasswordActivity;
 
diff --git a/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/FacebookLoginActivity.kt b/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/FacebookLoginActivity.kt
index 212168d1ac..a20ece5d67 100644
--- a/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/FacebookLoginActivity.kt
+++ b/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/FacebookLoginActivity.kt
@@ -77,7 +77,7 @@ class FacebookLoginActivity : BaseActivity(), View.OnClickListener {
     // [END on_start_check_user]
 
     // [START on_activity_result]
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent) {
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
 
         // Pass the activity result back to the Facebook SDK
diff --git a/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/FirebaseUIActivity.kt b/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/FirebaseUIActivity.kt
index cafb419552..fa69a7370d 100644
--- a/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/FirebaseUIActivity.kt
+++ b/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/FirebaseUIActivity.kt
@@ -39,7 +39,7 @@ class FirebaseUIActivity : AppCompatActivity(), View.OnClickListener {
         updateUI(mAuth.currentUser)
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent) {
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
 
         if (requestCode == RC_SIGN_IN) {
diff --git a/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/GoogleSignInActivity.kt b/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/GoogleSignInActivity.kt
index 2b152062cb..29ecd118a5 100644
--- a/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/GoogleSignInActivity.kt
+++ b/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/GoogleSignInActivity.kt
@@ -62,7 +62,7 @@ class GoogleSignInActivity : BaseActivity(), View.OnClickListener {
     // [END on_start_check_user]
 
     // [START onactivityresult]
-    public override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent) {
+    public override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
 
         // Result returned from launching the Intent from GoogleSignInApi.getSignInIntent(...);
diff --git a/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/TwitterLoginActivity.kt b/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/TwitterLoginActivity.kt
index 59bed53933..18e0bf288c 100644
--- a/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/TwitterLoginActivity.kt
+++ b/auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/TwitterLoginActivity.kt
@@ -72,7 +72,7 @@ class TwitterLoginActivity : BaseActivity(), View.OnClickListener {
     // [END on_start_check_user]
 
     // [START on_activity_result]
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent) {
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
 
         // Pass the activity result to the Twitter login button.
diff --git a/auth/build.gradle b/auth/build.gradle
index 363136932d..514553d305 100644
--- a/auth/build.gradle
+++ b/auth/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.0'
         classpath 'com.google.gms:google-services:4.1.0'
     }
 }
diff --git a/auth/gradle/wrapper/gradle-wrapper.properties b/auth/gradle/wrapper/gradle-wrapper.properties
index 933b6473ce..9d2dc020a2 100644
--- a/auth/gradle/wrapper/gradle-wrapper.properties
+++ b/auth/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
diff --git a/build.gradle b/build.gradle
index 3229ca6d09..124c160d53 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,12 +7,12 @@ buildscript {
         maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.70'
+        classpath 'com.android.tools.build:gradle:3.2.0'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.71'
 
         classpath 'com.google.gms:google-services:4.1.0'
         classpath 'com.google.firebase:firebase-plugins:1.1.5'
-        classpath 'io.fabric.tools:gradle:1.25.4'
+        classpath 'io.fabric.tools:gradle:1.26.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/config/app/build.gradle b/config/app/build.gradle
index 3666a1e60c..0d520419e7 100644
--- a/config/app/build.gradle
+++ b/config/app/build.gradle
@@ -4,12 +4,12 @@ apply plugin: 'kotlin-android-extensions'
 check.dependsOn 'assembleDebugAndroidTest'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "com.google.samples.quickstart.config"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
 
@@ -25,16 +25,16 @@ android {
 }
 
 configurations.all {
-    resolutionStrategy.force 'com.android.support:support-annotations:27.1.1'
+    resolutionStrategy.force 'com.android.support:support-annotations:28.0.0'
 }
 
 dependencies {
     implementation project(":internal:lintchecks")
     implementation project(":internal:chooser")
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.70"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71"
 
-    implementation 'com.android.support:support-v4:27.1.1'
-    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
 
     implementation 'com.google.firebase:firebase-core:16.0.3'
     implementation 'com.google.firebase:firebase-config:16.0.0'
diff --git a/config/app/src/androidTest/java/com/google/samples/quickstart/config/MainActivityTest.java b/config/app/src/androidTest/java/com/google/samples/quickstart/config/MainActivityTest.java
index de0bc926ac..00f95f705a 100644
--- a/config/app/src/androidTest/java/com/google/samples/quickstart/config/MainActivityTest.java
+++ b/config/app/src/androidTest/java/com/google/samples/quickstart/config/MainActivityTest.java
@@ -2,7 +2,7 @@
 
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.LargeTest;
+import android.support.test.filters.LargeTest;
 
 import com.google.samples.quickstart.config.java.MainActivity;
 
diff --git a/config/build.gradle b/config/build.gradle
index 9ae410c96f..5295c4bb1b 100644
--- a/config/build.gradle
+++ b/config/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.0'
         classpath 'com.google.gms:google-services:4.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/config/gradle/wrapper/gradle-wrapper.properties b/config/gradle/wrapper/gradle-wrapper.properties
index 933b6473ce..9d2dc020a2 100644
--- a/config/gradle/wrapper/gradle-wrapper.properties
+++ b/config/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
diff --git a/crash/app/build.gradle b/crash/app/build.gradle
index 2d02c288e3..c4c7cac9df 100644
--- a/crash/app/build.gradle
+++ b/crash/app/build.gradle
@@ -6,12 +6,12 @@ apply plugin: 'io.fabric'
 check.dependsOn 'assembleDebugAndroidTest'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "com.google.samples.quickstart.crash"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
@@ -31,14 +31,14 @@ android {
 }
 
 configurations.all {
-    resolutionStrategy.force 'com.android.support:support-annotations:27.1.1'
+    resolutionStrategy.force 'com.android.support:support-annotations:28.0.0'
 }
 
 dependencies {
     implementation project(":internal:lintchecks")
     implementation project(":internal:chooser")
-    implementation 'com.android.support:support-v4:27.1.1'
-    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
 
     implementation 'com.google.firebase:firebase-core:16.0.3'
     implementation 'com.crashlytics.sdk.android:crashlytics:2.9.5'
diff --git a/crash/app/src/androidTest/java/com/google/samples/quickstart/crash/MainActivityTest.java b/crash/app/src/androidTest/java/com/google/samples/quickstart/crash/MainActivityTest.java
index 72ee20c5c0..875aebf165 100644
--- a/crash/app/src/androidTest/java/com/google/samples/quickstart/crash/MainActivityTest.java
+++ b/crash/app/src/androidTest/java/com/google/samples/quickstart/crash/MainActivityTest.java
@@ -4,7 +4,7 @@
 import android.support.test.espresso.ViewInteraction;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.LargeTest;
+import android.support.test.filters.LargeTest;
 import android.widget.CheckBox;
 
 import com.google.samples.quickstart.crash.java.MainActivity;
diff --git a/crash/build.gradle b/crash/build.gradle
index 0d28ac3d08..e930cae28a 100644
--- a/crash/build.gradle
+++ b/crash/build.gradle
@@ -8,9 +8,9 @@ buildscript {
         maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.0'
         classpath 'com.google.gms:google-services:4.1.0'
-        classpath 'io.fabric.tools:gradle:1.25.4'
+        classpath 'io.fabric.tools:gradle:1.26.0'
     }
 }
 
diff --git a/crash/gradle/wrapper/gradle-wrapper.properties b/crash/gradle/wrapper/gradle-wrapper.properties
index 933b6473ce..9d2dc020a2 100644
--- a/crash/gradle/wrapper/gradle-wrapper.properties
+++ b/crash/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
diff --git a/database/app/build.gradle b/database/app/build.gradle
index 70852bc48d..5000497229 100644
--- a/database/app/build.gradle
+++ b/database/app/build.gradle
@@ -6,12 +6,12 @@ apply plugin: 'org.jetbrains.kotlin.android.extensions'
 check.dependsOn 'assembleDebugAndroidTest'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "com.google.firebase.quickstart.database"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
@@ -27,7 +27,7 @@ android {
 }
 
 configurations.all {
-    resolutionStrategy.force 'com.android.support:support-annotations:27.1.1'
+    resolutionStrategy.force 'com.android.support:support-annotations:28.0.0'
 }
 
 androidExtensions {
@@ -37,12 +37,13 @@ androidExtensions {
 dependencies {
     implementation project(":internal:lintchecks")
     implementation project(":internal:chooser")
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.70"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71"
 
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:recyclerview-v7:27.1.1'
-    implementation 'com.android.support:cardview-v7:27.1.1'
-    implementation 'com.android.support:design:27.1.1'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:recyclerview-v7:28.0.0'
+    implementation 'com.android.support:cardview-v7:28.0.0'
+    implementation 'com.android.support:design:28.0.0'
+    implementation 'com.android.support:support-v4:28.0.0'
 
     implementation 'com.firebaseui:firebase-ui-database:4.2.0'
 
diff --git a/database/app/src/androidTest/java/com/google/firebase/quickstart/database/ApplicationTest.java b/database/app/src/androidTest/java/com/google/firebase/quickstart/database/ApplicationTest.java
deleted file mode 100644
index a70590a19e..0000000000
--- a/database/app/src/androidTest/java/com/google/firebase/quickstart/database/ApplicationTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Copyright 2016 Google Inc. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.firebase.quickstart.database;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}
diff --git a/database/app/src/androidTest/java/com/google/firebase/quickstart/database/NewPostTest.java b/database/app/src/androidTest/java/com/google/firebase/quickstart/database/NewPostTest.java
index a183b04054..90ebe0eec3 100644
--- a/database/app/src/androidTest/java/com/google/firebase/quickstart/database/NewPostTest.java
+++ b/database/app/src/androidTest/java/com/google/firebase/quickstart/database/NewPostTest.java
@@ -6,7 +6,7 @@
 import android.support.test.espresso.ViewInteraction;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.LargeTest;
+import android.support.test.filters.LargeTest;
 
 import com.google.firebase.quickstart.database.java.SignInActivity;
 
diff --git a/database/app/src/main/java/com/google/firebase/quickstart/database/java/NewPostActivity.java b/database/app/src/main/java/com/google/firebase/quickstart/database/java/NewPostActivity.java
index ad11b716e0..6b8b7f78d7 100644
--- a/database/app/src/main/java/com/google/firebase/quickstart/database/java/NewPostActivity.java
+++ b/database/app/src/main/java/com/google/firebase/quickstart/database/java/NewPostActivity.java
@@ -116,9 +116,9 @@ private void setEditingEnabled(boolean enabled) {
         mTitleField.setEnabled(enabled);
         mBodyField.setEnabled(enabled);
         if (enabled) {
-            mSubmitButton.setVisibility(View.VISIBLE);
+            mSubmitButton.show();
         } else {
-            mSubmitButton.setVisibility(View.GONE);
+            mSubmitButton.hide();
         }
     }
 
diff --git a/database/app/src/main/java/com/google/firebase/quickstart/database/kotlin/NewPostActivity.kt b/database/app/src/main/java/com/google/firebase/quickstart/database/kotlin/NewPostActivity.kt
index 720151a56f..d71bb65a93 100644
--- a/database/app/src/main/java/com/google/firebase/quickstart/database/kotlin/NewPostActivity.kt
+++ b/database/app/src/main/java/com/google/firebase/quickstart/database/kotlin/NewPostActivity.kt
@@ -88,10 +88,10 @@ class NewPostActivity : BaseActivity() {
     private fun setEditingEnabled(enabled: Boolean) {
         fieldTitle.isEnabled = enabled
         fieldBody.isEnabled = enabled
-        fabSubmitPost.visibility = if (enabled) {
-            View.VISIBLE
+        if (enabled) {
+            fabSubmitPost.show()
         } else {
-            View.GONE
+            fabSubmitPost.hide()
         }
     }
 
diff --git a/database/build.gradle b/database/build.gradle
index f18aff21bd..840b4db5b7 100644
--- a/database/build.gradle
+++ b/database/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.0'
         classpath 'com.google.gms:google-services:4.1.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/database/gradle/wrapper/gradle-wrapper.properties b/database/gradle/wrapper/gradle-wrapper.properties
index 933b6473ce..9d2dc020a2 100644
--- a/database/gradle/wrapper/gradle-wrapper.properties
+++ b/database/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
diff --git a/dynamiclinks/app/build.gradle b/dynamiclinks/app/build.gradle
index bbdca5de62..8563da58fb 100644
--- a/dynamiclinks/app/build.gradle
+++ b/dynamiclinks/app/build.gradle
@@ -2,16 +2,16 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
-check.dependsOn 'assembleMainDebugAndroidTest'
+check.dependsOn 'assembleMainFlavorDebugAndroidTest'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
     flavorDimensions "irrelevant"
 
     defaultConfig {
         applicationId "com.google.firebase.quickstart.deeplinks"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
 
@@ -28,7 +28,7 @@ android {
     flavorDimensions "all"
 
     productFlavors {
-        main {
+        mainFlavor {
             dimension "all"
 
             // TODO(developer): Replace this with your Dynamic Links domain
@@ -39,16 +39,17 @@ android {
 }
 
 configurations.all {
-    resolutionStrategy.force 'com.android.support:support-annotations:27.1.1'
+    resolutionStrategy.force 'com.android.support:support-annotations:28.0.0'
 }
 
 dependencies {
     implementation project(":internal:lintchecks")
     implementation project(":internal:chooser")
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.70"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71"
 
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:design:27.1.1'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'com.android.support:design:28.0.0'
 
     implementation 'com.google.firebase:firebase-core:16.0.3'
     implementation 'com.google.firebase:firebase-invites:16.0.3'
diff --git a/dynamiclinks/build.gradle b/dynamiclinks/build.gradle
index 9fe900521c..abab1a52f8 100644
--- a/dynamiclinks/build.gradle
+++ b/dynamiclinks/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.0'
         classpath 'com.google.gms:google-services:4.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/dynamiclinks/gradle/wrapper/gradle-wrapper.properties b/dynamiclinks/gradle/wrapper/gradle-wrapper.properties
index 933b6473ce..9d2dc020a2 100644
--- a/dynamiclinks/gradle/wrapper/gradle-wrapper.properties
+++ b/dynamiclinks/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
diff --git a/firestore/app/build.gradle b/firestore/app/build.gradle
index 706ed508e6..b643dcae9c 100644
--- a/firestore/app/build.gradle
+++ b/firestore/app/build.gradle
@@ -5,12 +5,12 @@ apply plugin: 'org.jetbrains.kotlin.android.extensions'
 
 android {
     testBuildType "release"
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "com.google.firebase.example.fireeats"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
         multiDexEnabled true
@@ -40,7 +40,7 @@ androidExtensions {
 dependencies {
     implementation project(":internal:lintchecks")
     implementation project(":internal:chooser")
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.70"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71"
 
     // Firestore
     implementation 'com.google.firebase:firebase-core:16.0.3'
@@ -58,12 +58,14 @@ dependencies {
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
 
     // Support Libs
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:animated-vector-drawable:27.1.1'
-    implementation 'com.android.support:cardview-v7:27.1.1'
-    implementation 'com.android.support:customtabs:27.1.1'
-    implementation 'com.android.support:design:27.1.1'
-    implementation 'com.android.support:recyclerview-v7:27.1.1'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:animated-vector-drawable:28.0.0'
+    implementation 'com.android.support:cardview-v7:28.0.0'
+    implementation 'com.android.support:customtabs:28.0.0'
+    implementation 'com.android.support:design:28.0.0'
+    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'com.android.support:support-media-compat:28.0.0'
+    implementation 'com.android.support:recyclerview-v7:28.0.0'
     implementation 'com.android.support:multidex:1.0.3'
 
     // Android architecture components
diff --git a/firestore/app/src/androidTest/java/com/google/firebase/example/fireeats/MainActivityTest.java b/firestore/app/src/androidTest/java/com/google/firebase/example/fireeats/MainActivityTest.java
index b5553701a8..d4131b76e2 100644
--- a/firestore/app/src/androidTest/java/com/google/firebase/example/fireeats/MainActivityTest.java
+++ b/firestore/app/src/androidTest/java/com/google/firebase/example/fireeats/MainActivityTest.java
@@ -7,7 +7,7 @@
 import android.support.test.uiautomator.UiObject;
 import android.support.test.uiautomator.UiScrollable;
 import android.support.test.uiautomator.UiSelector;
-import android.test.suitebuilder.annotation.LargeTest;
+import android.support.test.filters.LargeTest;
 import android.view.accessibility.AccessibilityWindowInfo;
 
 import com.google.firebase.auth.FirebaseAuth;
diff --git a/firestore/app/src/main/java/com/google/firebase/example/fireeats/kotlin/MainActivity.kt b/firestore/app/src/main/java/com/google/firebase/example/fireeats/kotlin/MainActivity.kt
index a559517c8a..3d69e24f10 100644
--- a/firestore/app/src/main/java/com/google/firebase/example/fireeats/kotlin/MainActivity.kt
+++ b/firestore/app/src/main/java/com/google/firebase/example/fireeats/kotlin/MainActivity.kt
@@ -126,7 +126,7 @@ class MainActivity : AppCompatActivity(), FilterDialogFragment.FilterListener, R
         return super.onOptionsItemSelected(item)
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent) {
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         if (requestCode == RC_SIGN_IN) {
             val response = IdpResponse.fromResultIntent(data)
diff --git a/firestore/build.gradle b/firestore/build.gradle
index 818bf5addc..20d203f653 100644
--- a/firestore/build.gradle
+++ b/firestore/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         mavenLocal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.0'
         classpath 'com.google.gms:google-services:4.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/firestore/gradle/wrapper/gradle-wrapper.properties b/firestore/gradle/wrapper/gradle-wrapper.properties
index 933b6473ce..9d2dc020a2 100644
--- a/firestore/gradle/wrapper/gradle-wrapper.properties
+++ b/firestore/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
diff --git a/functions/app/build.gradle b/functions/app/build.gradle
index 14acb57230..e28379e81c 100644
--- a/functions/app/build.gradle
+++ b/functions/app/build.gradle
@@ -5,12 +5,12 @@ apply plugin: 'kotlin-android-extensions'
 android {
     // Changes the test build type for instrumented tests to "stage".
     testBuildType "release"
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "com.google.samples.quickstart.functions"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
@@ -27,19 +27,19 @@ android {
 }
 
 configurations.all {
-    resolutionStrategy.force 'com.android.support:support-annotations:27.1.1'
+    resolutionStrategy.force 'com.android.support:support-annotations:28.0.0'
 }
 
 dependencies {
     implementation project(":internal:lintchecks")
     implementation project(":internal:chooser")
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.70"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71"
 
-    implementation 'com.android.support:support-v4:27.1.1'
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:design:27.1.1'
-    implementation 'com.android.support:customtabs:27.1.1'
-    implementation 'com.android.support:cardview-v7:27.1.1'
+    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:design:28.0.0'
+    implementation 'com.android.support:customtabs:28.0.0'
+    implementation 'com.android.support:cardview-v7:28.0.0'
 
     implementation 'com.google.firebase:firebase-core:16.0.3'
     implementation 'com.google.firebase:firebase-auth:16.0.3'
diff --git a/functions/app/src/androidTest/java/com/google/samples/quickstart/functions/MainActivityTest.java b/functions/app/src/androidTest/java/com/google/samples/quickstart/functions/MainActivityTest.java
index de4f88cd12..0fb2c89a0c 100644
--- a/functions/app/src/androidTest/java/com/google/samples/quickstart/functions/MainActivityTest.java
+++ b/functions/app/src/androidTest/java/com/google/samples/quickstart/functions/MainActivityTest.java
@@ -3,7 +3,7 @@
 
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.LargeTest;
+import android.support.test.filters.LargeTest;
 
 import com.google.samples.quickstart.functions.java.MainActivity;
 
diff --git a/functions/app/src/androidTest/java/com/google/samples/quickstart/functions/TestAddNumber.java b/functions/app/src/androidTest/java/com/google/samples/quickstart/functions/TestAddNumber.java
index 29956f87e2..1e447f03d9 100644
--- a/functions/app/src/androidTest/java/com/google/samples/quickstart/functions/TestAddNumber.java
+++ b/functions/app/src/androidTest/java/com/google/samples/quickstart/functions/TestAddNumber.java
@@ -6,7 +6,7 @@
 import android.support.test.uiautomator.UiDevice;
 import android.support.test.uiautomator.UiObject;
 import android.support.test.uiautomator.UiSelector;
-import android.test.suitebuilder.annotation.LargeTest;
+import android.support.test.filters.LargeTest;
 
 import com.google.samples.quickstart.functions.java.MainActivity;
 
diff --git a/functions/app/src/main/java/com/google/samples/quickstart/functions/kotlin/MainActivity.kt b/functions/app/src/main/java/com/google/samples/quickstart/functions/kotlin/MainActivity.kt
index 5b4e72af38..d85aa285fa 100644
--- a/functions/app/src/main/java/com/google/samples/quickstart/functions/kotlin/MainActivity.kt
+++ b/functions/app/src/main/java/com/google/samples/quickstart/functions/kotlin/MainActivity.kt
@@ -198,7 +198,7 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
         }
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent) {
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
 
         if (requestCode == RC_SIGN_IN) {
diff --git a/functions/build.gradle b/functions/build.gradle
index f18aff21bd..840b4db5b7 100644
--- a/functions/build.gradle
+++ b/functions/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.0'
         classpath 'com.google.gms:google-services:4.1.0'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/functions/gradle/wrapper/gradle-wrapper.properties b/functions/gradle/wrapper/gradle-wrapper.properties
index 933b6473ce..9d2dc020a2 100644
--- a/functions/gradle/wrapper/gradle-wrapper.properties
+++ b/functions/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 933b6473ce..9d2dc020a2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
diff --git a/inappmessaging/app/build.gradle b/inappmessaging/app/build.gradle
index 5d111c3863..59289af34d 100644
--- a/inappmessaging/app/build.gradle
+++ b/inappmessaging/app/build.gradle
@@ -3,11 +3,11 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
     defaultConfig {
         applicationId "com.google.firebase.fiamquickstart"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
 
@@ -30,10 +30,12 @@ android {
 dependencies {
     implementation project(":internal:lintchecks")
     implementation project(":internal:chooser")
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.70"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71"
 
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:design:27.1.1'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'com.android.support:customtabs:28.0.0'
+    implementation 'com.android.support:design:28.0.0'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     implementation 'com.android.support:multidex:1.0.3'
 
diff --git a/inappmessaging/build.gradle b/inappmessaging/build.gradle
index 50132ab788..79a4e3efe6 100644
--- a/inappmessaging/build.gradle
+++ b/inappmessaging/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.google.gms:google-services:4.1.0'
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.0'
     }
 }
 
diff --git a/inappmessaging/gradle/wrapper/gradle-wrapper.properties b/inappmessaging/gradle/wrapper/gradle-wrapper.properties
index c40d97cecd..26a087e636 100644
--- a/inappmessaging/gradle/wrapper/gradle-wrapper.properties
+++ b/inappmessaging/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip
diff --git a/internal/chooser/build.gradle b/internal/chooser/build.gradle
index 44398d9c8a..1e4bd8cff9 100644
--- a/internal/chooser/build.gradle
+++ b/internal/chooser/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
 
@@ -23,8 +23,8 @@ android {
 }
 
 dependencies {
-    api 'com.android.support:appcompat-v7:27.1.1'
-    api 'com.android.support:cardview-v7:27.1.1'
-    api 'com.android.support:recyclerview-v7:27.1.1'
+    api 'com.android.support:appcompat-v7:28.0.0'
+    api 'com.android.support:cardview-v7:28.0.0'
+    api 'com.android.support:recyclerview-v7:28.0.0'
     api 'com.android.support.constraint:constraint-layout:1.1.3'
 }
diff --git a/internal/lint/build.gradle b/internal/lint/build.gradle
index 491348c1c9..b145707d50 100644
--- a/internal/lint/build.gradle
+++ b/internal/lint/build.gradle
@@ -5,10 +5,10 @@ targetCompatibility = JavaVersion.VERSION_1_7
 sourceCompatibility = JavaVersion.VERSION_1_7
 
 dependencies {
-    compileOnly "com.android.tools.lint:lint-api:26.1.4"
-    compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.70"
-    testImplementation "com.android.tools.lint:lint:26.1.4"
-    testImplementation "com.android.tools.lint:lint-tests:26.1.4"
+    compileOnly "com.android.tools.lint:lint-api:26.2.0"
+    compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71"
+    testImplementation "com.android.tools.lint:lint:26.2.0"
+    testImplementation "com.android.tools.lint:lint-tests:26.2.0"
 }
 
 jar {
diff --git a/internal/lintchecks/build.gradle b/internal/lintchecks/build.gradle
index e7d12087b3..0726b170bf 100644
--- a/internal/lintchecks/build.gradle
+++ b/internal/lintchecks/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
     }
 }
 
diff --git a/invites/app/build.gradle b/invites/app/build.gradle
index 67f9e87bb5..edb43dcbe7 100644
--- a/invites/app/build.gradle
+++ b/invites/app/build.gradle
@@ -1,16 +1,17 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
-check.dependsOn 'assembleMainDebugAndroidTest'
+
+check.dependsOn 'assembleMainFlavorDebugAndroidTest'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
     flavorDimensions "irrelevant"
 
     defaultConfig {
         applicationId "com.google.firebase.quickstart.invites"
         minSdkVersion 18
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 2
         versionName "1.0.1"
 
@@ -27,7 +28,7 @@ android {
     flavorDimensions "all"
 
     productFlavors {
-        main {
+        mainFlavor {
             dimension "all"
 
             // TODO(developer): Replace this with your app code
@@ -44,10 +45,11 @@ android {
 dependencies {
     implementation project(":internal:lintchecks")
     implementation project(":internal:chooser")
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.70"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71"
 
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:design:27.1.1'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'com.android.support:design:28.0.0'
 
     implementation 'com.google.firebase:firebase-core:16.0.3'
     implementation 'com.google.firebase:firebase-invites:16.0.3'
@@ -56,7 +58,7 @@ dependencies {
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test:rules:1.0.2'
     androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.3'
-    androidTestImplementation 'com.android.support:support-annotations:27.1.1'
+    androidTestImplementation 'com.android.support:support-annotations:28.0.0'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/invites/app/src/main/java/com/google/firebase/quickstart/invites/kotlin/MainActivity.kt b/invites/app/src/main/java/com/google/firebase/quickstart/invites/kotlin/MainActivity.kt
index 77c88a7941..38af584cde 100644
--- a/invites/app/src/main/java/com/google/firebase/quickstart/invites/kotlin/MainActivity.kt
+++ b/invites/app/src/main/java/com/google/firebase/quickstart/invites/kotlin/MainActivity.kt
@@ -91,14 +91,14 @@ class MainActivity : AppCompatActivity(), GoogleApiClient.OnConnectionFailedList
     // [END on_invite_clicked]
 
     // [START on_activity_result]
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent) {
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         Log.d(TAG, "onActivityResult: requestCode=$requestCode, resultCode=$resultCode")
 
         if (requestCode == REQUEST_INVITE) {
             if (resultCode == Activity.RESULT_OK) {
                 // Get the invitation IDs of all sent messages
-                val ids = AppInviteInvitation.getInvitationIds(resultCode, data)
+                val ids = AppInviteInvitation.getInvitationIds(resultCode, data!!)
                 for (id in ids) {
                     Log.d(TAG, "onActivityResult: sent invitation $id")
                 }
diff --git a/invites/build.gradle b/invites/build.gradle
index 9ae410c96f..5295c4bb1b 100644
--- a/invites/build.gradle
+++ b/invites/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.0'
         classpath 'com.google.gms:google-services:4.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/invites/gradle/wrapper/gradle-wrapper.properties b/invites/gradle/wrapper/gradle-wrapper.properties
index 933b6473ce..9d2dc020a2 100644
--- a/invites/gradle/wrapper/gradle-wrapper.properties
+++ b/invites/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
diff --git a/messaging/app/build.gradle b/messaging/app/build.gradle
index 286ac69c4f..c1d646ee97 100644
--- a/messaging/app/build.gradle
+++ b/messaging/app/build.gradle
@@ -4,12 +4,12 @@ apply plugin: 'kotlin-android-extensions'
 check.dependsOn 'assembleDebugAndroidTest'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "com.google.firebase.quickstart.fcm"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
 
@@ -33,16 +33,16 @@ android {
 }
 
 configurations.all {
-    resolutionStrategy.force 'com.android.support:support-annotations:27.1.1'
+    resolutionStrategy.force 'com.android.support:support-annotations:28.0.0'
 }
 
 dependencies {
     implementation project(":internal:lintchecks")
     implementation project(":internal:chooser")
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:animated-vector-drawable:27.1.1'
-    implementation 'com.android.support:support-v4:27.1.1'
-    implementation 'com.android.support:support-compat:27.1.1'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:animated-vector-drawable:28.0.0'
+    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'com.android.support:support-compat:28.0.0'
 
     implementation 'com.google.firebase:firebase-core:16.0.3'
     implementation 'com.google.firebase:firebase-iid:17.0.2'
@@ -53,7 +53,7 @@ dependencies {
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test:rules:1.0.2'
-    androidTestImplementation 'com.android.support:support-annotations:27.1.1'
+    androidTestImplementation 'com.android.support:support-annotations:28.0.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 
diff --git a/messaging/app/src/androidTest/java/com/google/firebase/quickstart/fcm/MainActivityEspressoTest.java b/messaging/app/src/androidTest/java/com/google/firebase/quickstart/fcm/MainActivityEspressoTest.java
index bdbbaa749c..dee2b6dc95 100644
--- a/messaging/app/src/androidTest/java/com/google/firebase/quickstart/fcm/MainActivityEspressoTest.java
+++ b/messaging/app/src/androidTest/java/com/google/firebase/quickstart/fcm/MainActivityEspressoTest.java
@@ -18,7 +18,7 @@
 
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.LargeTest;
+import android.support.test.filters.LargeTest;
 import android.view.View;
 
 import com.google.firebase.quickstart.fcm.java.MainActivity;
diff --git a/messaging/build.gradle b/messaging/build.gradle
index bb15914f35..39d40788ca 100644
--- a/messaging/build.gradle
+++ b/messaging/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.0'
         classpath 'com.google.gms:google-services:4.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/messaging/gradle/wrapper/gradle-wrapper.properties b/messaging/gradle/wrapper/gradle-wrapper.properties
index 933b6473ce..9d2dc020a2 100644
--- a/messaging/gradle/wrapper/gradle-wrapper.properties
+++ b/messaging/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
diff --git a/mlkit/app/build.gradle b/mlkit/app/build.gradle
index 8396a3b800..556d608a21 100644
--- a/mlkit/app/build.gradle
+++ b/mlkit/app/build.gradle
@@ -3,11 +3,11 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
     defaultConfig {
         applicationId "com.google.firebase.samples.apps.mlkit"
         minSdkVersion 21
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -26,10 +26,11 @@ android {
 dependencies {
     implementation project(":internal:lintchecks")
     implementation project(':internal:chooser')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.70"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71"
 
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:design:27.1.1'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'com.android.support:design:28.0.0'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
diff --git a/mlkit/app/src/main/java/com/google/firebase/samples/apps/mlkit/kotlin/StillImageActivity.kt b/mlkit/app/src/main/java/com/google/firebase/samples/apps/mlkit/kotlin/StillImageActivity.kt
index 8955e5b757..4513199865 100644
--- a/mlkit/app/src/main/java/com/google/firebase/samples/apps/mlkit/kotlin/StillImageActivity.kt
+++ b/mlkit/app/src/main/java/com/google/firebase/samples/apps/mlkit/kotlin/StillImageActivity.kt
@@ -178,12 +178,12 @@ class StillImageActivity: AppCompatActivity() {
         startActivityForResult(Intent.createChooser(intent, "Select Picture"), REQUEST_CHOOSE_IMAGE)
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent) {
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if (requestCode == REQUEST_IMAGE_CAPTURE && resultCode == Activity.RESULT_OK) {
             tryReloadAndDetectInImage()
         } else if (requestCode == REQUEST_CHOOSE_IMAGE && resultCode == Activity.RESULT_OK) {
             // In this case, imageUri is returned by the chooser, save it.
-            imageUri = data.data
+            imageUri = data!!.data
             tryReloadAndDetectInImage()
         }
     }
diff --git a/mlkit/build.gradle b/mlkit/build.gradle
index 51761710bf..643e8e09d3 100644
--- a/mlkit/build.gradle
+++ b/mlkit/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.0'
         classpath 'com.google.gms:google-services:4.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/mlkit/gradle/wrapper/gradle-wrapper.properties b/mlkit/gradle/wrapper/gradle-wrapper.properties
index d9dbbd7419..8c86368c66 100644
--- a/mlkit/gradle/wrapper/gradle-wrapper.properties
+++ b/mlkit/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip
diff --git a/perf/app/build.gradle b/perf/app/build.gradle
index 104997c493..97f571a902 100644
--- a/perf/app/build.gradle
+++ b/perf/app/build.gradle
@@ -6,11 +6,11 @@ apply plugin: 'com.google.firebase.firebase-perf'
 check.dependsOn 'assembleDebugAndroidTest'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
     defaultConfig {
         applicationId "com.google.firebase.quickstart.perfmon"
         minSdkVersion 19
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -33,13 +33,13 @@ android.applicationVariants.all {
 dependencies {
     implementation project(":internal:lintchecks")
     implementation project(":internal:chooser")
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.70"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71"
 
     implementation 'com.google.firebase:firebase-core:16.0.3'
     implementation 'com.google.firebase:firebase-perf:16.1.0'
 
-    implementation 'com.android.support:support-v4:27.1.1'
-    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
 
     implementation 'com.github.bumptech.glide:glide:3.7.0'
diff --git a/perf/build.gradle b/perf/build.gradle
index c0ff8dd2b3..af6bfee9a3 100644
--- a/perf/build.gradle
+++ b/perf/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         mavenLocal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.0'
         classpath 'com.google.firebase:firebase-plugins:1.1.5'
         classpath 'com.google.gms:google-services:4.1.0'
     }
diff --git a/perf/gradle/wrapper/gradle-wrapper.properties b/perf/gradle/wrapper/gradle-wrapper.properties
index 933b6473ce..9d2dc020a2 100644
--- a/perf/gradle/wrapper/gradle-wrapper.properties
+++ b/perf/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
diff --git a/storage/app/build.gradle b/storage/app/build.gradle
index 76223500a7..a997a0a271 100644
--- a/storage/app/build.gradle
+++ b/storage/app/build.gradle
@@ -5,12 +5,12 @@ apply plugin: 'kotlin-android-extensions'
 check.dependsOn 'assembleDebugAndroidTest'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "com.google.firebase.quickstart.firebasestorage"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
@@ -25,16 +25,16 @@ android {
 }
 
 configurations.all {
-    resolutionStrategy.force 'com.android.support:support-annotations:27.1.1'
+    resolutionStrategy.force 'com.android.support:support-annotations:28.0.0'
 }
 
 dependencies {
     implementation project(":internal:lintchecks")
     implementation project(":internal:chooser")
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.70"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71"
 
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:support-v4:27.1.1'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:support-v4:28.0.0'
     implementation 'com.google.firebase:firebase-core:16.0.3'
     implementation 'com.google.firebase:firebase-auth:16.0.3'
     implementation 'com.google.firebase:firebase-storage:16.0.2'
diff --git a/storage/app/src/androidTest/java/com/google/firebase/quickstart/firebasestorage/MainActivityTest.java b/storage/app/src/androidTest/java/com/google/firebase/quickstart/firebasestorage/MainActivityTest.java
index ee266746a4..0a998fb7ba 100644
--- a/storage/app/src/androidTest/java/com/google/firebase/quickstart/firebasestorage/MainActivityTest.java
+++ b/storage/app/src/androidTest/java/com/google/firebase/quickstart/firebasestorage/MainActivityTest.java
@@ -12,7 +12,7 @@
 import android.support.test.espresso.intent.Intents;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.LargeTest;
+import android.support.test.filters.LargeTest;
 import android.util.Log;
 
 import com.google.firebase.quickstart.firebasestorage.java.MainActivity;
diff --git a/storage/app/src/main/java/com/google/firebase/quickstart/firebasestorage/kotlin/MainActivity.kt b/storage/app/src/main/java/com/google/firebase/quickstart/firebasestorage/kotlin/MainActivity.kt
index e05af4a254..0de75ccc34 100644
--- a/storage/app/src/main/java/com/google/firebase/quickstart/firebasestorage/kotlin/MainActivity.kt
+++ b/storage/app/src/main/java/com/google/firebase/quickstart/firebasestorage/kotlin/MainActivity.kt
@@ -119,11 +119,11 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
         out.putParcelable(KEY_DOWNLOAD_URL, downloadUrl)
     }
 
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent) {
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         Log.d(TAG, "onActivityResult:$requestCode:$resultCode:$data")
         if (requestCode == RC_TAKE_PICTURE) {
             if (resultCode == Activity.RESULT_OK) {
-                fileUri = data.data
+                fileUri = data?.data
 
                 if (fileUri != null) {
                     uploadFromUri(fileUri!!)
diff --git a/storage/build.gradle b/storage/build.gradle
index 8644263366..896493ea61 100644
--- a/storage/build.gradle
+++ b/storage/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.0'
         classpath 'com.google.gms:google-services:4.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/storage/gradle/wrapper/gradle-wrapper.properties b/storage/gradle/wrapper/gradle-wrapper.properties
index 933b6473ce..9d2dc020a2 100644
--- a/storage/gradle/wrapper/gradle-wrapper.properties
+++ b/storage/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip