diff --git a/androidTest-shared/build.gradle b/androidTest-shared/build.gradle
index 07a3023a30..a375cdbd88 100644
--- a/androidTest-shared/build.gradle
+++ b/androidTest-shared/build.gradle
@@ -35,7 +35,7 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$rootProject.kotlinVersion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$rootProject.kotlinVersion"
 
     // Architecture Components
     implementation "androidx.lifecycle:lifecycle-extensions:$rootProject.lifecycleVersion"
diff --git a/ar/build.gradle b/ar/build.gradle
index 3f75818070..ee275d1527 100644
--- a/ar/build.gradle
+++ b/ar/build.gradle
@@ -59,5 +59,4 @@ dependencies {
     implementation "androidx.appcompat:appcompat:$rootProject.appcompatVersion"
     implementation "com.google.ar:core:$rootProject.arcoreVersion"
     implementation "com.google.android.gms:play-services-vision:$rootProject.googlePlayServicesVisionVersion"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$rootProject.kotlinVersion"
-}
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$rootProject.kotlinVersion"}
diff --git a/build.gradle b/build.gradle
index 32a6588f56..2a873c2ad9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,11 +33,11 @@ buildscript {
 
         // App dependencies
         androidGradlePluginVersion = '3.4.1'
-        appcompatVersion = '1.1.0-beta01'
-        activityVersion = '1.0.0-beta01'
+        appcompatVersion = '1.1.0'
+        activityVersion = '1.0.0'
         cardviewVersion = '1.0.0'
         archTestingVersion = '2.0.0'
-        arcoreVersion = '1.7.0'
+        arcoreVersion = '1.12.0'
         browserVersion = '1.0.0'
         constraintLayoutVersion = '1.1.3'
         coreVersion = '1.2.0-alpha02'
@@ -47,28 +47,28 @@ buildscript {
         drawerLayoutVersion = '1.1.0-alpha02'
         espressoVersion = '3.1.1'
         fabricVersion = '1.25.4'
-        firebaseAuthVersion = '18.1.0'
-        firebaseConfigVersion = '18.0.0'
-        firebaseCoreVersion = '17.0.1'
-        firebaseFirestoreVersion = '20.2.0'
-        firebaseFunctionsVersion = '18.1.0'
-        firebaseMessagingVersion = '19.0.1'
+        firebaseAuthVersion = '19.1.0'
+        firebaseConfigVersion = '19.0.2'
+        firebaseCoreVersion = '17.2.0'
+        firebaseFirestoreVersion = '21.1.1'
+        firebaseFunctionsVersion = '19.0.1'
+        firebaseMessagingVersion = '20.0.0'
         firebaseUiVersion = "4.0.0"
         flexboxVersion = "1.1.0"
         fragmentVersion = "1.1.0-beta01"
         glideVersion = "4.6.1"
         googleMapUtilsVersion = "0.5"
-        googlePlayServicesMapsVersion = '16.0.0'
-        googlePlayServicesVisionVersion = '17.0.2'
+        googlePlayServicesMapsVersion = '17.0.0'
+        googlePlayServicesVisionVersion = '18.0.0'
         googleServicesVersion = "3.2.0"
         gsonVersion = "2.8.1"
         hamcrestVersion = '1.3'
         junitVersion = '4.12'
-        kotlinVersion = '1.3.41'
-        ktxVersion = "1.0.0"
+        kotlinVersion = '1.3.50'
+        ktxVersion = "1.1.0"
         leanbackVersion = '1.0.0'
         legacySupportVersion = '1.0.0'
-        lifecycleVersion = '2.1.0-beta01'
+        lifecycleVersion = '2.2.0-alpha05'
         lottieVersion = "3.0.0"
         materialVersion = '1.1.0-alpha07'
         mockitoVersion = "2.8.9"
diff --git a/mobile/build.gradle b/mobile/build.gradle
index 550662b0f5..cee8ae5090 100644
--- a/mobile/build.gradle
+++ b/mobile/build.gradle
@@ -177,7 +177,6 @@ dependencies {
 
     // Kotlin
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$rootProject.kotlinVersion"
-
     // Instrumentation tests
     androidTestImplementation "androidx.test.espresso:espresso-core:$rootProject.espressoVersion"
     androidTestImplementation "androidx.test.espresso:espresso-contrib:$rootProject.espressoVersion"
diff --git a/model/build.gradle b/model/build.gradle
index bbc73b86ea..c77cbae2fd 100644
--- a/model/build.gradle
+++ b/model/build.gradle
@@ -24,8 +24,7 @@ dependencies {
     api "org.threeten:threetenbp:$rootProject.threetenbpVersion:no-tzdb"
     implementation "androidx.core:core-ktx:$rootProject.ktxVersion"
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$rootProject.kotlinVersion"
-}
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$rootProject.kotlinVersion"}
 
 sourceCompatibility = "1.7"
 targetCompatibility = "1.7"
diff --git a/shared/build.gradle b/shared/build.gradle
index e088fe55b8..7450bcd293 100644
--- a/shared/build.gradle
+++ b/shared/build.gradle
@@ -115,8 +115,7 @@ dependencies {
     implementation "com.squareup.okhttp3:logging-interceptor:$rootProject.okhttpVersion"
 
     // Kotlin
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$rootProject.kotlinVersion"
-
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$rootProject.kotlinVersion"
     // Dagger
     implementation "com.google.dagger:dagger-android:$rootProject.dagger"
     implementation "com.google.dagger:dagger-android-support:$rootProject.dagger"
diff --git a/shared/src/main/java/com/google/samples/apps/iosched/shared/fcm/IoschedFirebaseMessagingService.kt b/shared/src/main/java/com/google/samples/apps/iosched/shared/fcm/IoschedFirebaseMessagingService.kt
index fe70674ac6..78d1dbe09d 100644
--- a/shared/src/main/java/com/google/samples/apps/iosched/shared/fcm/IoschedFirebaseMessagingService.kt
+++ b/shared/src/main/java/com/google/samples/apps/iosched/shared/fcm/IoschedFirebaseMessagingService.kt
@@ -32,15 +32,15 @@ import java.util.concurrent.TimeUnit
  */
 class IoschedFirebaseMessagingService : DaggerFirebaseMessagingService() {
 
-    override fun onNewToken(token: String?) {
+    override fun onNewToken(token: String) {
         super.onNewToken(token)
         Timber.d("New firebase token: $token")
         // Nothing to do, we update the user's firebase token via FirebaseAuthStateUserDataSource
     }
 
-    override fun onMessageReceived(remoteMessage: RemoteMessage?) {
-        Timber.d("Message data payload: ${remoteMessage?.data}")
-        val data = remoteMessage?.data ?: return
+    override fun onMessageReceived(remoteMessage: RemoteMessage) {
+        Timber.d("Message data payload: ${remoteMessage.data}")
+        val data = remoteMessage.data
         if (data[TRIGGER_EVENT_DATA_SYNC_key] == TRIGGER_EVENT_DATA_SYNC) {
             // Schedule job on JobScheduler when FCM message with action `TRIGGER_EVENT_DATA_SYNC`
             // is received.
diff --git a/test-shared/build.gradle b/test-shared/build.gradle
index 853e68d262..dd6f11b661 100644
--- a/test-shared/build.gradle
+++ b/test-shared/build.gradle
@@ -21,7 +21,7 @@ dependencies {
 
     implementation project(":model")
     // Kotlin
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$rootProject.kotlinVersion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$rootProject.kotlinVersion"
 
     // ThreeTenBP for the shared module only. Date and time API for Java.
     testImplementation "org.threeten:threetenbp:$rootProject.threetenbpVersion"