From e695304dcdcb487196b29b4938aac0f01ca5e8a8 Mon Sep 17 00:00:00 2001
From: Chris Arriola <carriola@google.com>
Date: Wed, 25 Mar 2020 10:41:31 -0700
Subject: [PATCH] refactor: move core extensions to separate package.

---
 .../main/java/com/google/maps/android/ktx}/PolygonOptions.kt  | 2 +-
 .../java/com/google/maps/android/ktx}/SupportMapFragment.kt   | 2 +-
 .../java/com/google/maps/android/ktx}/PolygonOptionsTest.kt   | 4 ++--
 maps-utils-ktx/build.gradle                                   | 1 -
 4 files changed, 4 insertions(+), 5 deletions(-)
 rename {maps-utils-ktx/src/main/java/com/google/maps/android/ktx/utils/core => maps-ktx/src/main/java/com/google/maps/android/ktx}/PolygonOptions.kt (94%)
 rename {maps-utils-ktx/src/main/java/com/google/maps/android/ktx/utils/core => maps-ktx/src/main/java/com/google/maps/android/ktx}/SupportMapFragment.kt (95%)
 rename {maps-utils-ktx/src/test/java/com/google/maps/android/ktx/utils/core => maps-ktx/src/test/java/com/google/maps/android/ktx}/PolygonOptionsTest.kt (92%)

diff --git a/maps-utils-ktx/src/main/java/com/google/maps/android/ktx/utils/core/PolygonOptions.kt b/maps-ktx/src/main/java/com/google/maps/android/ktx/PolygonOptions.kt
similarity index 94%
rename from maps-utils-ktx/src/main/java/com/google/maps/android/ktx/utils/core/PolygonOptions.kt
rename to maps-ktx/src/main/java/com/google/maps/android/ktx/PolygonOptions.kt
index a9cc5105..38fd8d24 100644
--- a/maps-utils-ktx/src/main/java/com/google/maps/android/ktx/utils/core/PolygonOptions.kt
+++ b/maps-ktx/src/main/java/com/google/maps/android/ktx/PolygonOptions.kt
@@ -15,7 +15,7 @@
  *
  */
 
-package com.google.maps.android.ktx.utils.core
+package com.google.maps.android.ktx
 
 import com.google.android.gms.maps.model.PolygonOptions
 
diff --git a/maps-utils-ktx/src/main/java/com/google/maps/android/ktx/utils/core/SupportMapFragment.kt b/maps-ktx/src/main/java/com/google/maps/android/ktx/SupportMapFragment.kt
similarity index 95%
rename from maps-utils-ktx/src/main/java/com/google/maps/android/ktx/utils/core/SupportMapFragment.kt
rename to maps-ktx/src/main/java/com/google/maps/android/ktx/SupportMapFragment.kt
index 9c9eb5e2..7649ef22 100644
--- a/maps-utils-ktx/src/main/java/com/google/maps/android/ktx/utils/core/SupportMapFragment.kt
+++ b/maps-ktx/src/main/java/com/google/maps/android/ktx/SupportMapFragment.kt
@@ -15,7 +15,7 @@
  *
  */
 
-package com.google.maps.android.ktx.utils.core
+package com.google.maps.android.ktx
 
 import com.google.android.gms.maps.GoogleMap
 import com.google.android.gms.maps.SupportMapFragment
diff --git a/maps-utils-ktx/src/test/java/com/google/maps/android/ktx/utils/core/PolygonOptionsTest.kt b/maps-ktx/src/test/java/com/google/maps/android/ktx/PolygonOptionsTest.kt
similarity index 92%
rename from maps-utils-ktx/src/test/java/com/google/maps/android/ktx/utils/core/PolygonOptionsTest.kt
rename to maps-ktx/src/test/java/com/google/maps/android/ktx/PolygonOptionsTest.kt
index 230db1d9..24b49511 100644
--- a/maps-utils-ktx/src/test/java/com/google/maps/android/ktx/utils/core/PolygonOptionsTest.kt
+++ b/maps-ktx/src/test/java/com/google/maps/android/ktx/PolygonOptionsTest.kt
@@ -15,7 +15,7 @@
  *
  */
 
-package com.google.maps.android.ktx.utils.core
+package com.google.maps.android.ktx
 
 import android.graphics.Color
 import com.google.android.gms.maps.model.LatLng
@@ -26,7 +26,7 @@ class PolygonOptionsTest {
     @Test
     fun testBuilder() {
         val polygonOptions =
-            buildPolygonOptions {
+            com.google.maps.android.ktx.buildPolygonOptions {
                 strokeWidth(1.0f)
                 strokeColor(Color.BLACK)
                 add(LatLng(0.0, 0.0))
diff --git a/maps-utils-ktx/build.gradle b/maps-utils-ktx/build.gradle
index a183fe6f..dae5f668 100644
--- a/maps-utils-ktx/build.gradle
+++ b/maps-utils-ktx/build.gradle
@@ -49,7 +49,6 @@ dependencies {
     api deps.kotlin
     api deps.androidMapsUtils
     implementation deps.playServicesMaps
-    implementation deps.kotlinxCoroutines
 
     // Tests
     testImplementation deps.androidx.test