diff --git a/android/Omnivore/app/build.gradle b/android/Omnivore/app/build.gradle
index ff48feb05..e08c9b0bd 100644
--- a/android/Omnivore/app/build.gradle
+++ b/android/Omnivore/app/build.gradle
@@ -68,7 +68,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = '1.2.0-alpha08'
+        kotlinCompilerExtensionVersion = '1.3.1'
     }
     packagingOptions {
         resources {
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/LoginViewModel.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/LoginViewModel.kt
index ae058da27..c11f32a6f 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/LoginViewModel.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/LoginViewModel.kt
@@ -268,7 +268,7 @@ class LoginViewModel @Inject constructor(
 
   fun handleGoogleAuthTask(task: Task<GoogleSignInAccount>) {
     val result = task?.getResult(ApiException::class.java)
-    val googleIdToken = result.idToken
+    val googleIdToken = result?.idToken ?: ""
 
     // If token is missing then set the error message
     if (googleIdToken == null) {
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/WelcomeScreen.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/WelcomeScreen.kt
index 7f497d556..4cdbdf232 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/WelcomeScreen.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/WelcomeScreen.kt
@@ -101,6 +101,7 @@ fun WelcomeScreenContent(viewModel: LoginViewModel) {
         )
       when (result) {
         SnackbarResult.ActionPerformed -> viewModel.resetErrorMessage()
+        else -> {}
       }
     }
 
diff --git a/android/Omnivore/build.gradle b/android/Omnivore/build.gradle
index 87ed7a37a..00a604ec9 100644
--- a/android/Omnivore/build.gradle
+++ b/android/Omnivore/build.gradle
@@ -3,21 +3,19 @@ buildscript {
         compose_version = '1.3.1'
         lifecycle_version = '2.5.1'
         hilt_version = '2.44.2'
+        gradle_plugin_version = '7.3.1'
     }
 
     dependencies {
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
-        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath "com.android.tools.build:gradle:$gradle_plugin_version"
     }
+}
 
-}// Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.2.2' apply false
-    id 'com.android.library' version '7.2.2' apply false
-    id 'org.jetbrains.kotlin.android' version '1.6.20' apply false
-//    id 'com.android.application' version '7.2.2' apply false
-//    id 'com.android.library' version '7.2.2' apply false
-//    id 'org.jetbrains.kotlin.android' version '1.7.20-Beta' apply false
+    id 'com.android.application' version "$gradle_plugin_version" apply false
+    id 'com.android.library' version "$gradle_plugin_version" apply false
+    id 'org.jetbrains.kotlin.android' version '1.7.10' apply false
 }
 
 task clean(type: Delete) {