diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 352bde60c..fc87a6cfa 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -239,7 +239,7 @@ dependencies {
         exclude("com.google.android.gms", "play-services-ads-identifier")
     }
     googleplayImplementation("com.google.firebase:firebase-config-ktx:${Versions.remote_config}")
-    googleplayImplementation("com.google.android.gms:play-services-location:18.0.0")
+    googleplayImplementation("com.google.android.gms:play-services-location:19.0.0")
     googleplayImplementation("com.google.android.gms:play-services-maps:17.0.1")
     googleplayImplementation("com.android.billingclient:billing-ktx:3.0.3")
 
diff --git a/app/src/googleplay/java/org/tasks/location/LocationServiceGooglePlay.kt b/app/src/googleplay/java/org/tasks/location/LocationServiceGooglePlay.kt
index c35f9c67a..1ebe256d7 100644
--- a/app/src/googleplay/java/org/tasks/location/LocationServiceGooglePlay.kt
+++ b/app/src/googleplay/java/org/tasks/location/LocationServiceGooglePlay.kt
@@ -27,8 +27,7 @@ class LocationServiceGooglePlay @Inject constructor(
                     .lastLocation
                     .addOnSuccessListener {
                         cont.resumeWith(
-                                it?.let { Result.success(MapPosition(it.latitude, it.longitude)) }
-                                        ?: Result.failure(NullPointerException())
+                                it.let { Result.success(MapPosition(it.latitude, it.longitude)) }
                         )
                     }
                     .addOnFailureListener { cont.resumeWith(Result.failure(it)) }
@@ -69,7 +68,7 @@ class LocationServiceGooglePlay @Inject constructor(
         }
         return Geofence.Builder()
                 .setCircularRegion(geofence.latitude, geofence.longitude, geofence.radius.toFloat())
-                .setRequestId(geofence.uid)
+                .setRequestId(geofence.uid!!)
                 .setTransitionTypes(transitionTypes)
                 .setExpirationDuration(Geofence.NEVER_EXPIRE)
                 .build()
diff --git a/deps_googleplay.txt b/deps_googleplay.txt
index 5872870b8..4f2c331e6 100644
--- a/deps_googleplay.txt
+++ b/deps_googleplay.txt
@@ -116,15 +116,15 @@
 +|    |         +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
 +|    |         \--- com.google.firebase:firebase-encoders:17.0.0 (*)
 +|    +--- com.google.android.datatransport:transport-runtime:3.0.0 (*)
-+|    +--- com.google.android.gms:play-services-tasks:17.0.0 -> 17.2.0
-+|    |    \--- com.google.android.gms:play-services-basement:17.4.0 -> 17.5.0
++|    +--- com.google.android.gms:play-services-tasks:17.0.0 -> 18.0.0
++|    |    \--- com.google.android.gms:play-services-basement:18.0.0
 +|    |         +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
 +|    |         +--- androidx.core:core:1.2.0 -> 1.6.0 (*)
 +|    |         \--- androidx.fragment:fragment:1.0.0 -> 1.3.6 (*)
 +|    +--- com.google.firebase:firebase-annotations:16.0.0
 +|    +--- com.google.firebase:firebase-common:20.0.0
-+|    |    +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*)
-+|    |    +--- com.google.android.gms:play-services-tasks:17.0.0 -> 17.2.0 (*)
++|    |    +--- com.google.android.gms:play-services-basement:17.0.0 -> 18.0.0 (*)
++|    |    +--- com.google.android.gms:play-services-tasks:17.0.0 -> 18.0.0 (*)
 +|    |    \--- com.google.firebase:firebase-components:17.0.0
 +|    |         +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
 +|    |         \--- com.google.firebase:firebase-annotations:16.0.0
@@ -132,15 +132,15 @@
 +|    +--- com.google.firebase:firebase-encoders:17.0.0 (*)
 +|    +--- com.google.firebase:firebase-encoders-json:18.0.0 (*)
 +|    +--- com.google.firebase:firebase-installations:17.0.0
