From cd73e39e2b985fbddada60519bb8edc737208a42 Mon Sep 17 00:00:00 2001
From: Angela Yu <5506675+wangela@users.noreply.github.com>
Date: Fri, 27 Oct 2023 18:43:04 -0700
Subject: [PATCH] chore: clean up dependencies, update to maps-ktx 5.0.0

---
 app/build.gradle                  | 8 ++------
 gradle/libs.versions.toml         | 3 +--
 maps-compose-utils/build.gradle   | 2 --
 maps-compose-widgets/build.gradle | 1 -
 maps-compose/build.gradle         | 1 -
 5 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c823a2ee2..8701f609f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -58,15 +58,11 @@ dependencies {
     androidTestImplementation libs.androidx.test.compose.ui
     androidTestImplementation libs.coroutines
 
-    // Uncomment the implementation 'com.google...` declaration and comment out the project
-    // declaration if you want to test the sample app with a Maven Central release of the library.
-    //implementation  "com.google.maps.android:maps-compose:2.2.1"
+    // Instead of the lines below, regular apps would load these libraries from Maven according to
+    // the README installation instructions
     implementation project(':maps-compose')
-    //implementation  "com.google.maps.android:maps-compose-widgets:1.0.0"
     implementation project(':maps-compose-widgets')
-    //implementation  "com.google.maps.android:maps-compose-utils:1.0.0"
     implementation project(':maps-compose-utils')
-    implementation libs.maps.playservice
 }
 
 secrets {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2232406db..c8a074d53 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -13,7 +13,7 @@ junitktx = "1.1.5"
 junit = "4.13.2"
 kotlin = "1.9.10"
 material = "1.9.0"
-mapsktx = "4.0.0"
+mapsktx = "5.0.0"
 mapsecrets = "2.0.1"
 
 [libraries]
@@ -39,7 +39,6 @@ kotlin = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk7", version.ref = "ko
 kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 maps-ktx-std = { module = "com.google.maps.android:maps-ktx", version.ref = "mapsktx" }
 maps-ktx-utils = { module = "com.google.maps.android:maps-utils-ktx", version.ref = "mapsktx" }
-maps-playservice = { module = "com.google.android.gms:play-services-maps", version.require = "18.2.0" }
 maps-secrets-plugin = { module = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin", version.ref = "mapsecrets" }
 material = { module = "com.google.android.material:material", version.ref = "material" }
 test-junit = { module = "junit:junit", version.ref = "junit" }
diff --git a/maps-compose-utils/build.gradle b/maps-compose-utils/build.gradle
index 2febaa60e..c5ae7898b 100644
--- a/maps-compose-utils/build.gradle
+++ b/maps-compose-utils/build.gradle
@@ -41,7 +41,5 @@ dependencies {
     implementation platform(libs.androidx.compose.bom)
     implementation libs.androidx.compose.ui
     implementation libs.kotlin
-    implementation libs.maps.playservice
-    implementation libs.maps.ktx.std
     api libs.maps.ktx.utils
 }
diff --git a/maps-compose-widgets/build.gradle b/maps-compose-widgets/build.gradle
index ecd945fc8..ca0187bfd 100644
--- a/maps-compose-widgets/build.gradle
+++ b/maps-compose-widgets/build.gradle
@@ -42,7 +42,6 @@ dependencies {
     implementation libs.androidx.compose.material
     implementation libs.androidx.core
     implementation libs.kotlin
-    implementation libs.maps.playservice
     implementation libs.maps.ktx.std
     implementation libs.maps.ktx.utils
 
diff --git a/maps-compose/build.gradle b/maps-compose/build.gradle
index 5da3074a3..ce89fd508 100644
--- a/maps-compose/build.gradle
+++ b/maps-compose/build.gradle
@@ -39,7 +39,6 @@ dependencies {
     implementation libs.androidx.core
     implementation libs.androidx.compose.foundation
     implementation libs.kotlin
-    implementation libs.maps.playservice
     implementation libs.maps.ktx.std
 
     testImplementation libs.test.junit