-+|    |    +--- com.google.android.gms:play-services-tasks:17.0.0 -> 17.2.0 (*)
++|    |    +--- com.google.android.gms:play-services-tasks:17.0.0 -> 18.0.0 (*)
 +|    |    +--- com.google.firebase:firebase-common:20.0.0 (*)
 +|    |    +--- com.google.firebase:firebase-components:17.0.0 (*)
 +|    |    \--- com.google.firebase:firebase-installations-interop:17.0.0
-+|    |         +--- com.google.android.gms:play-services-tasks:17.0.0 -> 17.2.0 (*)
++|    |         +--- com.google.android.gms:play-services-tasks:17.0.0 -> 18.0.0 (*)
 +|    |         \--- com.google.firebase:firebase-annotations:16.0.0
 +|    +--- com.google.firebase:firebase-installations-interop:17.0.0 (*)
 +|    \--- com.google.firebase:firebase-measurement-connector:18.0.2 -> 19.0.0
-+|         +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*)
++|         +--- com.google.android.gms:play-services-basement:17.0.0 -> 18.0.0 (*)
 +|         \--- com.google.firebase:firebase-annotations:16.0.0
 ++--- com.google.firebase:firebase-analytics:19.0.1
 +|    +--- com.google.android.gms:play-services-measurement:19.0.1
@@ -155,25 +155,25 @@
 +|    |    |    |    \--- androidx.annotation:annotation:1.0.0 -> 1.2.0
 +|    |    |    \--- androidx.print:print:1.0.0
 +|    |    |         \--- androidx.annotation:annotation:1.0.0 -> 1.2.0
-+|    |    +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*)
++|    |    +--- com.google.android.gms:play-services-basement:17.0.0 -> 18.0.0 (*)
 +|    |    +--- com.google.android.gms:play-services-measurement-base:19.0.1
-+|    |    |    \--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*)
++|    |    |    \--- com.google.android.gms:play-services-basement:17.0.0 -> 18.0.0 (*)
 +|    |    +--- com.google.android.gms:play-services-measurement-impl:19.0.1
 +|    |    |    +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
 +|    |    |    +--- androidx.core:core:1.0.0 -> 1.6.0 (*)
-+|    |    |    +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*)
++|    |    |    +--- com.google.android.gms:play-services-basement:17.0.0 -> 18.0.0 (*)
 +|    |    |    +--- com.google.android.gms:play-services-measurement-base:19.0.1 (*)
 +|    |    |    \--- com.google.android.gms:play-services-stats:17.0.0
 +|    |    |         +--- androidx.legacy:legacy-support-core-utils:1.0.0 (*)
-+|    |    |         \--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*)
++|    |    |         \--- com.google.android.gms:play-services-basement:17.0.0 -> 18.0.0 (*)
 +|    |    \--- com.google.android.gms:play-services-stats:17.0.0 (*)
 +|    +--- com.google.android.gms:play-services-measurement-api:19.0.1
-+|    |    +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*)
++|    |    +--- com.google.android.gms:play-services-basement:17.0.0 -> 18.0.0 (*)
 +|    |    +--- com.google.android.gms:play-services-measurement-base:19.0.1 (*)
 +|    |    +--- com.google.android.gms:play-services-measurement-sdk-api:19.0.1
-+|    |    |    +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*)
++|    |    |    +--- com.google.android.gms:play-services-basement:17.0.0 -> 18.0.0 (*)
 +|    |    |    \--- com.google.android.gms:play-services-measurement-base:19.0.1 (*)
-+|    |    +--- com.google.android.gms:play-services-tasks:17.0.0 -> 17.2.0 (*)
++|    |    +--- com.google.android.gms:play-services-tasks:17.0.0 -> 18.0.0 (*)
 +|    |    +--- com.google.firebase:firebase-common:20.0.0 (*)
 +|    |    +--- com.google.firebase:firebase-components:17.0.0 (*)
 +|    |    +--- com.google.firebase:firebase-installations:17.0.0 (*)
@@ -181,13 +181,13 @@
 +|    |    \--- com.google.firebase:firebase-measurement-connector:19.0.0 (*)
 +|    \--- com.google.android.gms:play-services-measurement-sdk:19.0.1
 +|         +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
-+|         +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*)
++|         +--- com.google.android.gms:play-services-basement:17.0.0 -> 18.0.0 (*)
 +|         +--- com.google.android.gms:play-services-measurement-base:19.0.1 (*)
 +|         \--- com.google.android.gms:play-services-measurement-impl:19.0.1 (*)
 ++--- com.google.firebase:firebase-config-ktx:21.0.1
 +|    +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
 +|    +--- com.google.firebase:firebase-abt:21.0.0
-+|    |    +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*)
++|    |    +--- com.google.android.gms:play-services-basement:17.0.0 -> 18.0.0 (*)
 +|    |    +--- com.google.firebase:firebase-common:20.0.0 (*)
 +|    |    +--- com.google.firebase:firebase-components:17.0.0 (*)
 +|    |    \--- com.google.firebase:firebase-measurement-connector:18.0.0 -> 19.0.0 (*)
@@ -199,7 +199,7 @@
 +|    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72 -> 1.5.31 (*)
 +|    +--- com.google.firebase:firebase-components:17.0.0 (*)
 +|    +--- com.google.firebase:firebase-config:21.0.1
-+|    |    +--- com.google.android.gms:play-services-tasks:17.0.2 -> 17.2.0 (*)
++|    |    +--- com.google.android.gms:play-services-tasks:17.0.2 -> 18.0.0 (*)
 +|    |    +--- com.google.firebase:firebase-abt:21.0.0 (*)
 +|    |    +--- com.google.firebase:firebase-common:20.0.0 (*)
 +|    |    +--- com.google.firebase:firebase-components:17.0.0 (*)
@@ -209,21 +209,21 @@
 +|    +--- com.google.firebase:firebase-installations:17.0.0 (*)
 +|    +--- com.google.firebase:firebase-installations-interop:17.0.0 (*)
 +|    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72 -> 1.5.31 (*)
-++--- com.google.android.gms:play-services-location:18.0.0
-+|    +--- com.google.android.gms:play-services-base:17.5.0
+++--- com.google.android.gms:play-services-location:19.0.0
++|    +--- com.google.android.gms:play-services-base:18.0.0
 +|    |    +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
 +|    |    +--- androidx.core:core:1.2.0 -> 1.6.0 (*)
 +|    |    +--- androidx.fragment:fragment:1.0.0 -> 1.3.6 (*)
-+|    |    +--- com.google.android.gms:play-services-basement:17.5.0 (*)
-+|    |    \--- com.google.android.gms:play-services-tasks:17.2.0 (*)
-+|    +--- com.google.android.gms:play-services-basement:17.5.0 (*)
++|    |    +--- com.google.android.gms:play-services-basement:18.0.0 (*)
++|    |    \--- com.google.android.gms:play-services-tasks:18.0.0 (*)
++|    +--- com.google.android.gms:play-services-basement:18.0.0 (*)
 +|    +--- com.google.android.gms:play-services-places-placereport:17.0.0
-+|    |    \--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*)
-+|    \--- com.google.android.gms:play-services-tasks:17.1.0 -> 17.2.0 (*)
++|    |    \--- com.google.android.gms:play-services-basement:17.0.0 -> 18.0.0 (*)
++|    \--- com.google.android.gms:play-services-tasks:18.0.0 (*)
 ++--- com.google.android.gms:play-services-maps:17.0.1
 +|    +--- androidx.fragment:fragment:1.0.0 -> 1.3.6 (*)
-+|    +--- com.google.android.gms:play-services-base:17.0.0 -> 17.5.0 (*)
-+|    \--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*)
++|    +--- com.google.android.gms:play-services-base:17.0.0 -> 18.0.0 (*)
++|    \--- com.google.android.gms:play-services-basement:17.0.0 -> 18.0.0 (*)
 ++--- com.android.billingclient:billing-ktx:3.0.3
 +|    +--- com.android.billingclient:billing:3.0.3
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.5.31 (*)