From 5eed6b534e18d21f1cd1c9ccc33abf8243d94720 Mon Sep 17 00:00:00 2001
From: Angela Yu <5506675+wangela@users.noreply.github.com>
Date: Fri, 2 Jun 2023 19:26:16 -0700
Subject: [PATCH 01/26] feat!: Bump minimum to iOS 14

---
 .github/workflows/build.yml   | 6 +++---
 .github/workflows/release.yml | 6 +++---
 .github/workflows/test.yml    | 2 +-
 .releaserc                    | 2 +-
 Podfile.template              | 6 +++---
 README.md                     | 6 +++---
 samples/ObjCDemoApp/Podfile   | 4 ++--
 samples/SwiftDemoApp/Podfile  | 4 ++--
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 91642e98..98f74edd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -42,7 +42,7 @@ jobs:
 
     - name: Build DevApp
       run: |
-        xcodebuild -scheme DevApp -configuration Debug -destination "platform=iOS Simulator,OS=13.2.1,name=iPhone 8" build | xcpretty
+        xcodebuild -scheme DevApp -configuration Debug -destination "platform=iOS Simulator,OS=14.2,name=iPhone 8" build | xcpretty
 
   build_swift_sample:
     runs-on: macos-latest
@@ -62,7 +62,7 @@ jobs:
       run: |
         xcodebuild -workspace samples/SwiftDemoApp/SwiftDemoApp.xcworkspace \
           -scheme SwiftDemoApp -configuration Debug \
-          -destination "platform=iOS Simulator,OS=13.2.1,name=iPhone 8" build | xcpretty
+          -destination "platform=iOS Simulator,OS=14.2,name=iPhone 8" build | xcpretty
 
   build_objc_sample:
     runs-on: macos-latest
@@ -82,7 +82,7 @@ jobs:
       run: |
         xcodebuild -workspace samples/ObjCDemoApp/ObjCDemoApp.xcworkspace \
           -scheme ObjCDemoApp -configuration Debug \
-          -destination "platform=iOS Simulator,OS=13.2.1,name=iPhone 8" build | xcpretty
+          -destination "platform=iOS Simulator,OS=14.2,name=iPhone 8" build | xcpretty
 
   test: # used as required status check
     runs-on: ubuntu-latest
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5a864d23..96cd237c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -21,15 +21,15 @@ on:
   workflow_dispatch:
 jobs:
   release:
-    runs-on: macos-11
+    runs-on: macos-12
     steps:
     - name: Checkout
       uses: actions/checkout@v3
       with:
         token: ${{ secrets.SYNCED_GITHUB_TOKEN_REPO }}
 
-    - name: Use Xcode 13.2.1
-      run: sudo xcode-select -s /Applications/Xcode_13.2.1.app/Contents/Developer
+    - name: Use Xcode 14.2
+      run: sudo xcode-select -s /Applications/Xcode_14.2.app/Contents/Developer
 
     - name: Install Dependencies
       run: |
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 71884f0b..90bdf725 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -47,7 +47,7 @@ jobs:
 
     - name: Run unit tests
       run: |
-        xcodebuild -scheme UnitTest -configuration Debug -destination "platform=iOS Simulator,OS=13.2.1,name=iPhone 8" build test | xcpretty
+        xcodebuild -scheme UnitTest -configuration Debug -destination "platform=iOS Simulator,OS=14.2,name=iPhone 8" build test | xcpretty
 
     - name: Upload test results to CodeCov
       run: bash <(curl -s https://codecov.io/bash)
diff --git a/.releaserc b/.releaserc
index 6628c39d..993ecb8d 100644
--- a/.releaserc
+++ b/.releaserc
@@ -22,7 +22,7 @@ plugins:
 
         - files:
             - "README.md"
-          from: "([0-9]+).([0-9]+).([0-9]+)"
+          from: "(?!6.2.1|4.1.0)([0-9]+).([0-9]+).([0-9]+)"
           to: "${nextRelease.version}"
 
         - files:
diff --git a/Podfile.template b/Podfile.template
index 89687e28..85c3c4fe 100644
--- a/Podfile.template
+++ b/Podfile.template
@@ -1,10 +1,10 @@
 # [START maps_ios_utils_podfile_template]
 source 'https://github.com/CocoaPods/Specs.git'
-platform :ios, '13.0'
+platform :ios, '14.0'
 
 target 'YOUR_APPLICATION_TARGET_NAME_HERE' do
   use_frameworks!
-  pod 'GoogleMaps', '7.4.0'
-  pod 'Google-Maps-iOS-Utils', '4.1.0'
+  pod 'GoogleMaps', '8.0.0'
+  pod 'Google-Maps-iOS-Utils', '4.2.0'
 end
 # [END maps_ios_utils_podfile_template]
diff --git a/README.md b/README.md
index 3fd1dce6..b42b29b8 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ range of applications using the [Google Maps SDK for iOS][sdk].
 
 ## Requirements
 
-- iOS 13.0+
+- iOS 14.0+
 - [Maps SDK for iOS][sdk] (see [Releases](https://github.com/googlemaps/google-maps-ios-utils/releases) for minimum compatible version)
 
 ## Installation
@@ -64,12 +64,12 @@ dependencies: [
 ### [Carthage](https://github.com/Carthage/Carthage)
 
 <details>
-<summary>Only supported if using Maps SDK v4.2.0 or earlier</summary>
+<summary>Only supported if using Maps SDK v6.2.1 or earlier</summary>
 
 In your `Cartfile`:
 
 ```
-github "googlemaps/google-maps-ios-utils" ~> 4.2.0
+github "googlemaps/google-maps-ios-utils" ~> 4.1.0
 ```
 
 See the [Carthage doc] for further installation instructions.
diff --git a/samples/ObjCDemoApp/Podfile b/samples/ObjCDemoApp/Podfile
index 22039a1d..e836967b 100644
--- a/samples/ObjCDemoApp/Podfile
+++ b/samples/ObjCDemoApp/Podfile
@@ -1,8 +1,8 @@
 source 'https://cdn.cocoapods.org/'
-platform :ios, '13.0'
+platform :ios, '14.0'
 
 target 'ObjCDemoApp' do
   use_frameworks!
-  pod 'GoogleMaps', '~> 7.3'
+  pod 'GoogleMaps', '8.0.0'
   pod 'Google-Maps-iOS-Utils', :path => '../..'
 end
diff --git a/samples/SwiftDemoApp/Podfile b/samples/SwiftDemoApp/Podfile
index d77ee0aa..cf1ef0fe 100644
--- a/samples/SwiftDemoApp/Podfile
+++ b/samples/SwiftDemoApp/Podfile
@@ -1,8 +1,8 @@
 source 'https://cdn.cocoapods.org/'
-platform :ios, '13.0'
+platform :ios, '14.0'
 
 target 'SwiftDemoApp' do
   use_frameworks!
-  pod 'GoogleMaps', '~> 7.3'
+  pod 'GoogleMaps', '8.0'
   pod 'Google-Maps-iOS-Utils', :path => '../..', :testspecs => ['Tests']
 end

From a85b646d7e3cb240a1dff0f56dc2d4f8bf065cb5 Mon Sep 17 00:00:00 2001
From: Angela Yu <5506675+wangela@users.noreply.github.com>
Date: Fri, 2 Jun 2023 19:28:54 -0700
Subject: [PATCH 02/26] chore: correct dependency in SwiftDemoApp

---
 samples/SwiftDemoApp/Podfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/SwiftDemoApp/Podfile b/samples/SwiftDemoApp/Podfile
index cf1ef0fe..b29d2f80 100644
--- a/samples/SwiftDemoApp/Podfile
+++ b/samples/SwiftDemoApp/Podfile
@@ -3,6 +3,6 @@ platform :ios, '14.0'
 
 target 'SwiftDemoApp' do
   use_frameworks!
-  pod 'GoogleMaps', '8.0'
+  pod 'GoogleMaps', '8.0.0'
   pod 'Google-Maps-iOS-Utils', :path => '../..', :testspecs => ['Tests']
 end

From a0501863b77ff501c324e588fad676356949f10e Mon Sep 17 00:00:00 2001
From: Angela Yu <5506675+wangela@users.noreply.github.com>
Date: Sat, 3 Jun 2023 00:20:55 -0700
Subject: [PATCH 03/26] chore: downgrade GoogleMaps dependency until version
 bump

---
 GoogleMapsUtils.xcodeproj/project.pbxproj            | 12 ++++++------
 .../ObjCDemoApp.xcodeproj/project.pbxproj            |  8 ++++----
 samples/ObjCDemoApp/Podfile                          |  2 +-
 samples/SwiftDemoApp/Podfile                         |  2 +-
 .../SwiftDemoApp.xcodeproj/project.pbxproj           |  8 ++++----
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/GoogleMapsUtils.xcodeproj/project.pbxproj b/GoogleMapsUtils.xcodeproj/project.pbxproj
index ed0d1809..c9ccdad4 100644
--- a/GoogleMapsUtils.xcodeproj/project.pbxproj
+++ b/GoogleMapsUtils.xcodeproj/project.pbxproj
@@ -1572,7 +1572,7 @@
 					"\"${SRCROOT}/../test\"",
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/app/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1603,7 +1603,7 @@
 					"\"${SRCROOT}/../test\"",
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/app/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1666,7 +1666,7 @@
 					"\"${SRCROOT}/../src\"",
 					"\"${SRCROOT}/../test\"",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1701,7 +1701,7 @@
 					"\"${SRCROOT}/../src\"",
 					"\"${SRCROOT}/../test\"",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1752,7 +1752,7 @@
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = GoogleMapsUtils/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1806,7 +1806,7 @@
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = GoogleMapsUtils/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
diff --git a/samples/ObjCDemoApp/ObjCDemoApp.xcodeproj/project.pbxproj b/samples/ObjCDemoApp/ObjCDemoApp.xcodeproj/project.pbxproj
index 6405634e..d8b64d15 100644
--- a/samples/ObjCDemoApp/ObjCDemoApp.xcodeproj/project.pbxproj
+++ b/samples/ObjCDemoApp/ObjCDemoApp.xcodeproj/project.pbxproj
@@ -280,7 +280,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -318,7 +318,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -333,7 +333,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				INFOPLIST_FILE = ObjCDemoApp/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.google.gmsutils.DemoApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -347,7 +347,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				INFOPLIST_FILE = ObjCDemoApp/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.google.gmsutils.DemoApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
diff --git a/samples/ObjCDemoApp/Podfile b/samples/ObjCDemoApp/Podfile
index e836967b..f1e6f3d7 100644
--- a/samples/ObjCDemoApp/Podfile
+++ b/samples/ObjCDemoApp/Podfile
@@ -3,6 +3,6 @@ platform :ios, '14.0'
 
 target 'ObjCDemoApp' do
   use_frameworks!
-  pod 'GoogleMaps', '8.0.0'
+  pod 'GoogleMaps', '7.4.0'
   pod 'Google-Maps-iOS-Utils', :path => '../..'
 end
diff --git a/samples/SwiftDemoApp/Podfile b/samples/SwiftDemoApp/Podfile
index b29d2f80..7a03ecd2 100644
--- a/samples/SwiftDemoApp/Podfile
+++ b/samples/SwiftDemoApp/Podfile
@@ -3,6 +3,6 @@ platform :ios, '14.0'
 
 target 'SwiftDemoApp' do
   use_frameworks!
-  pod 'GoogleMaps', '8.0.0'
+  pod 'GoogleMaps', '7.4.0'
   pod 'Google-Maps-iOS-Utils', :path => '../..', :testspecs => ['Tests']
 end
diff --git a/samples/SwiftDemoApp/SwiftDemoApp.xcodeproj/project.pbxproj b/samples/SwiftDemoApp/SwiftDemoApp.xcodeproj/project.pbxproj
index ec2d78a9..a0d30513 100644
--- a/samples/SwiftDemoApp/SwiftDemoApp.xcodeproj/project.pbxproj
+++ b/samples/SwiftDemoApp/SwiftDemoApp.xcodeproj/project.pbxproj
@@ -304,7 +304,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -343,7 +343,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -361,7 +361,7 @@
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = SwiftDemoApp/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.google.gmsutils.DemoApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -380,7 +380,7 @@
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = SwiftDemoApp/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.google.gmsutils.DemoApp;
 				PRODUCT_NAME = "$(TARGET_NAME)";

From b1f161edfc4be85a608886f4038df532d7e7252a Mon Sep 17 00:00:00 2001
From: Angela Yu <5506675+wangela@users.noreply.github.com>
Date: Sat, 3 Jun 2023 01:39:22 -0700
Subject: [PATCH 04/26] chore: update images used in workflows

---
 .github/workflows/build.yml | 6 +++---
 .github/workflows/test.yml  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 98f74edd..77b486c3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -42,7 +42,7 @@ jobs:
 
     - name: Build DevApp
       run: |
-        xcodebuild -scheme DevApp -configuration Debug -destination "platform=iOS Simulator,OS=14.2,name=iPhone 8" build | xcpretty
+        xcodebuild -scheme DevApp -configuration Debug -destination "platform=iOS Simulator,OS=16.2,name=iPhone 14" build | xcpretty
 
   build_swift_sample:
     runs-on: macos-latest
@@ -62,7 +62,7 @@ jobs:
       run: |
         xcodebuild -workspace samples/SwiftDemoApp/SwiftDemoApp.xcworkspace \
           -scheme SwiftDemoApp -configuration Debug \
-          -destination "platform=iOS Simulator,OS=14.2,name=iPhone 8" build | xcpretty
+          -destination "platform=iOS Simulator,OS=16.2,name=iPhone 14" build | xcpretty
 
   build_objc_sample:
     runs-on: macos-latest
@@ -82,7 +82,7 @@ jobs:
       run: |
         xcodebuild -workspace samples/ObjCDemoApp/ObjCDemoApp.xcworkspace \
           -scheme ObjCDemoApp -configuration Debug \
-          -destination "platform=iOS Simulator,OS=14.2,name=iPhone 8" build | xcpretty
+          -destination "platform=iOS Simulator,OS=16.2,name=iPhone 14" build | xcpretty
 
   test: # used as required status check
     runs-on: ubuntu-latest
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 90bdf725..423398d3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -47,7 +47,7 @@ jobs:
 
     - name: Run unit tests
       run: |
-        xcodebuild -scheme UnitTest -configuration Debug -destination "platform=iOS Simulator,OS=14.2,name=iPhone 8" build test | xcpretty
+        xcodebuild -scheme UnitTest -configuration Debug -destination "platform=iOS Simulator,OS=16.2,name=iPhone 14" build test | xcpretty
 
     - name: Upload test results to CodeCov
       run: bash <(curl -s https://codecov.io/bash)

From d9b58a0cb6465086c75c463043163f3bb0c08925 Mon Sep 17 00:00:00 2001
From: Angela Yu <5506675+wangela@users.noreply.github.com>
Date: Mon, 5 Jun 2023 11:48:41 -0700
Subject: [PATCH 05/26] chore: release and test workflows

---
 .github/workflows/test.yml | 7 -------
 .releaserc                 | 5 -----
 2 files changed, 12 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 423398d3..b26c7150 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -33,15 +33,8 @@ jobs:
 
     - name: Install Dependencies
       run: |
-        brew install carthage
         sudo gem install cocoapods
 
-    - name: Carthage update
-      run: carthage update --platform iOS --use-xcframeworks
-
-    - name: Carthage build
-      run: carthage build --no-skip-current --use-xcframeworks
-
     - name: CocoaPods spec lint
       run: pod lib lint Google-Maps-iOS-Utils.podspec
 
diff --git a/.releaserc b/.releaserc
index 993ecb8d..02f1d6d6 100644
--- a/.releaserc
+++ b/.releaserc
@@ -25,11 +25,6 @@ plugins:
           from: "(?!6.2.1|4.1.0)([0-9]+).([0-9]+).([0-9]+)"
           to: "${nextRelease.version}"
 
-        - files:
-            - "README.md"
-          from: "from: \"([0-9]+).([0-9]+).([0-9]+)\""
-          to: "from: \"${nextRelease.version}\""
-
         - files:
             - "Package.swift"
           from: "v([0-9]+).([0-9]+).([0-9]+)"

From d18c32d4bb02acf0d2391353ac6e043569a0f631 Mon Sep 17 00:00:00 2001
From: Angela Yu <5506675+wangela@users.noreply.github.com>
Date: Mon, 20 Nov 2023 18:52:53 -0800
Subject: [PATCH 06/26] feat!: update to latest version of GoogleMaps

---
 Google-Maps-iOS-Utils.podspec | 2 +-
 samples/ObjCDemoApp/Podfile   | 2 +-
 samples/SwiftDemoApp/Podfile  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Google-Maps-iOS-Utils.podspec b/Google-Maps-iOS-Utils.podspec
index f6e53631..37b65df6 100644
--- a/Google-Maps-iOS-Utils.podspec
+++ b/Google-Maps-iOS-Utils.podspec
@@ -21,7 +21,7 @@ Pod::Spec.new do |s|
   s.module_name = "GoogleMapsUtils"
   s.swift_version = '5.0'
 
-  s.dependency 'GoogleMaps', '~> 7.3'
+  s.dependency 'GoogleMaps', '~> 8.3'
   s.static_framework = true
 
   s.subspec 'QuadTree' do |sp|
diff --git a/samples/ObjCDemoApp/Podfile b/samples/ObjCDemoApp/Podfile
index f1e6f3d7..274c51ca 100644
--- a/samples/ObjCDemoApp/Podfile
+++ b/samples/ObjCDemoApp/Podfile
@@ -3,6 +3,6 @@ platform :ios, '14.0'
 
 target 'ObjCDemoApp' do
   use_frameworks!
-  pod 'GoogleMaps', '7.4.0'
+  pod 'GoogleMaps', '8.3.0'
   pod 'Google-Maps-iOS-Utils', :path => '../..'
 end
diff --git a/samples/SwiftDemoApp/Podfile b/samples/SwiftDemoApp/Podfile
index 7a03ecd2..ad2c4e2b 100644
--- a/samples/SwiftDemoApp/Podfile
+++ b/samples/SwiftDemoApp/Podfile
@@ -3,6 +3,6 @@ platform :ios, '14.0'
 
 target 'SwiftDemoApp' do
   use_frameworks!
-  pod 'GoogleMaps', '7.4.0'
+  pod 'GoogleMaps', '8.3.0'
   pod 'Google-Maps-iOS-Utils', :path => '../..', :testspecs => ['Tests']
 end

From ac0d20835a5fbce0ff869b18486c32e343e2cc48 Mon Sep 17 00:00:00 2001
From: Angela Yu <5506675+wangela@users.noreply.github.com>
Date: Mon, 20 Nov 2023 19:07:15 -0800
Subject: [PATCH 07/26] chore: update minimum OS

---
 .github/workflows/release.yml | 2 +-
 Google-Maps-iOS-Utils.podspec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 96cd237c..a10356a0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -29,7 +29,7 @@ jobs:
         token: ${{ secrets.SYNCED_GITHUB_TOKEN_REPO }}
 
     - name: Use Xcode 14.2
-      run: sudo xcode-select -s /Applications/Xcode_14.2.app/Contents/Developer
+      run: sudo xcode-select -s /Applications/Xcode_14.2.app
 
     - name: Install Dependencies
       run: |
diff --git a/Google-Maps-iOS-Utils.podspec b/Google-Maps-iOS-Utils.podspec
index 37b65df6..0e66b32b 100644
--- a/Google-Maps-iOS-Utils.podspec
+++ b/Google-Maps-iOS-Utils.podspec
@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
   s.homepage     = "https://github.com/googlemaps/google-maps-ios-utils"
   s.license      = { :type => 'Apache 2.0', :file => 'LICENSE' }
   s.authors      = "Google Inc."
-  s.platform     = :ios, '13.0'
+  s.platform     = :ios, '14.0'
   s.source       = { :git => "https://github.com/googlemaps/google-maps-ios-utils.git",
                      :tag => "v#{s.version.to_s}" }
   s.requires_arc = true

From 04441e10c832ba62d6623df97208c37b2480b66d Mon Sep 17 00:00:00 2001
From: Angela Yu <5506675+wangela@users.noreply.github.com>
Date: Tue, 28 Nov 2023 16:00:22 -0800
Subject: [PATCH 08/26] chore: update workflows and README

---
 .github/workflows/build.yml   |  2 +-
 .github/workflows/release.yml |  8 +-------
 .github/workflows/test.yml    |  4 +++-
 Google-Maps-iOS-Utils.podspec |  2 +-
 Podfile.template              |  2 +-
 README.md                     | 29 ++++++++++++++++++++++++++++-
 6 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9273c14f..0d6dcec2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -34,7 +34,7 @@ jobs:
       run: sudo gem install cocoapods
 
     - name: CocoaPods spec lint
-      run: pod lib lint Google-Maps-iOS-Utils.podspec
+      run: pod spec lint Google-Maps-iOS-Utils.podspec
 
     - name: Build DevApp
       run: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a10356a0..ec93ec96 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -32,13 +32,7 @@ jobs:
       run: sudo xcode-select -s /Applications/Xcode_14.2.app
 
     - name: Install Dependencies
-      run: |
-        brew install carthage
-        sudo gem install cocoapods
-
-    - name: Carthage update
-      run: |
-        carthage build --use-xcframeworks
+      run: sudo gem install cocoapods
 
     - name: Create XCFramework
       run: |
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8bf15488..7c46288d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -31,12 +31,14 @@ jobs:
     - name: Checkout google-maps-ios-utils
       uses: actions/checkout@v3
 
+      # Lint check on the podspec
     - name: Install Dependencies
       run: sudo gem install cocoapods
 
     - name: CocoaPods spec lint
-      run: pod lib lint Google-Maps-iOS-Utils.podspec
+      run: pod spec lint Google-Maps-iOS-Utils.podspec
 
+      # Run unit tests
     - name: Run unit tests
       run: |
         xcodebuild -scheme UnitTest -configuration Debug -destination "platform=iOS Simulator,OS=16.2,name=iPhone 14" build test | xcpretty
diff --git a/Google-Maps-iOS-Utils.podspec b/Google-Maps-iOS-Utils.podspec
index 0e66b32b..e93dea43 100644
--- a/Google-Maps-iOS-Utils.podspec
+++ b/Google-Maps-iOS-Utils.podspec
@@ -21,7 +21,7 @@ Pod::Spec.new do |s|
   s.module_name = "GoogleMapsUtils"
   s.swift_version = '5.0'
 
-  s.dependency 'GoogleMaps', '~> 8.3'
+  s.dependency 'GoogleMaps'
   s.static_framework = true
 
   s.subspec 'QuadTree' do |sp|
diff --git a/Podfile.template b/Podfile.template
index c91c8899..cde934c8 100644
--- a/Podfile.template
+++ b/Podfile.template
@@ -4,7 +4,7 @@ platform :ios, '14.0'
 
 target 'YOUR_APPLICATION_TARGET_NAME_HERE' do
   use_frameworks!
-  pod 'GoogleMaps', '8.0.0'
+  pod 'GoogleMaps', '8.3.0'
   pod 'Google-Maps-iOS-Utils', '4.2.2'
 end
 # [END maps_ios_utils_podfile_template]
diff --git a/README.md b/README.md
index 1c75d102..c3add1e6 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,7 @@ range of applications using the [Google Maps SDK for iOS][sdk].
 
 - iOS 14.0+
 - [Maps SDK for iOS][sdk] (see [Releases](https://github.com/googlemaps/google-maps-ios-utils/releases) for minimum compatible version)
+- An [API key](https://developers.google.com/maps/documentation/ios-sdk/get-api-key)
 
 ## Installation
 
@@ -54,7 +55,33 @@ pod install
 
 **Note**: This feature is only available with Swift 5.3 (Xcode 12) or later.
 
-Add the following to your `dependencies` value of your `Package.swift` file.
+1. Follow the instructions for
+    [adding package dependencies to your app in Xcode](https://developer.apple.com/documentation/xcode/adding-package-dependencies-to-your-app).
+
+2. In the "Enter Package URL" field, enter this GitHub repository:
+
+  ```
+  https://github.com/googlemaps/google-maps-ios-utils
+  ```
+
+3. Select the
+    [version](https://github.com/googlemaps/google-maps-ios-utils/releases)
+    of the Maps SDK for iOS Utility Library that you want to use. For new projects, we recommend specifying the latest version and using the "Up to Next Major Version" option.
+
+4. Follow the
+    [instructions](https://developers.google.com/maps/documentation/ios-sdk/config#get-key) to add your API key to your app.
+
+Alternatively, you can add the following to the `dependencies` value of your
+`Package.swift` file:
+
+```
+dependencies: [
+  .package(
+    url: "https://github.com/googlemaps/ios-maps-sdk.git",
+    .upToNextMajor(from: "8.3.0")
+  )
+]
+```
 
 ```
 dependencies: [

From 91a70c5838faed8846f9f4a74529332fc75adb36 Mon Sep 17 00:00:00 2001
From: Angela Yu <5506675+wangela@users.noreply.github.com>
Date: Tue, 28 Nov 2023 16:08:07 -0800
Subject: [PATCH 09/26] chore: update podspec dependency to 8.0 as the floor

---
 Google-Maps-iOS-Utils.podspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Google-Maps-iOS-Utils.podspec b/Google-Maps-iOS-Utils.podspec
index e93dea43..6a2469a9 100644
--- a/Google-Maps-iOS-Utils.podspec
+++ b/Google-Maps-iOS-Utils.podspec
@@ -21,7 +21,7 @@ Pod::Spec.new do |s|
   s.module_name = "GoogleMapsUtils"
   s.swift_version = '5.0'
 
-  s.dependency 'GoogleMaps'
+  s.dependency 'GoogleMaps', '~> 8.0'
   s.static_framework = true
 
   s.subspec 'QuadTree' do |sp|

From 59b3987bec3d47a729980bfff5be908c148eb399 Mon Sep 17 00:00:00 2001
From: Angela Yu <5506675+wangela@users.noreply.github.com>
Date: Thu, 14 Dec 2023 09:24:08 -0800
Subject: [PATCH 10/26] docs: update SPM install instructions in README

---
 README.md | 35 ++++++++++++-----------------------
 1 file changed, 12 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index c3add1e6..ebbc193c 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,8 @@ pod install
 
 ### [Swift Package Manager](https://github.com/apple/swift-package-manager)
 
-**Note**: This feature is only available with Swift 5.3 (Xcode 12) or later.
+> [!NOTE]
+> This feature is only available with Swift 5.3 (Xcode 12) or later.
 
 1. Follow the instructions for
     [adding package dependencies to your app in Xcode](https://developer.apple.com/documentation/xcode/adding-package-dependencies-to-your-app).
@@ -64,34 +65,16 @@ pod install
   https://github.com/googlemaps/google-maps-ios-utils
   ```
 
+> [!IMPORTANT]
+> You also need to install the Maps SDK for iOS, which is also supported in Swift Package Manager at the URL `https://github.com/googlemaps/ios-maps-sdk`
+
 3. Select the
     [version](https://github.com/googlemaps/google-maps-ios-utils/releases)
-    of the Maps SDK for iOS Utility Library that you want to use. For new projects, we recommend specifying the latest version and using the "Up to Next Major Version" option.
+    of the Maps SDK for iOS Utility Library that you want to use. For new projects, we recommend specifying the latest version and using the "Exact Version" option.
 
 4. Follow the
     [instructions](https://developers.google.com/maps/documentation/ios-sdk/config#get-key) to add your API key to your app.
 
-Alternatively, you can add the following to the `dependencies` value of your
-`Package.swift` file:
-
-```
-dependencies: [
-  .package(
-    url: "https://github.com/googlemaps/ios-maps-sdk.git",
-    .upToNextMajor(from: "8.3.0")
-  )
-]
-```
-
-```
-dependencies: [
-  .package(
-    url: "https://github.com/googlemaps/google-maps-ios-utils.git",
-    .upToNextMinor(from: "4.2.2")
-  )
-]
-```
-
 ### [Carthage](https://github.com/Carthage/Carthage)
 
 <details>
@@ -179,6 +162,12 @@ func renderKml() {
 
 Contributions are welcome and encouraged. Please see the [contributing guide][contributing] for guidance.
 
+## Terms of Service
+
+This library uses Google Maps Platform services, and any use of Google Maps Platform is subject to the [Terms of Service](https://cloud.google.com/maps-platform/terms).
+
+For clarity, this library, and each underlying component, is not a Google Maps Platform Core Service.
+
 ## Support
 
 This library is offered via an open source [license]. It is not governed by the Google Maps Platform [Support Technical Support Services Guidelines](https://cloud.google.com/maps-platform/terms/tssg), the [SLA](https://cloud.google.com/maps-platform/terms/sla), or the [Deprecation Policy](https://cloud.google.com/maps-platform/terms) (however, any Google Maps Platform services used by the library remain subject to the Google Maps Platform Terms of Service).

From a3c0c337ec0f927a351027b743ed2065f2ca9bbb Mon Sep 17 00:00:00 2001
From: Angela Yu <5506675+wangela@users.noreply.github.com>
Date: Thu, 21 Dec 2023 02:19:47 -0800
Subject: [PATCH 11/26] fix: remove version from podspec dependency (restore
 #277)

---
 Google-Maps-iOS-Utils.podspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Google-Maps-iOS-Utils.podspec b/Google-Maps-iOS-Utils.podspec
index 6a2469a9..e93dea43 100644
--- a/Google-Maps-iOS-Utils.podspec
+++ b/Google-Maps-iOS-Utils.podspec
@@ -21,7 +21,7 @@ Pod::Spec.new do |s|
   s.module_name = "GoogleMapsUtils"
   s.swift_version = '5.0'
 
-  s.dependency 'GoogleMaps', '~> 8.0'
+  s.dependency 'GoogleMaps'
   s.static_framework = true
 
   s.subspec 'QuadTree' do |sp|

From 6b7b6ef35717dd2cec3a7875ecb673d316630107 Mon Sep 17 00:00:00 2001
From: Angela Yu <5506675+wangela@users.noreply.github.com>
Date: Thu, 21 Dec 2023 17:22:44 -0800
Subject: [PATCH 12/26] chore: update GMSMapView initializer with
 GMSMapViewOptions

---
 .../SwiftDemoApp/SwiftDemoApp/ClusteringViewController.swift  | 4 +++-
 samples/SwiftDemoApp/SwiftDemoApp/GeoJSONViewController.swift | 4 +++-
 samples/SwiftDemoApp/SwiftDemoApp/HeatmapViewController.swift | 4 +++-
 samples/SwiftDemoApp/SwiftDemoApp/KMLViewController.swift     | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/samples/SwiftDemoApp/SwiftDemoApp/ClusteringViewController.swift b/samples/SwiftDemoApp/SwiftDemoApp/ClusteringViewController.swift
index 73af8e67..76c5b4d9 100644
--- a/samples/SwiftDemoApp/SwiftDemoApp/ClusteringViewController.swift
+++ b/samples/SwiftDemoApp/SwiftDemoApp/ClusteringViewController.swift
@@ -40,7 +40,9 @@ class ClusteringViewController: UIViewController, GMSMapViewDelegate {
   override func loadView() {
     let camera = GMSCameraPosition.camera(withLatitude: kCameraLatitude,
       longitude: kCameraLongitude, zoom: 10)
-    mapView = GMSMapView.map(withFrame: CGRect.zero, camera: camera)
+    let options = GMSMapViewOptions()
+    options.camera = camera
+    mapView = GMSMapView.init(options: options)
     self.view = mapView
   }
 
diff --git a/samples/SwiftDemoApp/SwiftDemoApp/GeoJSONViewController.swift b/samples/SwiftDemoApp/SwiftDemoApp/GeoJSONViewController.swift
index 36872f40..a69ba501 100644
--- a/samples/SwiftDemoApp/SwiftDemoApp/GeoJSONViewController.swift
+++ b/samples/SwiftDemoApp/SwiftDemoApp/GeoJSONViewController.swift
@@ -24,7 +24,9 @@ class GeoJSONViewController: UIViewController {
 
   override func loadView() {
     let camera = GMSCameraPosition.camera(withLatitude: -28, longitude: 137, zoom: 4)
-    mapView = GMSMapView.map(withFrame: CGRect.zero, camera: camera)
+    let options = GMSMapViewOptions()
+    options.camera = camera
+    mapView = GMSMapView.init(options: options)
     self.view = mapView
     guard let path = Bundle.main.path(forResource: "GeoJSON_sample", ofType: "json") else {
         NSLog("Resource not available")
diff --git a/samples/SwiftDemoApp/SwiftDemoApp/HeatmapViewController.swift b/samples/SwiftDemoApp/SwiftDemoApp/HeatmapViewController.swift
index 2e943c23..4bb6858b 100644
--- a/samples/SwiftDemoApp/SwiftDemoApp/HeatmapViewController.swift
+++ b/samples/SwiftDemoApp/SwiftDemoApp/HeatmapViewController.swift
@@ -28,7 +28,9 @@ class HeatmapViewController: UIViewController, GMSMapViewDelegate {
 
   override func loadView() {
     let camera = GMSCameraPosition.camera(withLatitude: -37.848, longitude: 145.001, zoom: 10)
-    mapView = GMSMapView.map(withFrame: CGRect.zero, camera: camera)
+    let options = GMSMapViewOptions()
+    options.camera = camera
+    mapView = GMSMapView.init(options: options)
     mapView.delegate = self
     self.view = mapView
     makeButton()
diff --git a/samples/SwiftDemoApp/SwiftDemoApp/KMLViewController.swift b/samples/SwiftDemoApp/SwiftDemoApp/KMLViewController.swift
index ddea0556..e76dc58e 100644
--- a/samples/SwiftDemoApp/SwiftDemoApp/KMLViewController.swift
+++ b/samples/SwiftDemoApp/SwiftDemoApp/KMLViewController.swift
@@ -25,7 +25,9 @@ class KMLViewController: UIViewController {
 
   override func loadView() {
     let camera = GMSCameraPosition.camera(withLatitude: 37.4220, longitude: -122.0841, zoom: 17)
-    mapView = GMSMapView.map(withFrame: CGRect.zero, camera: camera)
+    let options = GMSMapViewOptions()
+    options.camera = camera
+    mapView = GMSMapView.init(options: options)
     self.view = mapView
     guard let path = Bundle.main.path(forResource: "KML_Sample", ofType: "kml") else  {
         NSLog("Resource not available")

From 05b8ef4b2663835eae18e229853789c5a78979db Mon Sep 17 00:00:00 2001
From: Angela Yu <5506675+wangela@users.noreply.github.com>
Date: Thu, 21 Dec 2023 19:00:58 -0800
Subject: [PATCH 13/26] chore: migrate from deprecated
 UIGraphicsBeginImageContext

---
 .../SwiftDemoApp.xcodeproj/project.pbxproj    |  5 +-
 .../SwiftDemoApp/AppDelegate.swift            |  4 +-
 .../View/GMUDefaultClusterIconGenerator.m     | 68 +++++++++----------
 3 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/samples/SwiftDemoApp/SwiftDemoApp.xcodeproj/project.pbxproj b/samples/SwiftDemoApp/SwiftDemoApp.xcodeproj/project.pbxproj
index a0d30513..6c049bc9 100644
--- a/samples/SwiftDemoApp/SwiftDemoApp.xcodeproj/project.pbxproj
+++ b/samples/SwiftDemoApp/SwiftDemoApp.xcodeproj/project.pbxproj
@@ -216,12 +216,11 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-SwiftDemoApp/Pods-SwiftDemoApp-resources.sh",
-				"${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.xcframework/ios-arm64/GoogleMaps.framework/Resources/GoogleMaps.bundle",
-				"${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.xcframework/ios-arm64_x86_64-simulator/GoogleMaps.framework/Resources/GoogleMaps.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/GoogleMaps/GoogleMapsResources.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMaps.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMapsResources.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
diff --git a/samples/SwiftDemoApp/SwiftDemoApp/AppDelegate.swift b/samples/SwiftDemoApp/SwiftDemoApp/AppDelegate.swift
index f96e5415..bd31f863 100644
--- a/samples/SwiftDemoApp/SwiftDemoApp/AppDelegate.swift
+++ b/samples/SwiftDemoApp/SwiftDemoApp/AppDelegate.swift
@@ -29,8 +29,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
       fatalError("Please provide an API Key using mapsAPIKey")
     }
     GMSServices.provideAPIKey(mapsAPIKey)
-    let masterViewControler = MasterViewController()
-    let navigationController = UINavigationController(rootViewController: masterViewControler)
+    let masterViewController = MasterViewController()
+    let navigationController = UINavigationController(rootViewController: masterViewController)
     window?.rootViewController = navigationController
     return true
   }
diff --git a/src/Clustering/View/GMUDefaultClusterIconGenerator.m b/src/Clustering/View/GMUDefaultClusterIconGenerator.m
index a33b019c..23eff411 100644
--- a/src/Clustering/View/GMUDefaultClusterIconGenerator.m
+++ b/src/Clustering/View/GMUDefaultClusterIconGenerator.m
@@ -142,24 +142,28 @@ - (UIImage *)iconForText:(NSString *)text withBaseImage:(UIImage *)image {
 
   UIFont *font = [UIFont boldSystemFontOfSize:12];
   CGSize size = image.size;
-  UIGraphicsBeginImageContextWithOptions(size, NO, 0.0f);
-  [image drawInRect:CGRectMake(0, 0, size.width, size.height)];
-  CGRect rect = CGRectMake(0, 0, image.size.width, image.size.height);
-
-  NSMutableParagraphStyle *paragraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
-  paragraphStyle.alignment = NSTextAlignmentCenter;
-  NSDictionary *attributes = @{
-    NSFontAttributeName : font,
-    NSParagraphStyleAttributeName : paragraphStyle,
-    NSForegroundColorAttributeName : [UIColor whiteColor]
-  };
-  CGSize textSize = [text sizeWithAttributes:attributes];
-  CGRect textRect = CGRectInset(rect, (rect.size.width - textSize.width) / 2,
-                                (rect.size.height - textSize.height) / 2);
-  [text drawInRect:CGRectIntegral(textRect) withAttributes:attributes];
-
-  UIImage *newImage = UIGraphicsGetImageFromCurrentImageContext();
-  UIGraphicsEndImageContext();
+  UIGraphicsImageRendererFormat * rendererFormat = [UIGraphicsImageRendererFormat defaultFormat];
+  rendererFormat.opaque = NO;
+  rendererFormat.scale = 0.0f;
+  UIGraphicsImageRenderer *renderer = [[UIGraphicsImageRenderer alloc] initWithSize:size format: rendererFormat];
+
+
+  UIImage *newImage = [renderer imageWithActions:^(UIGraphicsImageRendererContext * ctx) {
+    [image drawInRect:CGRectMake(0, 0, size.width, size.height)];
+    CGRect rect = CGRectMake(0, 0, image.size.width, image.size.height);
+
+    NSMutableParagraphStyle *paragraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
+    paragraphStyle.alignment = NSTextAlignmentCenter;
+    NSDictionary *attributes = @{
+      NSFontAttributeName : font,
+      NSParagraphStyleAttributeName : paragraphStyle,
+      NSForegroundColorAttributeName : [UIColor whiteColor]
+    };
+    CGSize textSize = [text sizeWithAttributes:attributes];
+    CGRect textRect = CGRectInset(rect, (rect.size.width - textSize.width) / 2,
+                                  (rect.size.height - textSize.height) / 2);
+    [text drawInRect:CGRectIntegral(textRect) withAttributes:attributes];
+  }];
 
   [_iconCache setObject:newImage forKey:text];
   return newImage;
@@ -185,25 +189,21 @@ - (UIImage *)iconForText:(NSString *)text withBucketIndex:(NSUInteger)bucketInde
   // larger buckets).
   CGFloat rectDimension = MAX(20, MAX(textSize.width, textSize.height)) + 3 * bucketIndex + 6;
   CGRect rect = CGRectMake(0.f, 0.f, rectDimension, rectDimension);
-  UIGraphicsBeginImageContext(rect.size);
+  UIGraphicsImageRenderer * renderer = [[UIGraphicsImageRenderer alloc] initWithSize:rect.size];
 
   // Draw background circle.
-  UIGraphicsBeginImageContextWithOptions(rect.size, NO, 0.0f);
-  CGContextRef ctx = UIGraphicsGetCurrentContext();
-  CGContextSaveGState(ctx);
   bucketIndex = MIN(bucketIndex, _backgroundColors.count - 1);
-  UIColor *backColor = _backgroundColors[bucketIndex];
-  CGContextSetFillColorWithColor(ctx, backColor.CGColor);
-  CGContextFillEllipseInRect(ctx, rect);
-  CGContextRestoreGState(ctx);
-
-  // Draw text.
-  [[UIColor whiteColor] set];
-  CGRect textRect = CGRectInset(rect, (rect.size.width - textSize.width) / 2,
-                                (rect.size.height - textSize.height) / 2);
-  [text drawInRect:CGRectIntegral(textRect) withAttributes:attributes];
-  UIImage *newImage = UIGraphicsGetImageFromCurrentImageContext();
-  UIGraphicsEndImageContext();
+  UIImage *newImage = [renderer imageWithActions:^(UIGraphicsImageRendererContext * _Nonnull ctx) {
+    UIColor *backColor = _backgroundColors[bucketIndex];
+    CGContextSetFillColorWithColor(ctx.CGContext, backColor.CGColor);
+    CGContextFillEllipseInRect(ctx.CGContext, rect);
+
+    // Draw text.
+    [[UIColor whiteColor] set];
+    CGRect textRect = CGRectInset(rect, (rect.size.width - textSize.width) / 2,
+                                  (rect.size.height - textSize.height) / 2);
+    [text drawInRect:CGRectIntegral(textRect) withAttributes:attributes];
+  }];
 
   [_iconCache setObject:newImage forKey:text];
   return newImage;

From 0720ccd149e594ef8d9f83c81588bb574d78ddd4 Mon Sep 17 00:00:00 2001
From: Angela Yu <5506675+wangela@users.noreply.github.com>
Date: Thu, 21 Dec 2023 19:07:28 -0800
Subject: [PATCH 14/26] chore: update obj-c sample app GMSMapView initializer

---
 samples/ObjCDemoApp/ObjCDemoApp.xcodeproj/project.pbxproj | 5 ++---
 samples/ObjCDemoApp/ObjCDemoApp/ViewController.m          | 4 +++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/samples/ObjCDemoApp/ObjCDemoApp.xcodeproj/project.pbxproj b/samples/ObjCDemoApp/ObjCDemoApp.xcodeproj/project.pbxproj
index d8b64d15..a67b00bb 100644
--- a/samples/ObjCDemoApp/ObjCDemoApp.xcodeproj/project.pbxproj
+++ b/samples/ObjCDemoApp/ObjCDemoApp.xcodeproj/project.pbxproj
@@ -197,12 +197,11 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-ObjCDemoApp/Pods-ObjCDemoApp-resources.sh",
-				"${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.xcframework/ios-arm64/GoogleMaps.framework/Resources/GoogleMaps.bundle",
-				"${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.xcframework/ios-arm64_x86_64-simulator/GoogleMaps.framework/Resources/GoogleMaps.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/GoogleMaps/GoogleMapsResources.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMaps.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMapsResources.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
diff --git a/samples/ObjCDemoApp/ObjCDemoApp/ViewController.m b/samples/ObjCDemoApp/ObjCDemoApp/ViewController.m
index c3fa10dd..2a749038 100644
--- a/samples/ObjCDemoApp/ObjCDemoApp/ViewController.m
+++ b/samples/ObjCDemoApp/ObjCDemoApp/ViewController.m
@@ -55,7 +55,9 @@ @implementation ViewController {
 - (void)loadView {
   GMSCameraPosition *camera =
       [GMSCameraPosition cameraWithLatitude:kCameraLatitude longitude:kCameraLongitude zoom:10];
-  _mapView = [GMSMapView mapWithFrame:CGRectZero camera:camera];
+  GMSMapViewOptions *options = [[GMSMapViewOptions alloc] init];
+  options.camera = camera;
+  _mapView = [[GMSMapView alloc] initWithOptions:options];
   self.view = _mapView;
 }
 

From bdf509dfbdf5a6c70b7b9e42284fc075ceeaefcb Mon Sep 17 00:00:00 2001
From: Angela Yu <5506675+wangela@users.noreply.github.com>
Date: Thu, 21 Dec 2023 19:18:24 -0800
Subject: [PATCH 15/26] chore: update GMSMapView initializer in dev app

---
 app/BasicViewController.m        | 4 +++-
 app/CustomMarkerViewController.m | 4 +++-
 app/GeoJSONViewController.m      | 4 +++-
 app/HeatmapViewController.m      | 4 +++-
 app/KMLViewController.m          | 4 +++-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/BasicViewController.m b/app/BasicViewController.m
index 88ea272b..4b5d96f6 100644
--- a/app/BasicViewController.m
+++ b/app/BasicViewController.m
@@ -45,7 +45,9 @@ @implementation BasicViewController {
 - (void)loadView {
   GMSCameraPosition *camera =
       [GMSCameraPosition cameraWithLatitude:kCameraLatitude longitude:kCameraLongitude zoom:10];
-  _mapView = [GMSMapView mapWithFrame:CGRectZero camera:camera];
+  GMSMapViewOptions *options = [[GMSMapViewOptions alloc] init];
+  options.camera = camera;
+  _mapView = [[GMSMapView alloc] initWithOptions:options];
   self.view = _mapView;
 }
 
diff --git a/app/CustomMarkerViewController.m b/app/CustomMarkerViewController.m
index 43e6e318..d36e7b28 100644
--- a/app/CustomMarkerViewController.m
+++ b/app/CustomMarkerViewController.m
@@ -98,7 +98,9 @@ @implementation CustomMarkerViewController {
 - (void)loadView {
   GMSCameraPosition *camera =
       [GMSCameraPosition cameraWithLatitude:kCameraLatitude longitude:kCameraLongitude zoom:10];
-  _mapView = [GMSMapView mapWithFrame:CGRectZero camera:camera];
+  GMSMapViewOptions *options = [[GMSMapViewOptions alloc] init];
+  options.camera = camera;
+  _mapView = [[GMSMapView alloc] initWithOptions:options];
   self.view = _mapView;
 
   id<GMUClusterAlgorithm> algorithm = [[GMUNonHierarchicalDistanceBasedAlgorithm alloc] init];
diff --git a/app/GeoJSONViewController.m b/app/GeoJSONViewController.m
index 841af0b1..f002f358 100644
--- a/app/GeoJSONViewController.m
+++ b/app/GeoJSONViewController.m
@@ -33,7 +33,9 @@ - (void)loadView {
   GMSCameraPosition *camera = [GMSCameraPosition cameraWithLatitude:kCameraLatitude
                                                           longitude:kCameraLongitude
                                                                zoom:1];
-  _mapView = [GMSMapView mapWithFrame:CGRectZero camera:camera];
+  GMSMapViewOptions *options = [[GMSMapViewOptions alloc] init];
+  options.camera = camera;
+  _mapView = [[GMSMapView alloc] initWithOptions:options];
   self.view = _mapView;
 }
 
diff --git a/app/HeatmapViewController.m b/app/HeatmapViewController.m
index b525ee2d..3e23a990 100644
--- a/app/HeatmapViewController.m
+++ b/app/HeatmapViewController.m
@@ -37,7 +37,9 @@ @implementation HeatmapViewController {
 - (void)loadView {
   GMSCameraPosition *camera =
       [GMSCameraPosition cameraWithLatitude:kCameraLatitude longitude:kCameraLongitude zoom:4];
-  _mapView = [GMSMapView mapWithFrame:CGRectZero camera:camera];
+  GMSMapViewOptions *options = [[GMSMapViewOptions alloc] init];
+  options.camera = camera;
+  _mapView = [[GMSMapView alloc] initWithOptions:options];
   self.view = _mapView;
 }
 
diff --git a/app/KMLViewController.m b/app/KMLViewController.m
index 4cfbb521..250fb85b 100644
--- a/app/KMLViewController.m
+++ b/app/KMLViewController.m
@@ -32,7 +32,9 @@ @implementation KMLViewController {
 - (void)loadView {
   GMSCameraPosition *camera =
       [GMSCameraPosition cameraWithLatitude:kCameraLatitude longitude:kCameraLongitude zoom:17];
-  _mapView = [GMSMapView mapWithFrame:CGRectZero camera:camera];
+  GMSMapViewOptions *options = [[GMSMapViewOptions alloc] init];
+  options.camera = camera;
+  _mapView = [[GMSMapView alloc] initWithOptions:options];
   self.view = _mapView;
 }
 

From a1dd9bb5df0dae48ffa93bc4088b91e6831a3a4d Mon Sep 17 00:00:00 2001
From: Angela Yu <5506675+wangela@users.noreply.github.com>
Date: Thu, 21 Dec 2023 19:28:33 -0800
Subject: [PATCH 16/26] chore: update GMSMapView initializer in test app

---
 .../SwiftDemoApp/HeatMapInterpolationViewController.swift     | 4 +++-
 samples/SwiftDemoApp/SwiftDemoApp/ViewController.swift        | 4 +++-
 test/unit/Heatmap/GMUHeatmapTileLayerTest.swift               | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/samples/SwiftDemoApp/SwiftDemoApp/HeatMapInterpolationViewController.swift b/samples/SwiftDemoApp/SwiftDemoApp/HeatMapInterpolationViewController.swift
index 2940a6ab..ace2f760 100644
--- a/samples/SwiftDemoApp/SwiftDemoApp/HeatMapInterpolationViewController.swift
+++ b/samples/SwiftDemoApp/SwiftDemoApp/HeatMapInterpolationViewController.swift
@@ -44,7 +44,9 @@ class HeatMapInterpolationViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         let camera = GMSCameraPosition.camera(withLatitude: -33.86, longitude: 145.20, zoom: 5.0)
-        mapView = GMSMapView.map(withFrame: view.frame, camera: camera)
+      let options = GMSMapViewOptions()
+      options.camera = camera
+      mapView = GMSMapView.init(options: options)
         view.addSubview(mapView)
         view.bringSubviewToFront(renderButton)
         view.bringSubviewToFront(defaultRender)
diff --git a/samples/SwiftDemoApp/SwiftDemoApp/ViewController.swift b/samples/SwiftDemoApp/SwiftDemoApp/ViewController.swift
index d8857e55..24053f50 100644
--- a/samples/SwiftDemoApp/SwiftDemoApp/ViewController.swift
+++ b/samples/SwiftDemoApp/SwiftDemoApp/ViewController.swift
@@ -39,7 +39,9 @@ class ViewController: UIViewController, GMUClusterManagerDelegate, GMSMapViewDel
   override func loadView() {
     let camera = GMSCameraPosition.cameraWithLatitude(kCameraLatitude,
       longitude: kCameraLongitude, zoom: 10)
-    mapView = GMSMapView.mapWithFrame(CGRect.zero, camera: camera)
+    let options = GMSMapViewOptions()
+    options.camera = camera
+    mapView = GMSMapView.init(options: options)
     self.view = mapView
   }
 
diff --git a/test/unit/Heatmap/GMUHeatmapTileLayerTest.swift b/test/unit/Heatmap/GMUHeatmapTileLayerTest.swift
index 0143e0a9..b72bddd3 100644
--- a/test/unit/Heatmap/GMUHeatmapTileLayerTest.swift
+++ b/test/unit/Heatmap/GMUHeatmapTileLayerTest.swift
@@ -68,7 +68,9 @@ class GMUHeatmapTileLayerTest: XCTestCase {
     heatmapTileLayer.minimumZoomIntensity = 5
     heatmapTileLayer.maximumZoomIntensity = 10
     let camera = GMSCameraPosition.camera(withLatitude: cameraLatitude, longitude: cameraLongitude, zoom: 4)
-    heatmapTileLayer.map = GMSMapView.map(withFrame: .zero, camera: camera)
+    let options = GMSMapViewOptions()
+    options.camera = camera
+    heatmapTileLayer.map = GMSMapView.init(options: options)
     XCTAssertEqual(gradientColor, heatmapTileLayer.gradient.colors)
     XCTAssertNotEqual(weightedData, heatmapTileLayer.weightedData)
     XCTAssertEqual(radius, heatmapTileLayer.radius)

From b7c73227a6606b4bc51f86eb33b7b7a6cdefdc6f Mon Sep 17 00:00:00 2001
From: Angela Yu <5506675+wangela@users.noreply.github.com>
Date: Thu, 21 Dec 2023 22:23:35 -0800
Subject: [PATCH 17/26] chore: update test since migration to imageRenderer
 returns non-nil images

---
 Podfile.template                                          | 2 +-
 samples/ObjCDemoApp/Podfile                               | 2 +-
 samples/SwiftDemoApp/Podfile                              | 2 +-
 test/unit/Clustering/GMUDefaultClusterIconGeneratorTest.m | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Podfile.template b/Podfile.template
index cde934c8..4d36a68f 100644
--- a/Podfile.template
+++ b/Podfile.template
@@ -4,7 +4,7 @@ platform :ios, '14.0'
 
 target 'YOUR_APPLICATION_TARGET_NAME_HERE' do
   use_frameworks!
-  pod 'GoogleMaps', '8.3.0'
+  pod 'GoogleMaps', '8.3.1'
   pod 'Google-Maps-iOS-Utils', '4.2.2'
 end
 # [END maps_ios_utils_podfile_template]
diff --git a/samples/ObjCDemoApp/Podfile b/samples/ObjCDemoApp/Podfile
index 274c51ca..49ce3f8f 100644
--- a/samples/ObjCDemoApp/Podfile
+++ b/samples/ObjCDemoApp/Podfile
@@ -3,6 +3,6 @@ platform :ios, '14.0'
 
 target 'ObjCDemoApp' do
   use_frameworks!
-  pod 'GoogleMaps', '8.3.0'
+  pod 'GoogleMaps', '8.3.1'
   pod 'Google-Maps-iOS-Utils', :path => '../..'
 end
diff --git a/samples/SwiftDemoApp/Podfile b/samples/SwiftDemoApp/Podfile
index ad2c4e2b..ebe22994 100644
--- a/samples/SwiftDemoApp/Podfile
+++ b/samples/SwiftDemoApp/Podfile
@@ -3,6 +3,6 @@ platform :ios, '14.0'
 
 target 'SwiftDemoApp' do
   use_frameworks!
-  pod 'GoogleMaps', '8.3.0'
+  pod 'GoogleMaps', '8.3.1'
   pod 'Google-Maps-iOS-Utils', :path => '../..', :testspecs => ['Tests']
 end
diff --git a/test/unit/Clustering/GMUDefaultClusterIconGeneratorTest.m b/test/unit/Clustering/GMUDefaultClusterIconGeneratorTest.m
index ca5dbf39..c0944dac 100644
--- a/test/unit/Clustering/GMUDefaultClusterIconGeneratorTest.m
+++ b/test/unit/Clustering/GMUDefaultClusterIconGeneratorTest.m
@@ -120,7 +120,7 @@ - (void)testIconForSizeGeneratorWithBackgroundImages {
 }
 
 - (void)testIconForTextWithBaseImageNilAndNilUIImage {
-  XCTAssertNil([[GMUDefaultClusterIconGenerator alloc] iconForText:@"1000+" withBaseImage:nil]);
+  XCTAssertNotNil([[GMUDefaultClusterIconGenerator alloc] iconForText:@"1000+" withBaseImage:nil]);
 }
 
 - (void)testInitThrowsWhenBucketsAndBackgroundImagesAreOfDifferentSize {

From 2ec5f0f35acd25127d8f25ccb2cd4192f17538fd Mon Sep 17 00:00:00 2001
From: Angela Yu <5506675+wangela@users.noreply.github.com>
Date: Fri, 2 Feb 2024 13:05:49 -0800
Subject: [PATCH 18/26] chore: migrate from src and test to Sources and Test

---
 Cartfile                                      |   2 -
 Cartfile.resolved                             |   2 -
 GoogleMapsUtils.xcodeproj/project.pbxproj     | 231 ++++--------------
 Package.swift                                 |  31 ++-
 .../Clustering/Algo/GMUClusterAlgorithm.h     |   0
 .../Algo/GMUGridBasedClusterAlgorithm.h       |   0
 .../Algo/GMUGridBasedClusterAlgorithm.m       |   0
 ...GMUNonHierarchicalDistanceBasedAlgorithm.h |   0
 ...GMUNonHierarchicalDistanceBasedAlgorithm.m |   0
 .../Algo/GMUSimpleClusterAlgorithm.h          |   0
 .../Algo/GMUSimpleClusterAlgorithm.m          |   0
 .../Algo/GMUWrappingDictionaryKey.h           |   0
 .../Algo/GMUWrappingDictionaryKey.m           |   0
 .../Clustering/GMSMarker+GMUClusteritem.h     |   0
 .../Clustering/GMSMarker+GMUClusteritem.m     |   0
 .../GoogleMapsUtils}/Clustering/GMUCluster.h  |   0
 .../Clustering/GMUClusterItem.h               |   0
 .../Clustering/GMUClusterManager+Testing.h    |   0
 .../Clustering/GMUClusterManager.h            |   0
 .../Clustering/GMUClusterManager.m            |   0
 .../Clustering/GMUMarkerClustering.h          |   0
 .../Clustering/GMUStaticCluster.h             |   0
 .../Clustering/GMUStaticCluster.m             |   0
 .../Clustering/View/GMUClusterIconGenerator.h |   0
 .../Clustering/View/GMUClusterRenderer.h      |   0
 .../GMUDefaultClusterIconGenerator+Testing.h  |   0
 .../View/GMUDefaultClusterIconGenerator.h     |   0
 .../View/GMUDefaultClusterIconGenerator.m     |   0
 .../View/GMUDefaultClusterRenderer+Testing.h  |   0
 .../View/GMUDefaultClusterRenderer.h          |   0
 .../View/GMUDefaultClusterRenderer.m          |   0
 .../Geometry/GMUGeoJSONParser.h               |   0
 .../Geometry/GMUGeoJSONParser.m               |   0
 .../Geometry/GMUGeometryRenderer+Testing.h    |   0
 .../Geometry/GMUGeometryRenderer.h            |   0
 .../Geometry/GMUGeometryRenderer.m            |   0
 .../GoogleMapsUtils}/Geometry/GMUKMLParser.h  |   0
 .../GoogleMapsUtils}/Geometry/GMUKMLParser.m  |   0
 .../Geometry/Model/GMUFeature.h               |   0
 .../Geometry/Model/GMUFeature.m               |   0
 .../Geometry/Model/GMUGeometry.h              |   0
 .../Geometry/Model/GMUGeometryCollection.h    |   0
 .../Geometry/Model/GMUGeometryCollection.m    |   0
 .../Geometry/Model/GMUGeometryContainer.h     |   0
 .../Geometry/Model/GMUGroundOverlay.h         |   0
 .../Geometry/Model/GMUGroundOverlay.m         |   0
 .../Geometry/Model/GMULineString.h            |   0
 .../Geometry/Model/GMULineString.m            |   0
 .../GoogleMapsUtils}/Geometry/Model/GMUPair.h |   0
 .../GoogleMapsUtils}/Geometry/Model/GMUPair.m |   0
 .../Geometry/Model/GMUPlacemark.h             |   0
 .../Geometry/Model/GMUPlacemark.m             |   0
 .../Geometry/Model/GMUPoint.h                 |   0
 .../Geometry/Model/GMUPoint.m                 |   0
 .../Geometry/Model/GMUPolygon.h               |   0
 .../Geometry/Model/GMUPolygon.m               |   0
 .../Geometry/Model/GMUStyle.h                 |   0
 .../Geometry/Model/GMUStyle.m                 |   0
 .../Geometry/Model/GMUStyleMap.h              |   0
 .../Geometry/Model/GMUStyleMap.m              |   0
 .../GoogleMapsUtils}/Heatmap/GMUGradient.h    |   0
 .../GoogleMapsUtils}/Heatmap/GMUGradient.m    |   0
 .../Heatmap/GMUHeatmapTileLayer+Testing.h     |   0
 .../Heatmap/GMUHeatmapTileLayer.h             |   0
 .../Heatmap/GMUHeatmapTileLayer.m             |   0
 .../Heatmap/GMUWeightedLatLng.h               |   0
 .../Heatmap/GMUWeightedLatLng.m               |   0
 .../GoogleMapsUtils}/QuadTree/GQTBounds.h     |   0
 .../GoogleMapsUtils}/QuadTree/GQTPoint.h      |   0
 .../QuadTree/GQTPointQuadTree.h               |   0
 .../QuadTree/GQTPointQuadTree.m               |   0
 .../QuadTree/GQTPointQuadTreeChild.h          |   0
 .../QuadTree/GQTPointQuadTreeChild.m          |   0
 .../QuadTree/GQTPointQuadTreeItem.h           |   0
 ...CLLocationCoordinate2D+GeometryUtils.swift |   0
 .../GeometryUtils/GMSPath+GeometryUtils.swift |   0
 .../GMSPolygon+GeometryUtils.swift            |   0
 .../GMSPolyline+GeometryUtils.swift           |   0
 .../Internal/CatesianPoint.swift              |   0
 .../Internal/LatLngRadians.swift              |   0
 .../GeometryUtils/MapPoint.swift              |   0
 .../GeometryUtils/Math.swift                  |   0
 .../Heatmap/HeatMapInterpolationPoints.swift  |   1 +
 .../common/Model/GMUTestClusterItem.h         |   0
 .../common/Model/GMUTestClusterItem.m         |   0
 .../GeoJSON_FeatureCollection_Test.geojson    |   0
 .../GeoJSON/GeoJSON_Feature_Test.geojson      |   0
 .../GeoJSON_GeometryCollection_Test.geojson   |   0
 .../GeoJSON/GeoJSON_LineString_Test.geojson   |   0
 .../GeoJSON_MultiLineString_Test.geojson      |   0
 .../GeoJSON/GeoJSON_MultiPoint_Test.geojson   |   0
 .../GeoJSON/GeoJSON_MultiPolygon_Test.geojson |   0
 .../GeoJSON/GeoJSON_Point_Test.geojson        |   0
 .../GeoJSON/GeoJSON_Polygon_Test.geojson      |   0
 .../resources/KML/KML_GroundOverlay_Test.kml  |   0
 .../resources/KML/KML_LineString_Test.kml     |   0
 .../resources/KML/KML_MultiGeometry_Test.kml  |   0
 .../resources/KML/KML_Placemark_Test.kml      |   0
 .../resources/KML/KML_Point_Test.kml          |   0
 .../resources/KML/KML_Polygon_Test.kml        |   0
 .../resources/KML/KML_StyleMap_Test.kml       |   0
 .../resources/KML/KML_Style_Test.kml          |   0
 .../BridgingHeader/UnitTest-Bridging-Header.h |   0
 .../unit/Clustering/GMUClusterAlgorithmTest.h |   0
 .../unit/Clustering/GMUClusterAlgorithmTest.m |   0
 .../unit/Clustering/GMUClusterManagerTest.m   |   0
 .../GMUDefaultClusterIconGeneratorTest.m      |   0
 .../GMUDefaultClusterRendererTest.m           |   0
 .../GMUGridBasedClusterAlgorithmTest.m        |   0
 ...onHierarchicalDistanceBasedAlgorithmTest.m |   0
 .../GMUSimpleClusterAlgorithmTest.swift       |   0
 .../unit/Clustering/GMUStaticClusterTest.m    |   0
 .../Clustering/GMUWrappingDictionaryKeyTest.m |   0
 .../unit/Geometry/GMUFeatureTest.m            |   0
 .../unit/Geometry/GMUGeoJSONParserTest.m      |   0
 .../unit/Geometry/GMUGeometryCollectionTest.m |   0
 .../unit/Geometry/GMUGeometryRendererTest.m   |   0
 .../unit/Geometry/GMUGroundOverlayTest.m      |   0
 .../unit/Geometry/GMUKMLParserTest.m          |   0
 .../unit/Geometry/GMULineStringTest.m         |   0
 .../unit/Geometry/GMUPlacemarkTest.m          |   0
 .../unit/Geometry/GMUPointTest.m              |   0
 .../unit/Geometry/GMUPolygonTest.m            |   0
 .../unit/Geometry/GMUStyleTest.mm             |   0
 ...cationCoordinate2D+GeometryUtilsTest.swift |   0
 .../GMSPath+GeometryUtilsTest.swift           |   0
 .../Internal/LatLngRadiansTest.swift          |   0
 .../unit/GeometryUtils/MapPointTest.swift     |   0
 .../unit/Heatmap/GMUGradientTest.swift        |   0
 .../Heatmap/GMUHeatmapTileLayerTest.swift     |   0
 .../unit/Heatmap/GMUWeightedLatLngTest.swift  |   0
 .../Heatmap/HeatMapInterpolationTests.swift   |   0
 .../unit/Helper/GMUObectiveCTestHelper.h      |   0
 .../unit/Helper/GMUObectiveCTestHelper.m      |   0
 .../unit/QuadTree/GQTPointQuadTreeTest.m      |   0
 app/BasicViewController.h                     |   9 +
 136 files changed, 82 insertions(+), 194 deletions(-)
 delete mode 100644 Cartfile
 delete mode 100644 Cartfile.resolved
 rename {src => Sources/GoogleMapsUtils}/Clustering/Algo/GMUClusterAlgorithm.h (100%)
 rename {src => Sources/GoogleMapsUtils}/Clustering/Algo/GMUGridBasedClusterAlgorithm.h (100%)
 rename {src => Sources/GoogleMapsUtils}/Clustering/Algo/GMUGridBasedClusterAlgorithm.m (100%)
 rename {src => Sources/GoogleMapsUtils}/Clustering/Algo/GMUNonHierarchicalDistanceBasedAlgorithm.h (100%)
 rename {src => Sources/GoogleMapsUtils}/Clustering/Algo/GMUNonHierarchicalDistanceBasedAlgorithm.m (100%)
 rename {src => Sources/GoogleMapsUtils}/Clustering/Algo/GMUSimpleClusterAlgorithm.h (100%)
 rename {src => Sources/GoogleMapsUtils}/Clustering/Algo/GMUSimpleClusterAlgorithm.m (100%)
 rename {src => Sources/GoogleMapsUtils}/Clustering/Algo/GMUWrappingDictionaryKey.h (100%)
 rename {src => Sources/GoogleMapsUtils}/Clustering/Algo/GMUWrappingDictionaryKey.m (100%)
 rename {src => Sources/GoogleMapsUtils}/Clustering/GMSMarker+GMUClusteritem.h (100%)
 rename {src => Sources/GoogleMapsUtils}/Clustering/GMSMarker+GMUClusteritem.m (100%)
 rename {src => Sources/GoogleMapsUtils}/Clustering/GMUCluster.h (100%)
 rename {src => Sources/GoogleMapsUtils}/Clustering/GMUClusterItem.h (100%)
 rename {src => Sources/GoogleMapsUtils}/Clustering/GMUClusterManager+Testing.h (100%)
 rename {src => Sources/GoogleMapsUtils}/Clustering/GMUClusterManager.h (100%)
 rename {src => Sources/GoogleMapsUtils}/Clustering/GMUClusterManager.m (100%)
 rename {src => Sources/GoogleMapsUtils}/Clustering/GMUMarkerClustering.h (100%)
 rename {src => Sources/GoogleMapsUtils}/Clustering/GMUStaticCluster.h (100%)
 rename {src => Sources/GoogleMapsUtils}/Clustering/GMUStaticCluster.m (100%)
 rename {src => Sources/GoogleMapsUtils}/Clustering/View/GMUClusterIconGenerator.h (100%)
 rename {src => Sources/GoogleMapsUtils}/Clustering/View/GMUClusterRenderer.h (100%)
 rename {src => Sources/GoogleMapsUtils}/Clustering/View/GMUDefaultClusterIconGenerator+Testing.h (100%)
 rename {src => Sources/GoogleMapsUtils}/Clustering/View/GMUDefaultClusterIconGenerator.h (100%)
 rename {src => Sources/GoogleMapsUtils}/Clustering/View/GMUDefaultClusterIconGenerator.m (100%)
 rename {src => Sources/GoogleMapsUtils}/Clustering/View/GMUDefaultClusterRenderer+Testing.h (100%)
 rename {src => Sources/GoogleMapsUtils}/Clustering/View/GMUDefaultClusterRenderer.h (100%)
 rename {src => Sources/GoogleMapsUtils}/Clustering/View/GMUDefaultClusterRenderer.m (100%)
 rename {src => Sources/GoogleMapsUtils}/Geometry/GMUGeoJSONParser.h (100%)
 rename {src => Sources/GoogleMapsUtils}/Geometry/GMUGeoJSONParser.m (100%)
 rename {src => Sources/GoogleMapsUtils}/Geometry/GMUGeometryRenderer+Testing.h (100%)
 rename {src => Sources/GoogleMapsUtils}/Geometry/GMUGeometryRenderer.h (100%)
 rename {src => Sources/GoogleMapsUtils}/Geometry/GMUGeometryRenderer.m (100%)
 rename {src => Sources/GoogleMapsUtils}/Geometry/GMUKMLParser.h (100%)
 rename {src => Sources/GoogleMapsUtils}/Geometry/GMUKMLParser.m (100%)
 rename {src => Sources/GoogleMapsUtils}/Geometry/Model/GMUFeature.h (100%)
 rename {src => Sources/GoogleMapsUtils}/Geometry/Model/GMUFeature.m (100%)
 rename {src => Sources/GoogleMapsUtils}/Geometry/Model/GMUGeometry.h (100%)
 rename {src => Sources/GoogleMapsUtils}/Geometry/Model/GMUGeometryCollection.h (100%)
 rename {src => Sources/GoogleMapsUtils}/Geometry/Model/GMUGeometryCollection.m (100%)
 rename {src => Sources/GoogleMapsUtils}/Geometry/Model/GMUGeometryContainer.h (100%)
 rename {src => Sources/GoogleMapsUtils}/Geometry/Model/GMUGroundOverlay.h (100%)
 rename {src => Sources/GoogleMapsUtils}/Geometry/Model/GMUGroundOverlay.m (100%)
 rename {src => Sources/GoogleMapsUtils}/Geometry/Model/GMULineString.h (100%)
 rename {src => Sources/GoogleMapsUtils}/Geometry/Model/GMULineString.m (100%)
 rename {src => Sources/GoogleMapsUtils}/Geometry/Model/GMUPair.h (100%)
 rename {src => Sources/GoogleMapsUtils}/Geometry/Model/GMUPair.m (100%)
 rename {src => Sources/GoogleMapsUtils}/Geometry/Model/GMUPlacemark.h (100%)
 rename {src => Sources/GoogleMapsUtils}/Geometry/Model/GMUPlacemark.m (100%)
 rename {src => Sources/GoogleMapsUtils}/Geometry/Model/GMUPoint.h (100%)
 rename {src => Sources/GoogleMapsUtils}/Geometry/Model/GMUPoint.m (100%)
 rename {src => Sources/GoogleMapsUtils}/Geometry/Model/GMUPolygon.h (100%)
 rename {src => Sources/GoogleMapsUtils}/Geometry/Model/GMUPolygon.m (100%)
 rename {src => Sources/GoogleMapsUtils}/Geometry/Model/GMUStyle.h (100%)
 rename {src => Sources/GoogleMapsUtils}/Geometry/Model/GMUStyle.m (100%)
 rename {src => Sources/GoogleMapsUtils}/Geometry/Model/GMUStyleMap.h (100%)
 rename {src => Sources/GoogleMapsUtils}/Geometry/Model/GMUStyleMap.m (100%)
 rename {src => Sources/GoogleMapsUtils}/Heatmap/GMUGradient.h (100%)
 rename {src => Sources/GoogleMapsUtils}/Heatmap/GMUGradient.m (100%)
 rename {src => Sources/GoogleMapsUtils}/Heatmap/GMUHeatmapTileLayer+Testing.h (100%)
 rename {src => Sources/GoogleMapsUtils}/Heatmap/GMUHeatmapTileLayer.h (100%)
 rename {src => Sources/GoogleMapsUtils}/Heatmap/GMUHeatmapTileLayer.m (100%)
 rename {src => Sources/GoogleMapsUtils}/Heatmap/GMUWeightedLatLng.h (100%)
 rename {src => Sources/GoogleMapsUtils}/Heatmap/GMUWeightedLatLng.m (100%)
 rename {src => Sources/GoogleMapsUtils}/QuadTree/GQTBounds.h (100%)
 rename {src => Sources/GoogleMapsUtils}/QuadTree/GQTPoint.h (100%)
 rename {src => Sources/GoogleMapsUtils}/QuadTree/GQTPointQuadTree.h (100%)
 rename {src => Sources/GoogleMapsUtils}/QuadTree/GQTPointQuadTree.m (100%)
 rename {src => Sources/GoogleMapsUtils}/QuadTree/GQTPointQuadTreeChild.h (100%)
 rename {src => Sources/GoogleMapsUtils}/QuadTree/GQTPointQuadTreeChild.m (100%)
 rename {src => Sources/GoogleMapsUtils}/QuadTree/GQTPointQuadTreeItem.h (100%)
 rename {src => Sources/GoogleMapsUtilsSwift}/GeometryUtils/CLLocationCoordinate2D+GeometryUtils.swift (100%)
 rename {src => Sources/GoogleMapsUtilsSwift}/GeometryUtils/GMSPath+GeometryUtils.swift (100%)
 rename {src => Sources/GoogleMapsUtilsSwift}/GeometryUtils/GMSPolygon+GeometryUtils.swift (100%)
 rename {src => Sources/GoogleMapsUtilsSwift}/GeometryUtils/GMSPolyline+GeometryUtils.swift (100%)
 rename {src => Sources/GoogleMapsUtilsSwift}/GeometryUtils/Internal/CatesianPoint.swift (100%)
 rename {src => Sources/GoogleMapsUtilsSwift}/GeometryUtils/Internal/LatLngRadians.swift (100%)
 rename {src => Sources/GoogleMapsUtilsSwift}/GeometryUtils/MapPoint.swift (100%)
 rename {src => Sources/GoogleMapsUtilsSwift}/GeometryUtils/Math.swift (100%)
 rename {src => Sources/GoogleMapsUtilsSwift}/Heatmap/HeatMapInterpolationPoints.swift (99%)
 rename {test => Tests/GoogleMapsUtilsTests}/common/Model/GMUTestClusterItem.h (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/common/Model/GMUTestClusterItem.m (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/resources/GeoJSON/GeoJSON_FeatureCollection_Test.geojson (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/resources/GeoJSON/GeoJSON_Feature_Test.geojson (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/resources/GeoJSON/GeoJSON_GeometryCollection_Test.geojson (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/resources/GeoJSON/GeoJSON_LineString_Test.geojson (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/resources/GeoJSON/GeoJSON_MultiLineString_Test.geojson (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/resources/GeoJSON/GeoJSON_MultiPoint_Test.geojson (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/resources/GeoJSON/GeoJSON_MultiPolygon_Test.geojson (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/resources/GeoJSON/GeoJSON_Point_Test.geojson (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/resources/GeoJSON/GeoJSON_Polygon_Test.geojson (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/resources/KML/KML_GroundOverlay_Test.kml (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/resources/KML/KML_LineString_Test.kml (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/resources/KML/KML_MultiGeometry_Test.kml (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/resources/KML/KML_Placemark_Test.kml (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/resources/KML/KML_Point_Test.kml (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/resources/KML/KML_Polygon_Test.kml (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/resources/KML/KML_StyleMap_Test.kml (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/resources/KML/KML_Style_Test.kml (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/unit/BridgingHeader/UnitTest-Bridging-Header.h (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/unit/Clustering/GMUClusterAlgorithmTest.h (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/unit/Clustering/GMUClusterAlgorithmTest.m (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/unit/Clustering/GMUClusterManagerTest.m (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/unit/Clustering/GMUDefaultClusterIconGeneratorTest.m (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/unit/Clustering/GMUDefaultClusterRendererTest.m (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/unit/Clustering/GMUGridBasedClusterAlgorithmTest.m (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/unit/Clustering/GMUNonHierarchicalDistanceBasedAlgorithmTest.m (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/unit/Clustering/GMUSimpleClusterAlgorithmTest.swift (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/unit/Clustering/GMUStaticClusterTest.m (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/unit/Clustering/GMUWrappingDictionaryKeyTest.m (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/unit/Geometry/GMUFeatureTest.m (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/unit/Geometry/GMUGeoJSONParserTest.m (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/unit/Geometry/GMUGeometryCollectionTest.m (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/unit/Geometry/GMUGeometryRendererTest.m (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/unit/Geometry/GMUGroundOverlayTest.m (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/unit/Geometry/GMUKMLParserTest.m (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/unit/Geometry/GMULineStringTest.m (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/unit/Geometry/GMUPlacemarkTest.m (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/unit/Geometry/GMUPointTest.m (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/unit/Geometry/GMUPolygonTest.m (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/unit/Geometry/GMUStyleTest.mm (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/unit/GeometryUtils/CLLocationCoordinate2D+GeometryUtilsTest.swift (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/unit/GeometryUtils/GMSPath+GeometryUtilsTest.swift (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/unit/GeometryUtils/Internal/LatLngRadiansTest.swift (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/unit/GeometryUtils/MapPointTest.swift (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/unit/Heatmap/GMUGradientTest.swift (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/unit/Heatmap/GMUHeatmapTileLayerTest.swift (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/unit/Heatmap/GMUWeightedLatLngTest.swift (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/unit/Heatmap/HeatMapInterpolationTests.swift (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/unit/Helper/GMUObectiveCTestHelper.h (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/unit/Helper/GMUObectiveCTestHelper.m (100%)
 rename {test => Tests/GoogleMapsUtilsTests}/unit/QuadTree/GQTPointQuadTreeTest.m (100%)

diff --git a/Cartfile b/Cartfile
deleted file mode 100644
index 7969be8f..00000000
--- a/Cartfile
+++ /dev/null
@@ -1,2 +0,0 @@
-binary "https://dl.google.com/geosdk/GoogleMaps.json" == 6.2.1-beta
-github "erikdoe/ocmock"
diff --git a/Cartfile.resolved b/Cartfile.resolved
deleted file mode 100644
index cd7e1367..00000000
--- a/Cartfile.resolved
+++ /dev/null
@@ -1,2 +0,0 @@
-binary "https://dl.google.com/geosdk/GoogleMaps.json" "6.2.1-beta"
-github "erikdoe/ocmock" "v3.9.1"
diff --git a/GoogleMapsUtils.xcodeproj/project.pbxproj b/GoogleMapsUtils.xcodeproj/project.pbxproj
index 7d837d5a..335f4633 100644
--- a/GoogleMapsUtils.xcodeproj/project.pbxproj
+++ b/GoogleMapsUtils.xcodeproj/project.pbxproj
@@ -3,36 +3,23 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 56;
 	objects = {
 
 /* Begin PBXBuildFile section */
 		3A01F81B24EF47690054A305 /* HeatMapInterpolationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A421BD224E748A200CAD70F /* HeatMapInterpolationTests.swift */; };
 		3A29044F24EC8C79002EB180 /* HeatMapInterpolationPoints.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AE91C6324E73C2400A3B9FA /* HeatMapInterpolationPoints.swift */; };
-		3A29047724EC964F002EB180 /* GoogleMaps.bundle in Resources */ = {isa = PBXBuildFile; fileRef = AAE6B9F52458C98B0051CD31 /* GoogleMaps.bundle */; };
 		3E709C5224D131E600B8A7E1 /* GMUDefaultClusterRenderer+Testing.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E709C5124D1318F00B8A7E1 /* GMUDefaultClusterRenderer+Testing.h */; };
 		3E7A8F4224C2BBDD000318C3 /* GMUWeightedLatLngTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E7A8F4124C2BBDD000318C3 /* GMUWeightedLatLngTest.swift */; };
 		3E7A8FC224C30C63000318C3 /* GMUObectiveCTestHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 3E7A8FC124C30C63000318C3 /* GMUObectiveCTestHelper.m */; };
 		3E7A8FC424C30CDB000318C3 /* GMUGradientTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E7A8FC324C30CDB000318C3 /* GMUGradientTest.swift */; };
 		3EA2526624CB50A4003A7D07 /* GMUSimpleClusterAlgorithmTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EA2526524CB50A4003A7D07 /* GMUSimpleClusterAlgorithmTest.swift */; };
 		3EE0C60324C8B54400D15D38 /* GMUHeatmapTileLayerTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EE0C60224C8B54400D15D38 /* GMUHeatmapTileLayerTest.swift */; };
-		3EE0C60424C8B55D00D15D38 /* GoogleMaps.bundle in Resources */ = {isa = PBXBuildFile; fileRef = AAE6B9F52458C98B0051CD31 /* GoogleMaps.bundle */; };
 		3EE0C60624C8BABC00D15D38 /* GMUHeatmapTileLayer+Testing.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EE0C60524C8BABC00D15D38 /* GMUHeatmapTileLayer+Testing.h */; };
 		543C4FB7246A1F9700821017 /* GMSMarker+GMUClusteritem.m in Sources */ = {isa = PBXBuildFile; fileRef = 54D784802464DAAC00437147 /* GMSMarker+GMUClusteritem.m */; };
 		543C4FB8246A23C100821017 /* GMSMarker+GMUClusteritem.h in Headers */ = {isa = PBXBuildFile; fileRef = 54D7847F2464DAAC00437147 /* GMSMarker+GMUClusteritem.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		543C4FBA246A247C00821017 /* GMSMarker+GMUClusteritem.h in Headers */ = {isa = PBXBuildFile; fileRef = 54D7847F2464DAAC00437147 /* GMSMarker+GMUClusteritem.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		543C4FBB246A248000821017 /* GMSMarker+GMUClusteritem.m in Sources */ = {isa = PBXBuildFile; fileRef = 54D784802464DAAC00437147 /* GMSMarker+GMUClusteritem.m */; };
-		AA1116A62784FAE50018C904 /* OCMock.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA1116A52784FAE50018C904 /* OCMock.xcframework */; };
-		AA1116A72784FAF10018C904 /* OCMock.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA1116A52784FAE50018C904 /* OCMock.xcframework */; };
-		AA1116B7278508BC0018C904 /* GoogleMapsBase.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA1116B4278508BC0018C904 /* GoogleMapsBase.xcframework */; };
-		AA1116B8278508BC0018C904 /* GoogleMapsBase.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA1116B4278508BC0018C904 /* GoogleMapsBase.xcframework */; };
-		AA1116B9278508BC0018C904 /* GoogleMapsBase.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA1116B4278508BC0018C904 /* GoogleMapsBase.xcframework */; };
-		AA1116BA278508BC0018C904 /* GoogleMaps.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA1116B5278508BC0018C904 /* GoogleMaps.xcframework */; };
-		AA1116BB278508BC0018C904 /* GoogleMaps.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA1116B5278508BC0018C904 /* GoogleMaps.xcframework */; };
-		AA1116BC278508BC0018C904 /* GoogleMaps.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA1116B5278508BC0018C904 /* GoogleMaps.xcframework */; };
-		AA1116BD278508BC0018C904 /* GoogleMapsCore.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA1116B6278508BC0018C904 /* GoogleMapsCore.xcframework */; };
-		AA1116BE278508BC0018C904 /* GoogleMapsCore.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA1116B6278508BC0018C904 /* GoogleMapsCore.xcframework */; };
-		AA1116BF278508BC0018C904 /* GoogleMapsCore.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA1116B6278508BC0018C904 /* GoogleMapsCore.xcframework */; };
 		AA139D3925CC9DD300793F6E /* LatLngRadiansTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA139D3825CC9DD300793F6E /* LatLngRadiansTest.swift */; };
 		AA2DCF25254B2AE000009A82 /* GMSPath+GeometryUtilsTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA2DCF24254B2AE000009A82 /* GMSPath+GeometryUtilsTest.swift */; };
 		AA50D0012536274800869802 /* MapPoint.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA29A440252E6E2800D69D87 /* MapPoint.swift */; };
@@ -134,36 +121,6 @@
 		AAB7CCAC24592F0000127E16 /* KML_StyleMap_Test.kml in Resources */ = {isa = PBXBuildFile; fileRef = AAE6BA082458C9EB0051CD31 /* KML_StyleMap_Test.kml */; };
 		AAB7CCAD24592F0000127E16 /* KML_Style_Test.kml in Resources */ = {isa = PBXBuildFile; fileRef = AAE6BA092458C9EB0051CD31 /* KML_Style_Test.kml */; };
 		AAB7CCAE24592F0000127E16 /* KML_LineString_Test.kml in Resources */ = {isa = PBXBuildFile; fileRef = AAE6BA0A2458C9EB0051CD31 /* KML_LineString_Test.kml */; };
-		AABFFE8B245787390015D8C6 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AABFFE8A245787390015D8C6 /* Accelerate.framework */; };
-		AABFFE8D245787510015D8C6 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AABFFE8C245787510015D8C6 /* CoreData.framework */; };
-		AABFFE8F245787560015D8C6 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AABFFE8E245787560015D8C6 /* CoreGraphics.framework */; };
-		AABFFE912457875D0015D8C6 /* CoreImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AABFFE902457875D0015D8C6 /* CoreImage.framework */; };
-		AABFFE93245787640015D8C6 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AABFFE92245787640015D8C6 /* CoreLocation.framework */; };
-		AABFFE952457876B0015D8C6 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AABFFE942457876B0015D8C6 /* CoreTelephony.framework */; };
-		AABFFE972457876F0015D8C6 /* CoreText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AABFFE962457876F0015D8C6 /* CoreText.framework */; };
-		AABFFE98245787760015D8C6 /* GLKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AADB9A3E245780AA000C86E1 /* GLKit.framework */; };
-		AABFFE9A2457877C0015D8C6 /* ImageIO.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AABFFE992457877C0015D8C6 /* ImageIO.framework */; };
-		AABFFE9C245787840015D8C6 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = AABFFE9B245787840015D8C6 /* libc++.tbd */; };
-		AABFFE9E2457878A0015D8C6 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = AABFFE9D2457878A0015D8C6 /* libz.tbd */; };
-		AABFFE9F245787900015D8C6 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AADB9A46245780C8000C86E1 /* OpenGLES.framework */; };
-		AABFFEA1245787950015D8C6 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AABFFEA0245787950015D8C6 /* QuartzCore.framework */; };
-		AABFFEA32457879D0015D8C6 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AABFFEA22457879D0015D8C6 /* SystemConfiguration.framework */; };
-		AABFFEA4245787A20015D8C6 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AADB9A4C245780DA000C86E1 /* UIKit.framework */; };
-		AADB9A3124578070000C86E1 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AADB9A302457806F000C86E1 /* Accelerate.framework */; };
-		AADB9A3324578079000C86E1 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AADB9A3224578079000C86E1 /* CoreData.framework */; };
-		AADB9A352457807F000C86E1 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AADB9A342457807F000C86E1 /* CoreGraphics.framework */; };
-		AADB9A3724578086000C86E1 /* CoreImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AADB9A3624578086000C86E1 /* CoreImage.framework */; };
-		AADB9A392457808F000C86E1 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AADB9A382457808F000C86E1 /* CoreLocation.framework */; };
-		AADB9A3B24578099000C86E1 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AADB9A3A24578099000C86E1 /* CoreTelephony.framework */; };
-		AADB9A3D245780A0000C86E1 /* CoreText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AADB9A3C245780A0000C86E1 /* CoreText.framework */; };
-		AADB9A3F245780AA000C86E1 /* GLKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AADB9A3E245780AA000C86E1 /* GLKit.framework */; };
-		AADB9A41245780B0000C86E1 /* ImageIO.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AADB9A40245780B0000C86E1 /* ImageIO.framework */; };
-		AADB9A43245780BC000C86E1 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = AADB9A42245780BC000C86E1 /* libc++.tbd */; };
-		AADB9A45245780C1000C86E1 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = AADB9A44245780C1000C86E1 /* libz.tbd */; };
-		AADB9A47245780C8000C86E1 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AADB9A46245780C8000C86E1 /* OpenGLES.framework */; };
-		AADB9A49245780CD000C86E1 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AADB9A48245780CD000C86E1 /* QuartzCore.framework */; };
-		AADB9A4B245780D5000C86E1 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AADB9A4A245780D5000C86E1 /* SystemConfiguration.framework */; };
-		AADB9A4D245780DA000C86E1 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AADB9A4C245780DA000C86E1 /* UIKit.framework */; };
 		AAE6B9E12458C92B0051CD31 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = AAE6B9BE2458C92B0051CD31 /* main.m */; };
 		AAE6B9E22458C92B0051CD31 /* MasterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = AAE6B9BF2458C92B0051CD31 /* MasterViewController.m */; };
 		AAE6B9E32458C92B0051CD31 /* Samples.m in Sources */ = {isa = PBXBuildFile; fileRef = AAE6B9C22458C92B0051CD31 /* Samples.m */; };
@@ -183,7 +140,6 @@
 		AAE6B9F22458C92B0051CD31 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AAE6B9DC2458C92B0051CD31 /* LaunchScreen.storyboard */; };
 		AAE6B9F32458C92B0051CD31 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AAE6B9DE2458C92B0051CD31 /* Main.storyboard */; };
 		AAE6B9F42458C92B0051CD31 /* HeatmapViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = AAE6B9E02458C92B0051CD31 /* HeatmapViewController.m */; };
-		AAE6B9F62458C98B0051CD31 /* GoogleMaps.bundle in Resources */ = {isa = PBXBuildFile; fileRef = AAE6B9F52458C98B0051CD31 /* GoogleMaps.bundle */; };
 		AAE6BA282458C9EB0051CD31 /* GeoJSON_MultiLineString_Test.geojson in Resources */ = {isa = PBXBuildFile; fileRef = AAE6B9F92458C9EA0051CD31 /* GeoJSON_MultiLineString_Test.geojson */; };
 		AAE6BA292458C9EB0051CD31 /* GeoJSON_MultiPolygon_Test.geojson in Resources */ = {isa = PBXBuildFile; fileRef = AAE6B9FA2458C9EA0051CD31 /* GeoJSON_MultiPolygon_Test.geojson */; };
 		AAE6BA2A2458C9EB0051CD31 /* GeoJSON_Point_Test.geojson in Resources */ = {isa = PBXBuildFile; fileRef = AAE6B9FB2458C9EA0051CD31 /* GeoJSON_Point_Test.geojson */; };
@@ -201,7 +157,6 @@
 		AAE6BA362458C9EB0051CD31 /* KML_StyleMap_Test.kml in Resources */ = {isa = PBXBuildFile; fileRef = AAE6BA082458C9EB0051CD31 /* KML_StyleMap_Test.kml */; };
 		AAE6BA372458C9EB0051CD31 /* KML_Style_Test.kml in Resources */ = {isa = PBXBuildFile; fileRef = AAE6BA092458C9EB0051CD31 /* KML_Style_Test.kml */; };
 		AAE6BA382458C9EB0051CD31 /* KML_LineString_Test.kml in Resources */ = {isa = PBXBuildFile; fileRef = AAE6BA0A2458C9EB0051CD31 /* KML_LineString_Test.kml */; };
-		AAE6BA512458CC2F0051CD31 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AAE6BA502458CC2F0051CD31 /* XCTest.framework */; };
 		AAE6BA522458CC670051CD31 /* GMUDefaultClusterRendererTest.m in Sources */ = {isa = PBXBuildFile; fileRef = AAE6BA0D2458C9EB0051CD31 /* GMUDefaultClusterRendererTest.m */; };
 		AAE6BA532458CC670051CD31 /* GMUGridBasedClusterAlgorithmTest.m in Sources */ = {isa = PBXBuildFile; fileRef = AAE6BA0E2458C9EB0051CD31 /* GMUGridBasedClusterAlgorithmTest.m */; };
 		AAE6BA542458CC670051CD31 /* GMUClusterAlgorithmTest.m in Sources */ = {isa = PBXBuildFile; fileRef = AAE6BA0F2458C9EB0051CD31 /* GMUClusterAlgorithmTest.m */; };
@@ -226,6 +181,9 @@
 		AAE6BA6A2458CD510051CD31 /* GMUTestClusterItem.m in Sources */ = {isa = PBXBuildFile; fileRef = AAE6BA262458C9EB0051CD31 /* GMUTestClusterItem.m */; };
 		AAE6BA6B2458CD510051CD31 /* GMUTestClusterItem.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE6BA272458C9EB0051CD31 /* GMUTestClusterItem.h */; };
 		AAE83A31245794B20064204E /* GMUClusterManager+Testing.h in Headers */ = {isa = PBXBuildFile; fileRef = AABFFEBC24578CAC0015D8C6 /* GMUClusterManager+Testing.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		B66B86D42B51CE0000F358F2 /* GoogleMaps in Frameworks */ = {isa = PBXBuildFile; productRef = B66B86D32B51CE0000F358F2 /* GoogleMaps */; };
+		B66B86D62B51CE0000F358F2 /* GoogleMapsBase in Frameworks */ = {isa = PBXBuildFile; productRef = B66B86D52B51CE0000F358F2 /* GoogleMapsBase */; };
+		B66B86D82B51CE0000F358F2 /* GoogleMapsCore in Frameworks */ = {isa = PBXBuildFile; productRef = B66B86D72B51CE0000F358F2 /* GoogleMapsCore */; };
 		F849455F209C15CE00C60C05 /* GoogleMapsUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = F849455D209C15CE00C60C05 /* GoogleMapsUtils.h */; settings = {ATTRIBUTES = (Public, ); }; };
 /* End PBXBuildFile section */
 
@@ -265,14 +223,8 @@
 		3EA2526524CB50A4003A7D07 /* GMUSimpleClusterAlgorithmTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GMUSimpleClusterAlgorithmTest.swift; sourceTree = "<group>"; };
 		3EE0C60224C8B54400D15D38 /* GMUHeatmapTileLayerTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GMUHeatmapTileLayerTest.swift; sourceTree = "<group>"; };
 		3EE0C60524C8BABC00D15D38 /* GMUHeatmapTileLayer+Testing.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "GMUHeatmapTileLayer+Testing.h"; sourceTree = "<group>"; };
-		50EB71F39B4F31FF9127AD8B /* libPods-UnitTest.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-UnitTest.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		54D7847F2464DAAC00437147 /* GMSMarker+GMUClusteritem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "GMSMarker+GMUClusteritem.h"; sourceTree = "<group>"; };
 		54D784802464DAAC00437147 /* GMSMarker+GMUClusteritem.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "GMSMarker+GMUClusteritem.m"; sourceTree = "<group>"; };
-		662F6FAE156096701716AEEC /* libPods-DevApp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-DevApp.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		AA1116A52784FAE50018C904 /* OCMock.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = OCMock.xcframework; path = ../NaturalHazardsMap/ios/NaturalHazardsMap/Carthage/Build/OCMock.xcframework; sourceTree = "<group>"; };
-		AA1116B4278508BC0018C904 /* GoogleMapsBase.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = GoogleMapsBase.xcframework; path = Carthage/Build/GoogleMapsBase.xcframework; sourceTree = "<group>"; };
-		AA1116B5278508BC0018C904 /* GoogleMaps.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = GoogleMaps.xcframework; path = Carthage/Build/GoogleMaps.xcframework; sourceTree = "<group>"; };
-		AA1116B6278508BC0018C904 /* GoogleMapsCore.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = GoogleMapsCore.xcframework; path = Carthage/Build/GoogleMapsCore.xcframework; sourceTree = "<group>"; };
 		AA139D3825CC9DD300793F6E /* LatLngRadiansTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LatLngRadiansTest.swift; sourceTree = "<group>"; };
 		AA29A440252E6E2800D69D87 /* MapPoint.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MapPoint.swift; path = src/GeometryUtils/MapPoint.swift; sourceTree = "<group>"; };
 		AA2DCF24254B2AE000009A82 /* GMSPath+GeometryUtilsTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GMSPath+GeometryUtilsTest.swift"; sourceTree = "<group>"; };
@@ -285,18 +237,6 @@
 		AA5207B0256C6D7D00414C6D /* CLLocationCoordinate2D+GeometryUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "CLLocationCoordinate2D+GeometryUtils.swift"; path = "src/GeometryUtils/CLLocationCoordinate2D+GeometryUtils.swift"; sourceTree = "<group>"; };
 		AA74F47D251E4F87003BFC8C /* MapPointTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapPointTest.swift; sourceTree = "<group>"; };
 		AAAB11BD255E11DD00129868 /* CLLocationCoordinate2D+GeometryUtilsTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CLLocationCoordinate2D+GeometryUtilsTest.swift"; sourceTree = "<group>"; };
-		AABFFE8A245787390015D8C6 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/System/Library/Frameworks/Accelerate.framework; sourceTree = DEVELOPER_DIR; };
-		AABFFE8C245787510015D8C6 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/System/Library/Frameworks/CoreData.framework; sourceTree = DEVELOPER_DIR; };
-		AABFFE8E245787560015D8C6 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/System/Library/Frameworks/CoreGraphics.framework; sourceTree = DEVELOPER_DIR; };
-		AABFFE902457875D0015D8C6 /* CoreImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreImage.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/System/Library/Frameworks/CoreImage.framework; sourceTree = DEVELOPER_DIR; };
-		AABFFE92245787640015D8C6 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/System/Library/Frameworks/CoreLocation.framework; sourceTree = DEVELOPER_DIR; };
-		AABFFE942457876B0015D8C6 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/System/Library/Frameworks/CoreTelephony.framework; sourceTree = DEVELOPER_DIR; };
-		AABFFE962457876F0015D8C6 /* CoreText.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreText.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/System/Library/Frameworks/CoreText.framework; sourceTree = DEVELOPER_DIR; };
-		AABFFE992457877C0015D8C6 /* ImageIO.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ImageIO.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/System/Library/Frameworks/ImageIO.framework; sourceTree = DEVELOPER_DIR; };
-		AABFFE9B245787840015D8C6 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/usr/lib/libc++.tbd"; sourceTree = DEVELOPER_DIR; };
-		AABFFE9D2457878A0015D8C6 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/usr/lib/libz.tbd; sourceTree = DEVELOPER_DIR; };
-		AABFFEA0245787950015D8C6 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/System/Library/Frameworks/QuartzCore.framework; sourceTree = DEVELOPER_DIR; };
-		AABFFEA22457879D0015D8C6 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/System/Library/Frameworks/SystemConfiguration.framework; sourceTree = DEVELOPER_DIR; };
 		AABFFEA624578CAC0015D8C6 /* GQTPointQuadTree.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GQTPointQuadTree.m; sourceTree = "<group>"; };
 		AABFFEA724578CAC0015D8C6 /* GQTPointQuadTreeItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GQTPointQuadTreeItem.h; sourceTree = "<group>"; };
 		AABFFEA824578CAC0015D8C6 /* GQTPointQuadTreeChild.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GQTPointQuadTreeChild.m; sourceTree = "<group>"; };
@@ -363,21 +303,6 @@
 		AABFFEEB24578CAC0015D8C6 /* GMUGeometryRenderer+Testing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GMUGeometryRenderer+Testing.h"; sourceTree = "<group>"; };
 		AABFFEEC24578CAC0015D8C6 /* GMUGeoJSONParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GMUGeoJSONParser.m; sourceTree = "<group>"; };
 		AABFFEED24578CAC0015D8C6 /* GMUGeometryRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GMUGeometryRenderer.h; sourceTree = "<group>"; };
-		AADB9A302457806F000C86E1 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; };
-		AADB9A3224578079000C86E1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
-		AADB9A342457807F000C86E1 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
-		AADB9A3624578086000C86E1 /* CoreImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreImage.framework; path = System/Library/Frameworks/CoreImage.framework; sourceTree = SDKROOT; };
-		AADB9A382457808F000C86E1 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
-		AADB9A3A24578099000C86E1 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; };
-		AADB9A3C245780A0000C86E1 /* CoreText.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreText.framework; path = System/Library/Frameworks/CoreText.framework; sourceTree = SDKROOT; };
-		AADB9A3E245780AA000C86E1 /* GLKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLKit.framework; path = System/Library/Frameworks/GLKit.framework; sourceTree = SDKROOT; };
-		AADB9A40245780B0000C86E1 /* ImageIO.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ImageIO.framework; path = System/Library/Frameworks/ImageIO.framework; sourceTree = SDKROOT; };
-		AADB9A42245780BC000C86E1 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
-		AADB9A44245780C1000C86E1 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
-		AADB9A46245780C8000C86E1 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
-		AADB9A48245780CD000C86E1 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
-		AADB9A4A245780D5000C86E1 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
-		AADB9A4C245780DA000C86E1 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		AAE6B9BC2458C92B0051CD31 /* MasterViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MasterViewController.h; path = app/MasterViewController.h; sourceTree = "<group>"; };
 		AAE6B9BD2458C92B0051CD31 /* HeatmapViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HeatmapViewController.h; path = app/HeatmapViewController.h; sourceTree = "<group>"; };
 		AAE6B9BE2458C92B0051CD31 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = app/main.m; sourceTree = "<group>"; };
@@ -408,7 +333,6 @@
 		AAE6B9DD2458C92B0051CD31 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
 		AAE6B9DF2458C92B0051CD31 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Main.storyboard; sourceTree = "<group>"; };
 		AAE6B9E02458C92B0051CD31 /* HeatmapViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HeatmapViewController.m; path = app/HeatmapViewController.m; sourceTree = "<group>"; };
-		AAE6B9F52458C98B0051CD31 /* GoogleMaps.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = GoogleMaps.bundle; path = "Carthage/Build/GoogleMaps.xcframework/ios-arm64/GoogleMaps.framework/Resources/GoogleMaps.bundle"; sourceTree = "<group>"; };
 		AAE6B9F92458C9EA0051CD31 /* GeoJSON_MultiLineString_Test.geojson */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = GeoJSON_MultiLineString_Test.geojson; sourceTree = "<group>"; };
 		AAE6B9FA2458C9EA0051CD31 /* GeoJSON_MultiPolygon_Test.geojson */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = GeoJSON_MultiPolygon_Test.geojson; sourceTree = "<group>"; };
 		AAE6B9FB2458C9EA0051CD31 /* GeoJSON_Point_Test.geojson */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = GeoJSON_Point_Test.geojson; sourceTree = "<group>"; };
@@ -449,9 +373,6 @@
 		AAE6BA232458C9EB0051CD31 /* GQTPointQuadTreeTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GQTPointQuadTreeTest.m; sourceTree = "<group>"; };
 		AAE6BA262458C9EB0051CD31 /* GMUTestClusterItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GMUTestClusterItem.m; sourceTree = "<group>"; };
 		AAE6BA272458C9EB0051CD31 /* GMUTestClusterItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GMUTestClusterItem.h; sourceTree = "<group>"; };
-		AAE6BA4E2458CBFE0051CD31 /* OCMock.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OCMock.framework; path = Carthage/Build/iOS/OCMock.framework; sourceTree = "<group>"; };
-		AAE6BA502458CC2F0051CD31 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Platforms/iPhoneOS.platform/Developer/Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
-		F84944ED209BEBED00C60C05 /* GoogleMaps.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GoogleMaps.framework; path = Pods/GoogleMaps/Maps/Frameworks/GoogleMaps.framework; sourceTree = "<group>"; };
 		F849455B209C15CE00C60C05 /* GoogleMapsUtils.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = GoogleMapsUtils.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		F849455D209C15CE00C60C05 /* GoogleMapsUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GoogleMapsUtils.h; sourceTree = "<group>"; };
 		F849455E209C15CE00C60C05 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -462,25 +383,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				AADB9A4D245780DA000C86E1 /* UIKit.framework in Frameworks */,
-				AADB9A4B245780D5000C86E1 /* SystemConfiguration.framework in Frameworks */,
-				AADB9A49245780CD000C86E1 /* QuartzCore.framework in Frameworks */,
-				AADB9A47245780C8000C86E1 /* OpenGLES.framework in Frameworks */,
-				AADB9A45245780C1000C86E1 /* libz.tbd in Frameworks */,
-				AADB9A43245780BC000C86E1 /* libc++.tbd in Frameworks */,
-				AADB9A41245780B0000C86E1 /* ImageIO.framework in Frameworks */,
-				AADB9A3F245780AA000C86E1 /* GLKit.framework in Frameworks */,
-				AADB9A3D245780A0000C86E1 /* CoreText.framework in Frameworks */,
-				AA1116BA278508BC0018C904 /* GoogleMaps.xcframework in Frameworks */,
-				AA1116BD278508BC0018C904 /* GoogleMapsCore.xcframework in Frameworks */,
-				AADB9A3B24578099000C86E1 /* CoreTelephony.framework in Frameworks */,
-				AADB9A392457808F000C86E1 /* CoreLocation.framework in Frameworks */,
-				AADB9A3724578086000C86E1 /* CoreImage.framework in Frameworks */,
-				AADB9A352457807F000C86E1 /* CoreGraphics.framework in Frameworks */,
-				AADB9A3324578079000C86E1 /* CoreData.framework in Frameworks */,
-				AADB9A3124578070000C86E1 /* Accelerate.framework in Frameworks */,
-				AA1116B7278508BC0018C904 /* GoogleMapsBase.xcframework in Frameworks */,
-				AA1116A62784FAE50018C904 /* OCMock.xcframework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -488,11 +390,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				AAE6BA512458CC2F0051CD31 /* XCTest.framework in Frameworks */,
-				AA1116B8278508BC0018C904 /* GoogleMapsBase.xcframework in Frameworks */,
-				AA1116BE278508BC0018C904 /* GoogleMapsCore.xcframework in Frameworks */,
-				AA1116A72784FAF10018C904 /* OCMock.xcframework in Frameworks */,
-				AA1116BB278508BC0018C904 /* GoogleMaps.xcframework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -500,24 +397,9 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				AA1116BF278508BC0018C904 /* GoogleMapsCore.xcframework in Frameworks */,
-				AABFFEA4245787A20015D8C6 /* UIKit.framework in Frameworks */,
-				AABFFEA32457879D0015D8C6 /* SystemConfiguration.framework in Frameworks */,
-				AA1116BC278508BC0018C904 /* GoogleMaps.xcframework in Frameworks */,
-				AABFFEA1245787950015D8C6 /* QuartzCore.framework in Frameworks */,
-				AABFFE9F245787900015D8C6 /* OpenGLES.framework in Frameworks */,
-				AABFFE9E2457878A0015D8C6 /* libz.tbd in Frameworks */,
-				AABFFE9C245787840015D8C6 /* libc++.tbd in Frameworks */,
-				AABFFE9A2457877C0015D8C6 /* ImageIO.framework in Frameworks */,
-				AABFFE98245787760015D8C6 /* GLKit.framework in Frameworks */,
-				AABFFE972457876F0015D8C6 /* CoreText.framework in Frameworks */,
-				AABFFE952457876B0015D8C6 /* CoreTelephony.framework in Frameworks */,
-				AA1116B9278508BC0018C904 /* GoogleMapsBase.xcframework in Frameworks */,
-				AABFFE93245787640015D8C6 /* CoreLocation.framework in Frameworks */,
-				AABFFE912457875D0015D8C6 /* CoreImage.framework in Frameworks */,
-				AABFFE8F245787560015D8C6 /* CoreGraphics.framework in Frameworks */,
-				AABFFE8D245787510015D8C6 /* CoreData.framework in Frameworks */,
-				AABFFE8B245787390015D8C6 /* Accelerate.framework in Frameworks */,
+				B66B86D42B51CE0000F358F2 /* GoogleMaps in Frameworks */,
+				B66B86D82B51CE0000F358F2 /* GoogleMapsCore in Frameworks */,
+				B66B86D62B51CE0000F358F2 /* GoogleMapsBase in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -527,10 +409,6 @@
 		0242D1711C7C16A400557130 = {
 			isa = PBXGroup;
 			children = (
-				AA1116B5278508BC0018C904 /* GoogleMaps.xcframework */,
-				AA1116B4278508BC0018C904 /* GoogleMapsBase.xcframework */,
-				AA1116B6278508BC0018C904 /* GoogleMapsCore.xcframework */,
-				AAE6B9F52458C98B0051CD31 /* GoogleMaps.bundle */,
 				0242D1B51C7C1A2100557130 /* App */,
 				0242D1881C7C19A500557130 /* Source */,
 				0242D2101C7E752B00557130 /* UnitTest */,
@@ -650,39 +528,6 @@
 		456BADDE8195197F06EDEE32 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				AA1116A52784FAE50018C904 /* OCMock.xcframework */,
-				AAE6BA502458CC2F0051CD31 /* XCTest.framework */,
-				AAE6BA4E2458CBFE0051CD31 /* OCMock.framework */,
-				AABFFEA22457879D0015D8C6 /* SystemConfiguration.framework */,
-				AABFFEA0245787950015D8C6 /* QuartzCore.framework */,
-				AABFFE9D2457878A0015D8C6 /* libz.tbd */,
-				AABFFE9B245787840015D8C6 /* libc++.tbd */,
-				AABFFE992457877C0015D8C6 /* ImageIO.framework */,
-				AABFFE962457876F0015D8C6 /* CoreText.framework */,
-				AABFFE942457876B0015D8C6 /* CoreTelephony.framework */,
-				AABFFE92245787640015D8C6 /* CoreLocation.framework */,
-				AABFFE902457875D0015D8C6 /* CoreImage.framework */,
-				AABFFE8E245787560015D8C6 /* CoreGraphics.framework */,
-				AABFFE8C245787510015D8C6 /* CoreData.framework */,
-				AABFFE8A245787390015D8C6 /* Accelerate.framework */,
-				AADB9A4C245780DA000C86E1 /* UIKit.framework */,
-				AADB9A4A245780D5000C86E1 /* SystemConfiguration.framework */,
-				AADB9A48245780CD000C86E1 /* QuartzCore.framework */,
-				AADB9A46245780C8000C86E1 /* OpenGLES.framework */,
-				AADB9A44245780C1000C86E1 /* libz.tbd */,
-				AADB9A42245780BC000C86E1 /* libc++.tbd */,
-				AADB9A40245780B0000C86E1 /* ImageIO.framework */,
-				AADB9A3E245780AA000C86E1 /* GLKit.framework */,
-				AADB9A3C245780A0000C86E1 /* CoreText.framework */,
-				AADB9A3A24578099000C86E1 /* CoreTelephony.framework */,
-				AADB9A382457808F000C86E1 /* CoreLocation.framework */,
-				AADB9A3624578086000C86E1 /* CoreImage.framework */,
-				AADB9A342457807F000C86E1 /* CoreGraphics.framework */,
-				AADB9A3224578079000C86E1 /* CoreData.framework */,
-				AADB9A302457806F000C86E1 /* Accelerate.framework */,
-				F84944ED209BEBED00C60C05 /* GoogleMaps.framework */,
-				50EB71F39B4F31FF9127AD8B /* libPods-UnitTest.a */,
-				662F6FAE156096701716AEEC /* libPods-DevApp.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -1104,7 +949,6 @@
 				0242D1C81C7C1C1F00557130 /* Sources */,
 				0242D1C91C7C1C1F00557130 /* Frameworks */,
 				0242D1CA1C7C1C1F00557130 /* Resources */,
-				AAB7CC9C24592D9000127E16 /* ShellScript */,
 			);
 			buildRules = (
 			);
@@ -1150,6 +994,11 @@
 			dependencies = (
 			);
 			name = GoogleMapsUtils;
+			packageProductDependencies = (
+				B66B86D32B51CE0000F358F2 /* GoogleMaps */,
+				B66B86D52B51CE0000F358F2 /* GoogleMapsBase */,
+				B66B86D72B51CE0000F358F2 /* GoogleMapsCore */,
+			);
 			productName = GoogleMapsUtils;
 			productReference = F849455B209C15CE00C60C05 /* GoogleMapsUtils.framework */;
 			productType = "com.apple.product-type.framework";
@@ -1178,7 +1027,7 @@
 				};
 			};
 			buildConfigurationList = 0242D1751C7C16A400557130 /* Build configuration list for PBXProject "GoogleMapsUtils" */;
-			compatibilityVersion = "Xcode 3.2";
+			compatibilityVersion = "Xcode 14.0";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
@@ -1187,6 +1036,9 @@
 				Base,
 			);
 			mainGroup = 0242D1711C7C16A400557130;
+			packageReferences = (
+				B66B86D22B51CE0000F358F2 /* XCRemoteSwiftPackageReference "ios-maps-sdk" */,
+			);
 			productRefGroup = 0242D17B1C7C16A400557130 /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -1229,7 +1081,6 @@
 				AAE6BA2B2458C9EB0051CD31 /* GeoJSON_FeatureCollection_Test.geojson in Resources */,
 				AAE6B9F02458C92B0051CD31 /* m4.png in Resources */,
 				AAE6BA2A2458C9EB0051CD31 /* GeoJSON_Point_Test.geojson in Resources */,
-				AAE6B9F62458C98B0051CD31 /* GoogleMaps.bundle in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1237,7 +1088,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				3EE0C60424C8B55D00D15D38 /* GoogleMaps.bundle in Resources */,
 				AAB7CCAA24592F0000127E16 /* KML_MultiGeometry_Test.kml in Resources */,
 				AAB7CCA224592E8A00127E16 /* GeoJSON_MultiPoint_Test.geojson in Resources */,
 				AAB7CCA124592E8A00127E16 /* GeoJSON_FeatureCollection_Test.geojson in Resources */,
@@ -1262,32 +1112,12 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				3A29047724EC964F002EB180 /* GoogleMaps.bundle in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		AAB7CC9C24592D9000127E16 /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"$(SRCROOT)/Carthage/Build/iOS/OCMock.framework",
-			);
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/OCMock.framework",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n/usr/local/bin/carthage copy-frameworks\n";
-		};
 		AAB7CC9D24592DEA00127E16 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -1866,6 +1696,35 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
+
+/* Begin XCRemoteSwiftPackageReference section */
+		B66B86D22B51CE0000F358F2 /* XCRemoteSwiftPackageReference "ios-maps-sdk" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/googlemaps/ios-maps-sdk";
+			requirement = {
+				kind = exactVersion;
+				version = 8.3.1;
+			};
+		};
+/* End XCRemoteSwiftPackageReference section */
+
+/* Begin XCSwiftPackageProductDependency section */
+		B66B86D32B51CE0000F358F2 /* GoogleMaps */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = B66B86D22B51CE0000F358F2 /* XCRemoteSwiftPackageReference "ios-maps-sdk" */;
+			productName = GoogleMaps;
+		};
+		B66B86D52B51CE0000F358F2 /* GoogleMapsBase */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = B66B86D22B51CE0000F358F2 /* XCRemoteSwiftPackageReference "ios-maps-sdk" */;
+			productName = GoogleMapsBase;
+		};
+		B66B86D72B51CE0000F358F2 /* GoogleMapsCore */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = B66B86D22B51CE0000F358F2 /* XCRemoteSwiftPackageReference "ios-maps-sdk" */;
+			productName = GoogleMapsCore;
+		};
+/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 0242D1721C7C16A400557130 /* Project object */;
 }
diff --git a/Package.swift b/Package.swift
index 0a7dcd7e..e263b78b 100644
--- a/Package.swift
+++ b/Package.swift
@@ -18,14 +18,37 @@ import PackageDescription
 
 let package = Package(
   name: "GoogleMapsUtils",
+  platforms: [
+      .iOS(.v14)
+  ],
   products: [
-    .library(name: "GoogleMapsUtils", targets: ["GoogleMapsUtils"])
+    .library(
+      name: "GoogleMapsUtils",
+      targets: ["GoogleMapsUtils", "GoogleMapsUtilsSwift"]),
+  ],
+  dependencies: [
+    .package(
+      url: "https://github.com/googlemaps/ios-maps-sdk",
+      from: "8.3.1")
   ],
   targets: [
-    .binaryTarget(
+    .target(
       name: "GoogleMapsUtils",
-      url: "https://github.com/googlemaps/google-maps-ios-utils/releases/download/v4.2.2/GoogleMapsUtils.xcframework.zip",
-      checksum: "e4c5c3a669ad65130d52c22bd993724707d054ba065d6f60b396715e465504a2"
+      dependencies: [
+        .product(name: "GoogleMaps", package: "ios-maps-sdk"),
+        .product(name: "GoogleMapsCore", package: "ios-maps-sdk"),
+        .product(name: "GoogleMapsBase", package: "ios-maps-sdk")
+      ],
+      publicHeadersPath: "include"
+    ),
+    .target(
+      name: "GoogleMapsUtilsSwift",
+      dependencies: [
+        "GoogleMapsUtils",
+        .product(name: "GoogleMaps", package: "ios-maps-sdk"),
+        .product(name: "GoogleMapsCore", package: "ios-maps-sdk"),
+        .product(name: "GoogleMapsBase", package: "ios-maps-sdk")
+      ]
     )
   ]
 )
diff --git a/src/Clustering/Algo/GMUClusterAlgorithm.h b/Sources/GoogleMapsUtils/Clustering/Algo/GMUClusterAlgorithm.h
similarity index 100%
rename from src/Clustering/Algo/GMUClusterAlgorithm.h
rename to Sources/GoogleMapsUtils/Clustering/Algo/GMUClusterAlgorithm.h
diff --git a/src/Clustering/Algo/GMUGridBasedClusterAlgorithm.h b/Sources/GoogleMapsUtils/Clustering/Algo/GMUGridBasedClusterAlgorithm.h
similarity index 100%
rename from src/Clustering/Algo/GMUGridBasedClusterAlgorithm.h
rename to Sources/GoogleMapsUtils/Clustering/Algo/GMUGridBasedClusterAlgorithm.h
diff --git a/src/Clustering/Algo/GMUGridBasedClusterAlgorithm.m b/Sources/GoogleMapsUtils/Clustering/Algo/GMUGridBasedClusterAlgorithm.m
similarity index 100%
rename from src/Clustering/Algo/GMUGridBasedClusterAlgorithm.m
rename to Sources/GoogleMapsUtils/Clustering/Algo/GMUGridBasedClusterAlgorithm.m
diff --git a/src/Clustering/Algo/GMUNonHierarchicalDistanceBasedAlgorithm.h b/Sources/GoogleMapsUtils/Clustering/Algo/GMUNonHierarchicalDistanceBasedAlgorithm.h
similarity index 100%
rename from src/Clustering/Algo/GMUNonHierarchicalDistanceBasedAlgorithm.h
rename to Sources/GoogleMapsUtils/Clustering/Algo/GMUNonHierarchicalDistanceBasedAlgorithm.h
diff --git a/src/Clustering/Algo/GMUNonHierarchicalDistanceBasedAlgorithm.m b/Sources/GoogleMapsUtils/Clustering/Algo/GMUNonHierarchicalDistanceBasedAlgorithm.m
similarity index 100%
rename from src/Clustering/Algo/GMUNonHierarchicalDistanceBasedAlgorithm.m
rename to Sources/GoogleMapsUtils/Clustering/Algo/GMUNonHierarchicalDistanceBasedAlgorithm.m
diff --git a/src/Clustering/Algo/GMUSimpleClusterAlgorithm.h b/Sources/GoogleMapsUtils/Clustering/Algo/GMUSimpleClusterAlgorithm.h
similarity index 100%
rename from src/Clustering/Algo/GMUSimpleClusterAlgorithm.h
rename to Sources/GoogleMapsUtils/Clustering/Algo/GMUSimpleClusterAlgorithm.h
diff --git a/src/Clustering/Algo/GMUSimpleClusterAlgorithm.m b/Sources/GoogleMapsUtils/Clustering/Algo/GMUSimpleClusterAlgorithm.m
similarity index 100%
rename from src/Clustering/Algo/GMUSimpleClusterAlgorithm.m
rename to Sources/GoogleMapsUtils/Clustering/Algo/GMUSimpleClusterAlgorithm.m
diff --git a/src/Clustering/Algo/GMUWrappingDictionaryKey.h b/Sources/GoogleMapsUtils/Clustering/Algo/GMUWrappingDictionaryKey.h
similarity index 100%
rename from src/Clustering/Algo/GMUWrappingDictionaryKey.h
rename to Sources/GoogleMapsUtils/Clustering/Algo/GMUWrappingDictionaryKey.h
diff --git a/src/Clustering/Algo/GMUWrappingDictionaryKey.m b/Sources/GoogleMapsUtils/Clustering/Algo/GMUWrappingDictionaryKey.m
similarity index 100%
rename from src/Clustering/Algo/GMUWrappingDictionaryKey.m
rename to Sources/GoogleMapsUtils/Clustering/Algo/GMUWrappingDictionaryKey.m
diff --git a/src/Clustering/GMSMarker+GMUClusteritem.h b/Sources/GoogleMapsUtils/Clustering/GMSMarker+GMUClusteritem.h
similarity index 100%
rename from src/Clustering/GMSMarker+GMUClusteritem.h
rename to Sources/GoogleMapsUtils/Clustering/GMSMarker+GMUClusteritem.h
diff --git a/src/Clustering/GMSMarker+GMUClusteritem.m b/Sources/GoogleMapsUtils/Clustering/GMSMarker+GMUClusteritem.m
similarity index 100%
rename from src/Clustering/GMSMarker+GMUClusteritem.m
rename to Sources/GoogleMapsUtils/Clustering/GMSMarker+GMUClusteritem.m
diff --git a/src/Clustering/GMUCluster.h b/Sources/GoogleMapsUtils/Clustering/GMUCluster.h
similarity index 100%
rename from src/Clustering/GMUCluster.h
rename to Sources/GoogleMapsUtils/Clustering/GMUCluster.h
diff --git a/src/Clustering/GMUClusterItem.h b/Sources/GoogleMapsUtils/Clustering/GMUClusterItem.h
similarity index 100%
rename from src/Clustering/GMUClusterItem.h
rename to Sources/GoogleMapsUtils/Clustering/GMUClusterItem.h
diff --git a/src/Clustering/GMUClusterManager+Testing.h b/Sources/GoogleMapsUtils/Clustering/GMUClusterManager+Testing.h
similarity index 100%
rename from src/Clustering/GMUClusterManager+Testing.h
rename to Sources/GoogleMapsUtils/Clustering/GMUClusterManager+Testing.h
diff --git a/src/Clustering/GMUClusterManager.h b/Sources/GoogleMapsUtils/Clustering/GMUClusterManager.h
similarity index 100%
rename from src/Clustering/GMUClusterManager.h
rename to Sources/GoogleMapsUtils/Clustering/GMUClusterManager.h
diff --git a/src/Clustering/GMUClusterManager.m b/Sources/GoogleMapsUtils/Clustering/GMUClusterManager.m
similarity index 100%
rename from src/Clustering/GMUClusterManager.m
rename to Sources/GoogleMapsUtils/Clustering/GMUClusterManager.m
diff --git a/src/Clustering/GMUMarkerClustering.h b/Sources/GoogleMapsUtils/Clustering/GMUMarkerClustering.h
similarity index 100%
rename from src/Clustering/GMUMarkerClustering.h
rename to Sources/GoogleMapsUtils/Clustering/GMUMarkerClustering.h
diff --git a/src/Clustering/GMUStaticCluster.h b/Sources/GoogleMapsUtils/Clustering/GMUStaticCluster.h
similarity index 100%
rename from src/Clustering/GMUStaticCluster.h
rename to Sources/GoogleMapsUtils/Clustering/GMUStaticCluster.h
diff --git a/src/Clustering/GMUStaticCluster.m b/Sources/GoogleMapsUtils/Clustering/GMUStaticCluster.m
similarity index 100%
rename from src/Clustering/GMUStaticCluster.m
rename to Sources/GoogleMapsUtils/Clustering/GMUStaticCluster.m
diff --git a/src/Clustering/View/GMUClusterIconGenerator.h b/Sources/GoogleMapsUtils/Clustering/View/GMUClusterIconGenerator.h
similarity index 100%
rename from src/Clustering/View/GMUClusterIconGenerator.h
rename to Sources/GoogleMapsUtils/Clustering/View/GMUClusterIconGenerator.h
diff --git a/src/Clustering/View/GMUClusterRenderer.h b/Sources/GoogleMapsUtils/Clustering/View/GMUClusterRenderer.h
similarity index 100%
rename from src/Clustering/View/GMUClusterRenderer.h
rename to Sources/GoogleMapsUtils/Clustering/View/GMUClusterRenderer.h
diff --git a/src/Clustering/View/GMUDefaultClusterIconGenerator+Testing.h b/Sources/GoogleMapsUtils/Clustering/View/GMUDefaultClusterIconGenerator+Testing.h
similarity index 100%
rename from src/Clustering/View/GMUDefaultClusterIconGenerator+Testing.h
rename to Sources/GoogleMapsUtils/Clustering/View/GMUDefaultClusterIconGenerator+Testing.h
diff --git a/src/Clustering/View/GMUDefaultClusterIconGenerator.h b/Sources/GoogleMapsUtils/Clustering/View/GMUDefaultClusterIconGenerator.h
similarity index 100%
rename from src/Clustering/View/GMUDefaultClusterIconGenerator.h
rename to Sources/GoogleMapsUtils/Clustering/View/GMUDefaultClusterIconGenerator.h
diff --git a/src/Clustering/View/GMUDefaultClusterIconGenerator.m b/Sources/GoogleMapsUtils/Clustering/View/GMUDefaultClusterIconGenerator.m
similarity index 100%
rename from src/Clustering/View/GMUDefaultClusterIconGenerator.m
rename to Sources/GoogleMapsUtils/Clustering/View/GMUDefaultClusterIconGenerator.m
diff --git a/src/Clustering/View/GMUDefaultClusterRenderer+Testing.h b/Sources/GoogleMapsUtils/Clustering/View/GMUDefaultClusterRenderer+Testing.h
similarity index 100%
rename from src/Clustering/View/GMUDefaultClusterRenderer+Testing.h
rename to Sources/GoogleMapsUtils/Clustering/View/GMUDefaultClusterRenderer+Testing.h
diff --git a/src/Clustering/View/GMUDefaultClusterRenderer.h b/Sources/GoogleMapsUtils/Clustering/View/GMUDefaultClusterRenderer.h
similarity index 100%
rename from src/Clustering/View/GMUDefaultClusterRenderer.h
rename to Sources/GoogleMapsUtils/Clustering/View/GMUDefaultClusterRenderer.h
diff --git a/src/Clustering/View/GMUDefaultClusterRenderer.m b/Sources/GoogleMapsUtils/Clustering/View/GMUDefaultClusterRenderer.m
similarity index 100%
rename from src/Clustering/View/GMUDefaultClusterRenderer.m
rename to Sources/GoogleMapsUtils/Clustering/View/GMUDefaultClusterRenderer.m
diff --git a/src/Geometry/GMUGeoJSONParser.h b/Sources/GoogleMapsUtils/Geometry/GMUGeoJSONParser.h
similarity index 100%
rename from src/Geometry/GMUGeoJSONParser.h
rename to Sources/GoogleMapsUtils/Geometry/GMUGeoJSONParser.h
diff --git a/src/Geometry/GMUGeoJSONParser.m b/Sources/GoogleMapsUtils/Geometry/GMUGeoJSONParser.m
similarity index 100%
rename from src/Geometry/GMUGeoJSONParser.m
rename to Sources/GoogleMapsUtils/Geometry/GMUGeoJSONParser.m
diff --git a/src/Geometry/GMUGeometryRenderer+Testing.h b/Sources/GoogleMapsUtils/Geometry/GMUGeometryRenderer+Testing.h
similarity index 100%
rename from src/Geometry/GMUGeometryRenderer+Testing.h
rename to Sources/GoogleMapsUtils/Geometry/GMUGeometryRenderer+Testing.h
diff --git a/src/Geometry/GMUGeometryRenderer.h b/Sources/GoogleMapsUtils/Geometry/GMUGeometryRenderer.h
similarity index 100%
rename from src/Geometry/GMUGeometryRenderer.h
rename to Sources/GoogleMapsUtils/Geometry/GMUGeometryRenderer.h
diff --git a/src/Geometry/GMUGeometryRenderer.m b/Sources/GoogleMapsUtils/Geometry/GMUGeometryRenderer.m
similarity index 100%
rename from src/Geometry/GMUGeometryRenderer.m
rename to Sources/GoogleMapsUtils/Geometry/GMUGeometryRenderer.m
diff --git a/src/Geometry/GMUKMLParser.h b/Sources/GoogleMapsUtils/Geometry/GMUKMLParser.h
similarity index 100%
rename from src/Geometry/GMUKMLParser.h
rename to Sources/GoogleMapsUtils/Geometry/GMUKMLParser.h
diff --git a/src/Geometry/GMUKMLParser.m b/Sources/GoogleMapsUtils/Geometry/GMUKMLParser.m
similarity index 100%
rename from src/Geometry/GMUKMLParser.m
rename to Sources/GoogleMapsUtils/Geometry/GMUKMLParser.m
diff --git a/src/Geometry/Model/GMUFeature.h b/Sources/GoogleMapsUtils/Geometry/Model/GMUFeature.h
similarity index 100%
rename from src/Geometry/Model/GMUFeature.h
rename to Sources/GoogleMapsUtils/Geometry/Model/GMUFeature.h
diff --git a/src/Geometry/Model/GMUFeature.m b/Sources/GoogleMapsUtils/Geometry/Model/GMUFeature.m
similarity index 100%
rename from src/Geometry/Model/GMUFeature.m
rename to Sources/GoogleMapsUtils/Geometry/Model/GMUFeature.m
diff --git a/src/Geometry/Model/GMUGeometry.h b/Sources/GoogleMapsUtils/Geometry/Model/GMUGeometry.h
similarity index 100%
rename from src/Geometry/Model/GMUGeometry.h
rename to Sources/GoogleMapsUtils/Geometry/Model/GMUGeometry.h
diff --git a/src/Geometry/Model/GMUGeometryCollection.h b/Sources/GoogleMapsUtils/Geometry/Model/GMUGeometryCollection.h
similarity index 100%
rename from src/Geometry/Model/GMUGeometryCollection.h
rename to Sources/GoogleMapsUtils/Geometry/Model/GMUGeometryCollection.h
diff --git a/src/Geometry/Model/GMUGeometryCollection.m b/Sources/GoogleMapsUtils/Geometry/Model/GMUGeometryCollection.m
similarity index 100%
rename from src/Geometry/Model/GMUGeometryCollection.m
rename to Sources/GoogleMapsUtils/Geometry/Model/GMUGeometryCollection.m
diff --git a/src/Geometry/Model/GMUGeometryContainer.h b/Sources/GoogleMapsUtils/Geometry/Model/GMUGeometryContainer.h
similarity index 100%
rename from src/Geometry/Model/GMUGeometryContainer.h
rename to Sources/GoogleMapsUtils/Geometry/Model/GMUGeometryContainer.h
diff --git a/src/Geometry/Model/GMUGroundOverlay.h b/Sources/GoogleMapsUtils/Geometry/Model/GMUGroundOverlay.h
similarity index 100%
rename from src/Geometry/Model/GMUGroundOverlay.h
rename to Sources/GoogleMapsUtils/Geometry/Model/GMUGroundOverlay.h
diff --git a/src/Geometry/Model/GMUGroundOverlay.m b/Sources/GoogleMapsUtils/Geometry/Model/GMUGroundOverlay.m
similarity index 100%
rename from src/Geometry/Model/GMUGroundOverlay.m
rename to Sources/GoogleMapsUtils/Geometry/Model/GMUGroundOverlay.m
diff --git a/src/Geometry/Model/GMULineString.h b/Sources/GoogleMapsUtils/Geometry/Model/GMULineString.h
similarity index 100%
rename from src/Geometry/Model/GMULineString.h
rename to Sources/GoogleMapsUtils/Geometry/Model/GMULineString.h
diff --git a/src/Geometry/Model/GMULineString.m b/Sources/GoogleMapsUtils/Geometry/Model/GMULineString.m
similarity index 100%
rename from src/Geometry/Model/GMULineString.m
rename to Sources/GoogleMapsUtils/Geometry/Model/GMULineString.m
diff --git a/src/Geometry/Model/GMUPair.h b/Sources/GoogleMapsUtils/Geometry/Model/GMUPair.h
similarity index 100%
rename from src/Geometry/Model/GMUPair.h
rename to Sources/GoogleMapsUtils/Geometry/Model/GMUPair.h
diff --git a/src/Geometry/Model/GMUPair.m b/Sources/GoogleMapsUtils/Geometry/Model/GMUPair.m
similarity index 100%
rename from src/Geometry/Model/GMUPair.m
rename to Sources/GoogleMapsUtils/Geometry/Model/GMUPair.m
diff --git a/src/Geometry/Model/GMUPlacemark.h b/Sources/GoogleMapsUtils/Geometry/Model/GMUPlacemark.h
similarity index 100%
rename from src/Geometry/Model/GMUPlacemark.h
rename to Sources/GoogleMapsUtils/Geometry/Model/GMUPlacemark.h
diff --git a/src/Geometry/Model/GMUPlacemark.m b/Sources/GoogleMapsUtils/Geometry/Model/GMUPlacemark.m
similarity index 100%
rename from src/Geometry/Model/GMUPlacemark.m
rename to Sources/GoogleMapsUtils/Geometry/Model/GMUPlacemark.m
diff --git a/src/Geometry/Model/GMUPoint.h b/Sources/GoogleMapsUtils/Geometry/Model/GMUPoint.h
similarity index 100%
rename from src/Geometry/Model/GMUPoint.h
rename to Sources/GoogleMapsUtils/Geometry/Model/GMUPoint.h
diff --git a/src/Geometry/Model/GMUPoint.m b/Sources/GoogleMapsUtils/Geometry/Model/GMUPoint.m
similarity index 100%
rename from src/Geometry/Model/GMUPoint.m
rename to Sources/GoogleMapsUtils/Geometry/Model/GMUPoint.m
diff --git a/src/Geometry/Model/GMUPolygon.h b/Sources/GoogleMapsUtils/Geometry/Model/GMUPolygon.h
similarity index 100%
rename from src/Geometry/Model/GMUPolygon.h
rename to Sources/GoogleMapsUtils/Geometry/Model/GMUPolygon.h
diff --git a/src/Geometry/Model/GMUPolygon.m b/Sources/GoogleMapsUtils/Geometry/Model/GMUPolygon.m
similarity index 100%
rename from src/Geometry/Model/GMUPolygon.m
rename to Sources/GoogleMapsUtils/Geometry/Model/GMUPolygon.m
diff --git a/src/Geometry/Model/GMUStyle.h b/Sources/GoogleMapsUtils/Geometry/Model/GMUStyle.h
similarity index 100%
rename from src/Geometry/Model/GMUStyle.h
rename to Sources/GoogleMapsUtils/Geometry/Model/GMUStyle.h
diff --git a/src/Geometry/Model/GMUStyle.m b/Sources/GoogleMapsUtils/Geometry/Model/GMUStyle.m
similarity index 100%
rename from src/Geometry/Model/GMUStyle.m
rename to Sources/GoogleMapsUtils/Geometry/Model/GMUStyle.m
diff --git a/src/Geometry/Model/GMUStyleMap.h b/Sources/GoogleMapsUtils/Geometry/Model/GMUStyleMap.h
similarity index 100%
rename from src/Geometry/Model/GMUStyleMap.h
rename to Sources/GoogleMapsUtils/Geometry/Model/GMUStyleMap.h
diff --git a/src/Geometry/Model/GMUStyleMap.m b/Sources/GoogleMapsUtils/Geometry/Model/GMUStyleMap.m
similarity index 100%
rename from src/Geometry/Model/GMUStyleMap.m
rename to Sources/GoogleMapsUtils/Geometry/Model/GMUStyleMap.m
diff --git a/src/Heatmap/GMUGradient.h b/Sources/GoogleMapsUtils/Heatmap/GMUGradient.h
similarity index 100%
rename from src/Heatmap/GMUGradient.h
rename to Sources/GoogleMapsUtils/Heatmap/GMUGradient.h
diff --git a/src/Heatmap/GMUGradient.m b/Sources/GoogleMapsUtils/Heatmap/GMUGradient.m
similarity index 100%
rename from src/Heatmap/GMUGradient.m
rename to Sources/GoogleMapsUtils/Heatmap/GMUGradient.m
diff --git a/src/Heatmap/GMUHeatmapTileLayer+Testing.h b/Sources/GoogleMapsUtils/Heatmap/GMUHeatmapTileLayer+Testing.h
similarity index 100%
rename from src/Heatmap/GMUHeatmapTileLayer+Testing.h
rename to Sources/GoogleMapsUtils/Heatmap/GMUHeatmapTileLayer+Testing.h
diff --git a/src/Heatmap/GMUHeatmapTileLayer.h b/Sources/GoogleMapsUtils/Heatmap/GMUHeatmapTileLayer.h
similarity index 100%
rename from src/Heatmap/GMUHeatmapTileLayer.h
rename to Sources/GoogleMapsUtils/Heatmap/GMUHeatmapTileLayer.h
diff --git a/src/Heatmap/GMUHeatmapTileLayer.m b/Sources/GoogleMapsUtils/Heatmap/GMUHeatmapTileLayer.m
similarity index 100%
rename from src/Heatmap/GMUHeatmapTileLayer.m
rename to Sources/GoogleMapsUtils/Heatmap/GMUHeatmapTileLayer.m
diff --git a/src/Heatmap/GMUWeightedLatLng.h b/Sources/GoogleMapsUtils/Heatmap/GMUWeightedLatLng.h
similarity index 100%
rename from src/Heatmap/GMUWeightedLatLng.h
rename to Sources/GoogleMapsUtils/Heatmap/GMUWeightedLatLng.h
diff --git a/src/Heatmap/GMUWeightedLatLng.m b/Sources/GoogleMapsUtils/Heatmap/GMUWeightedLatLng.m
similarity index 100%
rename from src/Heatmap/GMUWeightedLatLng.m
rename to Sources/GoogleMapsUtils/Heatmap/GMUWeightedLatLng.m
diff --git a/src/QuadTree/GQTBounds.h b/Sources/GoogleMapsUtils/QuadTree/GQTBounds.h
similarity index 100%
rename from src/QuadTree/GQTBounds.h
rename to Sources/GoogleMapsUtils/QuadTree/GQTBounds.h
diff --git a/src/QuadTree/GQTPoint.h b/Sources/GoogleMapsUtils/QuadTree/GQTPoint.h
similarity index 100%
rename from src/QuadTree/GQTPoint.h
rename to Sources/GoogleMapsUtils/QuadTree/GQTPoint.h
diff --git a/src/QuadTree/GQTPointQuadTree.h b/Sources/GoogleMapsUtils/QuadTree/GQTPointQuadTree.h
similarity index 100%
rename from src/QuadTree/GQTPointQuadTree.h
rename to Sources/GoogleMapsUtils/QuadTree/GQTPointQuadTree.h
diff --git a/src/QuadTree/GQTPointQuadTree.m b/Sources/GoogleMapsUtils/QuadTree/GQTPointQuadTree.m
similarity index 100%
rename from src/QuadTree/GQTPointQuadTree.m
rename to Sources/GoogleMapsUtils/QuadTree/GQTPointQuadTree.m
diff --git a/src/QuadTree/GQTPointQuadTreeChild.h b/Sources/GoogleMapsUtils/QuadTree/GQTPointQuadTreeChild.h
similarity index 100%
rename from src/QuadTree/GQTPointQuadTreeChild.h
rename to Sources/GoogleMapsUtils/QuadTree/GQTPointQuadTreeChild.h
diff --git a/src/QuadTree/GQTPointQuadTreeChild.m b/Sources/GoogleMapsUtils/QuadTree/GQTPointQuadTreeChild.m
similarity index 100%
rename from src/QuadTree/GQTPointQuadTreeChild.m
rename to Sources/GoogleMapsUtils/QuadTree/GQTPointQuadTreeChild.m
diff --git a/src/QuadTree/GQTPointQuadTreeItem.h b/Sources/GoogleMapsUtils/QuadTree/GQTPointQuadTreeItem.h
similarity index 100%
rename from src/QuadTree/GQTPointQuadTreeItem.h
rename to Sources/GoogleMapsUtils/QuadTree/GQTPointQuadTreeItem.h
diff --git a/src/GeometryUtils/CLLocationCoordinate2D+GeometryUtils.swift b/Sources/GoogleMapsUtilsSwift/GeometryUtils/CLLocationCoordinate2D+GeometryUtils.swift
similarity index 100%
rename from src/GeometryUtils/CLLocationCoordinate2D+GeometryUtils.swift
rename to Sources/GoogleMapsUtilsSwift/GeometryUtils/CLLocationCoordinate2D+GeometryUtils.swift
diff --git a/src/GeometryUtils/GMSPath+GeometryUtils.swift b/Sources/GoogleMapsUtilsSwift/GeometryUtils/GMSPath+GeometryUtils.swift
similarity index 100%
rename from src/GeometryUtils/GMSPath+GeometryUtils.swift
rename to Sources/GoogleMapsUtilsSwift/GeometryUtils/GMSPath+GeometryUtils.swift
diff --git a/src/GeometryUtils/GMSPolygon+GeometryUtils.swift b/Sources/GoogleMapsUtilsSwift/GeometryUtils/GMSPolygon+GeometryUtils.swift
similarity index 100%
rename from src/GeometryUtils/GMSPolygon+GeometryUtils.swift
rename to Sources/GoogleMapsUtilsSwift/GeometryUtils/GMSPolygon+GeometryUtils.swift
diff --git a/src/GeometryUtils/GMSPolyline+GeometryUtils.swift b/Sources/GoogleMapsUtilsSwift/GeometryUtils/GMSPolyline+GeometryUtils.swift
similarity index 100%
rename from src/GeometryUtils/GMSPolyline+GeometryUtils.swift
rename to Sources/GoogleMapsUtilsSwift/GeometryUtils/GMSPolyline+GeometryUtils.swift
diff --git a/src/GeometryUtils/Internal/CatesianPoint.swift b/Sources/GoogleMapsUtilsSwift/GeometryUtils/Internal/CatesianPoint.swift
similarity index 100%
rename from src/GeometryUtils/Internal/CatesianPoint.swift
rename to Sources/GoogleMapsUtilsSwift/GeometryUtils/Internal/CatesianPoint.swift
diff --git a/src/GeometryUtils/Internal/LatLngRadians.swift b/Sources/GoogleMapsUtilsSwift/GeometryUtils/Internal/LatLngRadians.swift
similarity index 100%
rename from src/GeometryUtils/Internal/LatLngRadians.swift
rename to Sources/GoogleMapsUtilsSwift/GeometryUtils/Internal/LatLngRadians.swift
diff --git a/src/GeometryUtils/MapPoint.swift b/Sources/GoogleMapsUtilsSwift/GeometryUtils/MapPoint.swift
similarity index 100%
rename from src/GeometryUtils/MapPoint.swift
rename to Sources/GoogleMapsUtilsSwift/GeometryUtils/MapPoint.swift
diff --git a/src/GeometryUtils/Math.swift b/Sources/GoogleMapsUtilsSwift/GeometryUtils/Math.swift
similarity index 100%
rename from src/GeometryUtils/Math.swift
rename to Sources/GoogleMapsUtilsSwift/GeometryUtils/Math.swift
diff --git a/src/Heatmap/HeatMapInterpolationPoints.swift b/Sources/GoogleMapsUtilsSwift/Heatmap/HeatMapInterpolationPoints.swift
similarity index 99%
rename from src/Heatmap/HeatMapInterpolationPoints.swift
rename to Sources/GoogleMapsUtilsSwift/Heatmap/HeatMapInterpolationPoints.swift
index 4d4f752d..997cef17 100644
--- a/src/Heatmap/HeatMapInterpolationPoints.swift
+++ b/Sources/GoogleMapsUtilsSwift/Heatmap/HeatMapInterpolationPoints.swift
@@ -14,6 +14,7 @@
 */
 
 import GoogleMaps
+import GoogleMapsUtils
 
 /// A simple fraction class; the main use case is for finding intensity values, which are represented as fractions
 struct Fraction {
diff --git a/test/common/Model/GMUTestClusterItem.h b/Tests/GoogleMapsUtilsTests/common/Model/GMUTestClusterItem.h
similarity index 100%
rename from test/common/Model/GMUTestClusterItem.h
rename to Tests/GoogleMapsUtilsTests/common/Model/GMUTestClusterItem.h
diff --git a/test/common/Model/GMUTestClusterItem.m b/Tests/GoogleMapsUtilsTests/common/Model/GMUTestClusterItem.m
similarity index 100%
rename from test/common/Model/GMUTestClusterItem.m
rename to Tests/GoogleMapsUtilsTests/common/Model/GMUTestClusterItem.m
diff --git a/test/resources/GeoJSON/GeoJSON_FeatureCollection_Test.geojson b/Tests/GoogleMapsUtilsTests/resources/GeoJSON/GeoJSON_FeatureCollection_Test.geojson
similarity index 100%
rename from test/resources/GeoJSON/GeoJSON_FeatureCollection_Test.geojson
rename to Tests/GoogleMapsUtilsTests/resources/GeoJSON/GeoJSON_FeatureCollection_Test.geojson
diff --git a/test/resources/GeoJSON/GeoJSON_Feature_Test.geojson b/Tests/GoogleMapsUtilsTests/resources/GeoJSON/GeoJSON_Feature_Test.geojson
similarity index 100%
rename from test/resources/GeoJSON/GeoJSON_Feature_Test.geojson
rename to Tests/GoogleMapsUtilsTests/resources/GeoJSON/GeoJSON_Feature_Test.geojson
diff --git a/test/resources/GeoJSON/GeoJSON_GeometryCollection_Test.geojson b/Tests/GoogleMapsUtilsTests/resources/GeoJSON/GeoJSON_GeometryCollection_Test.geojson
similarity index 100%
rename from test/resources/GeoJSON/GeoJSON_GeometryCollection_Test.geojson
rename to Tests/GoogleMapsUtilsTests/resources/GeoJSON/GeoJSON_GeometryCollection_Test.geojson
diff --git a/test/resources/GeoJSON/GeoJSON_LineString_Test.geojson b/Tests/GoogleMapsUtilsTests/resources/GeoJSON/GeoJSON_LineString_Test.geojson
similarity index 100%
rename from test/resources/GeoJSON/GeoJSON_LineString_Test.geojson
rename to Tests/GoogleMapsUtilsTests/resources/GeoJSON/GeoJSON_LineString_Test.geojson
diff --git a/test/resources/GeoJSON/GeoJSON_MultiLineString_Test.geojson b/Tests/GoogleMapsUtilsTests/resources/GeoJSON/GeoJSON_MultiLineString_Test.geojson
similarity index 100%
rename from test/resources/GeoJSON/GeoJSON_MultiLineString_Test.geojson
rename to Tests/GoogleMapsUtilsTests/resources/GeoJSON/GeoJSON_MultiLineString_Test.geojson
diff --git a/test/resources/GeoJSON/GeoJSON_MultiPoint_Test.geojson b/Tests/GoogleMapsUtilsTests/resources/GeoJSON/GeoJSON_MultiPoint_Test.geojson
similarity index 100%
rename from test/resources/GeoJSON/GeoJSON_MultiPoint_Test.geojson
rename to Tests/GoogleMapsUtilsTests/resources/GeoJSON/GeoJSON_MultiPoint_Test.geojson
diff --git a/test/resources/GeoJSON/GeoJSON_MultiPolygon_Test.geojson b/Tests/GoogleMapsUtilsTests/resources/GeoJSON/GeoJSON_MultiPolygon_Test.geojson
similarity index 100%
rename from test/resources/GeoJSON/GeoJSON_MultiPolygon_Test.geojson
rename to Tests/GoogleMapsUtilsTests/resources/GeoJSON/GeoJSON_MultiPolygon_Test.geojson
diff --git a/test/resources/GeoJSON/GeoJSON_Point_Test.geojson b/Tests/GoogleMapsUtilsTests/resources/GeoJSON/GeoJSON_Point_Test.geojson
similarity index 100%
rename from test/resources/GeoJSON/GeoJSON_Point_Test.geojson
rename to Tests/GoogleMapsUtilsTests/resources/GeoJSON/GeoJSON_Point_Test.geojson
diff --git a/test/resources/GeoJSON/GeoJSON_Polygon_Test.geojson b/Tests/GoogleMapsUtilsTests/resources/GeoJSON/GeoJSON_Polygon_Test.geojson
similarity index 100%
rename from test/resources/GeoJSON/GeoJSON_Polygon_Test.geojson
rename to Tests/GoogleMapsUtilsTests/resources/GeoJSON/GeoJSON_Polygon_Test.geojson
diff --git a/test/resources/KML/KML_GroundOverlay_Test.kml b/Tests/GoogleMapsUtilsTests/resources/KML/KML_GroundOverlay_Test.kml
similarity index 100%
rename from test/resources/KML/KML_GroundOverlay_Test.kml
rename to Tests/GoogleMapsUtilsTests/resources/KML/KML_GroundOverlay_Test.kml
diff --git a/test/resources/KML/KML_LineString_Test.kml b/Tests/GoogleMapsUtilsTests/resources/KML/KML_LineString_Test.kml
similarity index 100%
rename from test/resources/KML/KML_LineString_Test.kml
rename to Tests/GoogleMapsUtilsTests/resources/KML/KML_LineString_Test.kml
diff --git a/test/resources/KML/KML_MultiGeometry_Test.kml b/Tests/GoogleMapsUtilsTests/resources/KML/KML_MultiGeometry_Test.kml
similarity index 100%
rename from test/resources/KML/KML_MultiGeometry_Test.kml
rename to Tests/GoogleMapsUtilsTests/resources/KML/KML_MultiGeometry_Test.kml
diff --git a/test/resources/KML/KML_Placemark_Test.kml b/Tests/GoogleMapsUtilsTests/resources/KML/KML_Placemark_Test.kml
similarity index 100%
rename from test/resources/KML/KML_Placemark_Test.kml
rename to Tests/GoogleMapsUtilsTests/resources/KML/KML_Placemark_Test.kml
diff --git a/test/resources/KML/KML_Point_Test.kml b/Tests/GoogleMapsUtilsTests/resources/KML/KML_Point_Test.kml
similarity index 100%
rename from test/resources/KML/KML_Point_Test.kml
rename to Tests/GoogleMapsUtilsTests/resources/KML/KML_Point_Test.kml
diff --git a/test/resources/KML/KML_Polygon_Test.kml b/Tests/GoogleMapsUtilsTests/resources/KML/KML_Polygon_Test.kml
similarity index 100%
rename from test/resources/KML/KML_Polygon_Test.kml
rename to Tests/GoogleMapsUtilsTests/resources/KML/KML_Polygon_Test.kml
diff --git a/test/resources/KML/KML_StyleMap_Test.kml b/Tests/GoogleMapsUtilsTests/resources/KML/KML_StyleMap_Test.kml
similarity index 100%
rename from test/resources/KML/KML_StyleMap_Test.kml
rename to Tests/GoogleMapsUtilsTests/resources/KML/KML_StyleMap_Test.kml
diff --git a/test/resources/KML/KML_Style_Test.kml b/Tests/GoogleMapsUtilsTests/resources/KML/KML_Style_Test.kml
similarity index 100%
rename from test/resources/KML/KML_Style_Test.kml
rename to Tests/GoogleMapsUtilsTests/resources/KML/KML_Style_Test.kml
diff --git a/test/unit/BridgingHeader/UnitTest-Bridging-Header.h b/Tests/GoogleMapsUtilsTests/unit/BridgingHeader/UnitTest-Bridging-Header.h
similarity index 100%
rename from test/unit/BridgingHeader/UnitTest-Bridging-Header.h
rename to Tests/GoogleMapsUtilsTests/unit/BridgingHeader/UnitTest-Bridging-Header.h
diff --git a/test/unit/Clustering/GMUClusterAlgorithmTest.h b/Tests/GoogleMapsUtilsTests/unit/Clustering/GMUClusterAlgorithmTest.h
similarity index 100%
rename from test/unit/Clustering/GMUClusterAlgorithmTest.h
rename to Tests/GoogleMapsUtilsTests/unit/Clustering/GMUClusterAlgorithmTest.h
diff --git a/test/unit/Clustering/GMUClusterAlgorithmTest.m b/Tests/GoogleMapsUtilsTests/unit/Clustering/GMUClusterAlgorithmTest.m
similarity index 100%
rename from test/unit/Clustering/GMUClusterAlgorithmTest.m
rename to Tests/GoogleMapsUtilsTests/unit/Clustering/GMUClusterAlgorithmTest.m
diff --git a/test/unit/Clustering/GMUClusterManagerTest.m b/Tests/GoogleMapsUtilsTests/unit/Clustering/GMUClusterManagerTest.m
similarity index 100%
rename from test/unit/Clustering/GMUClusterManagerTest.m
rename to Tests/GoogleMapsUtilsTests/unit/Clustering/GMUClusterManagerTest.m
diff --git a/test/unit/Clustering/GMUDefaultClusterIconGeneratorTest.m b/Tests/GoogleMapsUtilsTests/unit/Clustering/GMUDefaultClusterIconGeneratorTest.m
similarity index 100%
rename from test/unit/Clustering/GMUDefaultClusterIconGeneratorTest.m
rename to Tests/GoogleMapsUtilsTests/unit/Clustering/GMUDefaultClusterIconGeneratorTest.m
diff --git a/test/unit/Clustering/GMUDefaultClusterRendererTest.m b/Tests/GoogleMapsUtilsTests/unit/Clustering/GMUDefaultClusterRendererTest.m
similarity index 100%
rename from test/unit/Clustering/GMUDefaultClusterRendererTest.m
rename to Tests/GoogleMapsUtilsTests/unit/Clustering/GMUDefaultClusterRendererTest.m
diff --git a/test/unit/Clustering/GMUGridBasedClusterAlgorithmTest.m b/Tests/GoogleMapsUtilsTests/unit/Clustering/GMUGridBasedClusterAlgorithmTest.m
similarity index 100%
rename from test/unit/Clustering/GMUGridBasedClusterAlgorithmTest.m
rename to Tests/GoogleMapsUtilsTests/unit/Clustering/GMUGridBasedClusterAlgorithmTest.m
diff --git a/test/unit/Clustering/GMUNonHierarchicalDistanceBasedAlgorithmTest.m b/Tests/GoogleMapsUtilsTests/unit/Clustering/GMUNonHierarchicalDistanceBasedAlgorithmTest.m
similarity index 100%
rename from test/unit/Clustering/GMUNonHierarchicalDistanceBasedAlgorithmTest.m
rename to Tests/GoogleMapsUtilsTests/unit/Clustering/GMUNonHierarchicalDistanceBasedAlgorithmTest.m
diff --git a/test/unit/Clustering/GMUSimpleClusterAlgorithmTest.swift b/Tests/GoogleMapsUtilsTests/unit/Clustering/GMUSimpleClusterAlgorithmTest.swift
similarity index 100%
rename from test/unit/Clustering/GMUSimpleClusterAlgorithmTest.swift
rename to Tests/GoogleMapsUtilsTests/unit/Clustering/GMUSimpleClusterAlgorithmTest.swift
diff --git a/test/unit/Clustering/GMUStaticClusterTest.m b/Tests/GoogleMapsUtilsTests/unit/Clustering/GMUStaticClusterTest.m
similarity index 100%
rename from test/unit/Clustering/GMUStaticClusterTest.m
rename to Tests/GoogleMapsUtilsTests/unit/Clustering/GMUStaticClusterTest.m
diff --git a/test/unit/Clustering/GMUWrappingDictionaryKeyTest.m b/Tests/GoogleMapsUtilsTests/unit/Clustering/GMUWrappingDictionaryKeyTest.m
similarity index 100%
rename from test/unit/Clustering/GMUWrappingDictionaryKeyTest.m
rename to Tests/GoogleMapsUtilsTests/unit/Clustering/GMUWrappingDictionaryKeyTest.m
diff --git a/test/unit/Geometry/GMUFeatureTest.m b/Tests/GoogleMapsUtilsTests/unit/Geometry/GMUFeatureTest.m
similarity index 100%
rename from test/unit/Geometry/GMUFeatureTest.m
rename to Tests/GoogleMapsUtilsTests/unit/Geometry/GMUFeatureTest.m
diff --git a/test/unit/Geometry/GMUGeoJSONParserTest.m b/Tests/GoogleMapsUtilsTests/unit/Geometry/GMUGeoJSONParserTest.m
similarity index 100%
rename from test/unit/Geometry/GMUGeoJSONParserTest.m
rename to Tests/GoogleMapsUtilsTests/unit/Geometry/GMUGeoJSONParserTest.m
diff --git a/test/unit/Geometry/GMUGeometryCollectionTest.m b/Tests/GoogleMapsUtilsTests/unit/Geometry/GMUGeometryCollectionTest.m
similarity index 100%
rename from test/unit/Geometry/GMUGeometryCollectionTest.m
rename to Tests/GoogleMapsUtilsTests/unit/Geometry/GMUGeometryCollectionTest.m
diff --git a/test/unit/Geometry/GMUGeometryRendererTest.m b/Tests/GoogleMapsUtilsTests/unit/Geometry/GMUGeometryRendererTest.m
similarity index 100%
rename from test/unit/Geometry/GMUGeometryRendererTest.m
rename to Tests/GoogleMapsUtilsTests/unit/Geometry/GMUGeometryRendererTest.m
diff --git a/test/unit/Geometry/GMUGroundOverlayTest.m b/Tests/GoogleMapsUtilsTests/unit/Geometry/GMUGroundOverlayTest.m
similarity index 100%
rename from test/unit/Geometry/GMUGroundOverlayTest.m
rename to Tests/GoogleMapsUtilsTests/unit/Geometry/GMUGroundOverlayTest.m
diff --git a/test/unit/Geometry/GMUKMLParserTest.m b/Tests/GoogleMapsUtilsTests/unit/Geometry/GMUKMLParserTest.m
similarity index 100%
rename from test/unit/Geometry/GMUKMLParserTest.m
rename to Tests/GoogleMapsUtilsTests/unit/Geometry/GMUKMLParserTest.m
diff --git a/test/unit/Geometry/GMULineStringTest.m b/Tests/GoogleMapsUtilsTests/unit/Geometry/GMULineStringTest.m
similarity index 100%
rename from test/unit/Geometry/GMULineStringTest.m
rename to Tests/GoogleMapsUtilsTests/unit/Geometry/GMULineStringTest.m
diff --git a/test/unit/Geometry/GMUPlacemarkTest.m b/Tests/GoogleMapsUtilsTests/unit/Geometry/GMUPlacemarkTest.m
similarity index 100%
rename from test/unit/Geometry/GMUPlacemarkTest.m
rename to Tests/GoogleMapsUtilsTests/unit/Geometry/GMUPlacemarkTest.m
diff --git a/test/unit/Geometry/GMUPointTest.m b/Tests/GoogleMapsUtilsTests/unit/Geometry/GMUPointTest.m
similarity index 100%
rename from test/unit/Geometry/GMUPointTest.m
rename to Tests/GoogleMapsUtilsTests/unit/Geometry/GMUPointTest.m
diff --git a/test/unit/Geometry/GMUPolygonTest.m b/Tests/GoogleMapsUtilsTests/unit/Geometry/GMUPolygonTest.m
similarity index 100%
rename from test/unit/Geometry/GMUPolygonTest.m
rename to Tests/GoogleMapsUtilsTests/unit/Geometry/GMUPolygonTest.m
diff --git a/test/unit/Geometry/GMUStyleTest.mm b/Tests/GoogleMapsUtilsTests/unit/Geometry/GMUStyleTest.mm
similarity index 100%
rename from test/unit/Geometry/GMUStyleTest.mm
rename to Tests/GoogleMapsUtilsTests/unit/Geometry/GMUStyleTest.mm
diff --git a/test/unit/GeometryUtils/CLLocationCoordinate2D+GeometryUtilsTest.swift b/Tests/GoogleMapsUtilsTests/unit/GeometryUtils/CLLocationCoordinate2D+GeometryUtilsTest.swift
similarity index 100%
rename from test/unit/GeometryUtils/CLLocationCoordinate2D+GeometryUtilsTest.swift
rename to Tests/GoogleMapsUtilsTests/unit/GeometryUtils/CLLocationCoordinate2D+GeometryUtilsTest.swift
diff --git a/test/unit/GeometryUtils/GMSPath+GeometryUtilsTest.swift b/Tests/GoogleMapsUtilsTests/unit/GeometryUtils/GMSPath+GeometryUtilsTest.swift
similarity index 100%
rename from test/unit/GeometryUtils/GMSPath+GeometryUtilsTest.swift
rename to Tests/GoogleMapsUtilsTests/unit/GeometryUtils/GMSPath+GeometryUtilsTest.swift
diff --git a/test/unit/GeometryUtils/Internal/LatLngRadiansTest.swift b/Tests/GoogleMapsUtilsTests/unit/GeometryUtils/Internal/LatLngRadiansTest.swift
similarity index 100%
rename from test/unit/GeometryUtils/Internal/LatLngRadiansTest.swift
rename to Tests/GoogleMapsUtilsTests/unit/GeometryUtils/Internal/LatLngRadiansTest.swift
diff --git a/test/unit/GeometryUtils/MapPointTest.swift b/Tests/GoogleMapsUtilsTests/unit/GeometryUtils/MapPointTest.swift
similarity index 100%
rename from test/unit/GeometryUtils/MapPointTest.swift
rename to Tests/GoogleMapsUtilsTests/unit/GeometryUtils/MapPointTest.swift
diff --git a/test/unit/Heatmap/GMUGradientTest.swift b/Tests/GoogleMapsUtilsTests/unit/Heatmap/GMUGradientTest.swift
similarity index 100%
rename from test/unit/Heatmap/GMUGradientTest.swift
rename to Tests/GoogleMapsUtilsTests/unit/Heatmap/GMUGradientTest.swift
diff --git a/test/unit/Heatmap/GMUHeatmapTileLayerTest.swift b/Tests/GoogleMapsUtilsTests/unit/Heatmap/GMUHeatmapTileLayerTest.swift
similarity index 100%
rename from test/unit/Heatmap/GMUHeatmapTileLayerTest.swift
rename to Tests/GoogleMapsUtilsTests/unit/Heatmap/GMUHeatmapTileLayerTest.swift
diff --git a/test/unit/Heatmap/GMUWeightedLatLngTest.swift b/Tests/GoogleMapsUtilsTests/unit/Heatmap/GMUWeightedLatLngTest.swift
similarity index 100%
rename from test/unit/Heatmap/GMUWeightedLatLngTest.swift
rename to Tests/GoogleMapsUtilsTests/unit/Heatmap/GMUWeightedLatLngTest.swift
diff --git a/test/unit/Heatmap/HeatMapInterpolationTests.swift b/Tests/GoogleMapsUtilsTests/unit/Heatmap/HeatMapInterpolationTests.swift
similarity index 100%
rename from test/unit/Heatmap/HeatMapInterpolationTests.swift
rename to Tests/GoogleMapsUtilsTests/unit/Heatmap/HeatMapInterpolationTests.swift
diff --git a/test/unit/Helper/GMUObectiveCTestHelper.h b/Tests/GoogleMapsUtilsTests/unit/Helper/GMUObectiveCTestHelper.h
similarity index 100%
rename from test/unit/Helper/GMUObectiveCTestHelper.h
rename to Tests/GoogleMapsUtilsTests/unit/Helper/GMUObectiveCTestHelper.h
diff --git a/test/unit/Helper/GMUObectiveCTestHelper.m b/Tests/GoogleMapsUtilsTests/unit/Helper/GMUObectiveCTestHelper.m
similarity index 100%
rename from test/unit/Helper/GMUObectiveCTestHelper.m
rename to Tests/GoogleMapsUtilsTests/unit/Helper/GMUObectiveCTestHelper.m
diff --git a/test/unit/QuadTree/GQTPointQuadTreeTest.m b/Tests/GoogleMapsUtilsTests/unit/QuadTree/GQTPointQuadTreeTest.m
similarity index 100%
rename from test/unit/QuadTree/GQTPointQuadTreeTest.m
rename to Tests/GoogleMapsUtilsTests/unit/QuadTree/GQTPointQuadTreeTest.m
diff --git a/app/BasicViewController.h b/app/BasicViewController.h
index 9bd26b0d..3aca6df8 100644
--- a/app/BasicViewController.h
+++ b/app/BasicViewController.h
@@ -14,6 +14,15 @@
  */
 
 #import <UIKit/UIKit.h>
+#import <GMUCluster.h>
+#import <GMUClusterItem.h>
+#import <GMUClusterManager.h>
+#import <GMUDefaultClusterIconGenerator.h>
+#import <GMUDefaultClusterRenderer.h>
+#import <GMUGridBasedClusterAlgorithm.h>
+#import <GMUNonHierarchicalDistanceBasedAlgorithm.h>
+#import <GMUStaticCluster.h>
+#import "GQTPointQuadTree.h"
 
 @interface BasicViewController : UIViewController
 

From 85bb458d6c197387e525df29189b31c29bef5298 Mon Sep 17 00:00:00 2001
From: Angela Yu <5506675+wangela@users.noreply.github.com>
Date: Fri, 2 Feb 2024 15:40:12 -0800
Subject: [PATCH 19/26] chore: update header location

---
 .gitignore                                    |  2 ++
 Package.swift                                 |  2 +-
 .../include}/GoogleMapsUtils.h                |  0
 docs/Carthage.md                              | 29 -------------------
 4 files changed, 3 insertions(+), 30 deletions(-)
 rename {GoogleMapsUtils => Sources/GoogleMapsUtils/include}/GoogleMapsUtils.h (100%)
 delete mode 100644 docs/Carthage.md

diff --git a/.gitignore b/.gitignore
index e0e7ee59..c8a38e73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 # Xcode
 .DS_Store
 build/
+.build/
+.swiftpm/
 *.pbxuser
 !default.pbxuser
 *.mode1v3
diff --git a/Package.swift b/Package.swift
index e263b78b..fc89ba1d 100644
--- a/Package.swift
+++ b/Package.swift
@@ -39,7 +39,7 @@ let package = Package(
         .product(name: "GoogleMapsCore", package: "ios-maps-sdk"),
         .product(name: "GoogleMapsBase", package: "ios-maps-sdk")
       ],
-      publicHeadersPath: "include"
+      publicHeadersPath: "Sources/GoogleMapsUtils/include"
     ),
     .target(
       name: "GoogleMapsUtilsSwift",
diff --git a/GoogleMapsUtils/GoogleMapsUtils.h b/Sources/GoogleMapsUtils/include/GoogleMapsUtils.h
similarity index 100%
rename from GoogleMapsUtils/GoogleMapsUtils.h
rename to Sources/GoogleMapsUtils/include/GoogleMapsUtils.h
diff --git a/docs/Carthage.md b/docs/Carthage.md
deleted file mode 100644
index aa0be8fe..00000000
--- a/docs/Carthage.md
+++ /dev/null
@@ -1,29 +0,0 @@
-Carthage Installation Steps
-===========================
-
-1. Add this repository to your `Cartfile`.
-```
-github "googlemaps/google-maps-ios-utils"
-```
-
-2. Run `carthage update --platform iOS`.
-3. Add the Maps SDK for iOS frameworks into your project by dragging `GoogleMaps.framework`, `GoogleMapsBase.framework` and `GoogleMapsCore.framework` in the `Carthage/Build/iOS` directory into the top level directory of your Xcode project (premium plan customers should also add `GoogleMapsM4B.framework` into the project).
-4. Add the Maps SDK for iOS Utilities framework by dragging `GoogleMapsUtils.framework` in the `Carthage/Build/iOS/Static` directory into the top level directory of your Xcode project.
-5. Add `GoogleMaps.bundle` by dragging `Carthage/Build/iOS/GoogleMaps.framework/Resources/GoogleMaps.bundle` into the top level directory of your Xcode project.
-6. Open the _Build Phases_ tab for your application’s target, and within _Link Binary with Libraries_, add the additional following frameworks:
-    * Accelerate.framework
-    * CoreData.framework
-    * CoreGraphics.framework
-    * CoreImage.framework
-    * CoreLocation.framework
-    * CoreTelephony.framework
-    * CoreText.framework
-    * GLKit.framework
-    * ImageIO.framework
-    * libc++.tbd
-    * libz.tbd
-    * OpenGLES.framework
-    * QuartzCore.framework
-    * SystemConfiguration.framework
-    * UIKit.framework
-7. Open the _Build Settings_ tab for you application’s target, add `-ObjC` in the _Other Linker Flags_ section.

From 3a0499292e6ab6da6cee91b805ef870ae00984aa Mon Sep 17 00:00:00 2001
From: Angela Yu <5506675+wangela@users.noreply.github.com>
Date: Fri, 2 Feb 2024 15:55:25 -0800
Subject: [PATCH 20/26] chore: flatten header directory structure

---
 .../GoogleMapsUtils/include => GoogleMapsUtils}/GoogleMapsUtils.h | 0
 .../{Clustering => include}/GMSMarker+GMUClusteritem.h            | 0
 Sources/GoogleMapsUtils/{Clustering => include}/GMUCluster.h      | 0
 .../{Clustering/Algo => include}/GMUClusterAlgorithm.h            | 0
 .../{Clustering/View => include}/GMUClusterIconGenerator.h        | 0
 Sources/GoogleMapsUtils/{Clustering => include}/GMUClusterItem.h  | 0
 .../{Clustering => include}/GMUClusterManager+Testing.h           | 0
 .../GoogleMapsUtils/{Clustering => include}/GMUClusterManager.h   | 0
 .../{Clustering/View => include}/GMUClusterRenderer.h             | 0
 .../View => include}/GMUDefaultClusterIconGenerator+Testing.h     | 0
 .../{Clustering/View => include}/GMUDefaultClusterIconGenerator.h | 0
 .../View => include}/GMUDefaultClusterRenderer+Testing.h          | 0
 .../{Clustering/View => include}/GMUDefaultClusterRenderer.h      | 0
 Sources/GoogleMapsUtils/{Geometry/Model => include}/GMUFeature.h  | 0
 Sources/GoogleMapsUtils/{Geometry => include}/GMUGeoJSONParser.h  | 0
 Sources/GoogleMapsUtils/{Geometry/Model => include}/GMUGeometry.h | 0
 .../{Geometry/Model => include}/GMUGeometryCollection.h           | 0
 .../{Geometry/Model => include}/GMUGeometryContainer.h            | 0
 .../{Geometry => include}/GMUGeometryRenderer+Testing.h           | 0
 .../GoogleMapsUtils/{Geometry => include}/GMUGeometryRenderer.h   | 0
 Sources/GoogleMapsUtils/{Heatmap => include}/GMUGradient.h        | 0
 .../{Clustering/Algo => include}/GMUGridBasedClusterAlgorithm.h   | 0
 .../{Geometry/Model => include}/GMUGroundOverlay.h                | 0
 .../{Heatmap => include}/GMUHeatmapTileLayer+Testing.h            | 0
 .../GoogleMapsUtils/{Heatmap => include}/GMUHeatmapTileLayer.h    | 0
 Sources/GoogleMapsUtils/{Geometry => include}/GMUKMLParser.h      | 0
 .../GoogleMapsUtils/{Geometry/Model => include}/GMULineString.h   | 0
 .../GoogleMapsUtils/{Clustering => include}/GMUMarkerClustering.h | 0
 .../Algo => include}/GMUNonHierarchicalDistanceBasedAlgorithm.h   | 0
 Sources/GoogleMapsUtils/{Geometry/Model => include}/GMUPair.h     | 0
 .../GoogleMapsUtils/{Geometry/Model => include}/GMUPlacemark.h    | 0
 Sources/GoogleMapsUtils/{Geometry/Model => include}/GMUPoint.h    | 0
 Sources/GoogleMapsUtils/{Geometry/Model => include}/GMUPolygon.h  | 0
 .../{Clustering/Algo => include}/GMUSimpleClusterAlgorithm.h      | 0
 .../GoogleMapsUtils/{Clustering => include}/GMUStaticCluster.h    | 0
 Sources/GoogleMapsUtils/{Geometry/Model => include}/GMUStyle.h    | 0
 Sources/GoogleMapsUtils/{Geometry/Model => include}/GMUStyleMap.h | 0
 Sources/GoogleMapsUtils/{Heatmap => include}/GMUWeightedLatLng.h  | 0
 .../{Clustering/Algo => include}/GMUWrappingDictionaryKey.h       | 0
 Sources/GoogleMapsUtils/{QuadTree => include}/GQTBounds.h         | 0
 Sources/GoogleMapsUtils/{QuadTree => include}/GQTPoint.h          | 0
 Sources/GoogleMapsUtils/{QuadTree => include}/GQTPointQuadTree.h  | 0
 .../GoogleMapsUtils/{QuadTree => include}/GQTPointQuadTreeChild.h | 0
 .../GoogleMapsUtils/{QuadTree => include}/GQTPointQuadTreeItem.h  | 0
 44 files changed, 0 insertions(+), 0 deletions(-)
 rename {Sources/GoogleMapsUtils/include => GoogleMapsUtils}/GoogleMapsUtils.h (100%)
 rename Sources/GoogleMapsUtils/{Clustering => include}/GMSMarker+GMUClusteritem.h (100%)
 rename Sources/GoogleMapsUtils/{Clustering => include}/GMUCluster.h (100%)
 rename Sources/GoogleMapsUtils/{Clustering/Algo => include}/GMUClusterAlgorithm.h (100%)
 rename Sources/GoogleMapsUtils/{Clustering/View => include}/GMUClusterIconGenerator.h (100%)
 rename Sources/GoogleMapsUtils/{Clustering => include}/GMUClusterItem.h (100%)
 rename Sources/GoogleMapsUtils/{Clustering => include}/GMUClusterManager+Testing.h (100%)
 rename Sources/GoogleMapsUtils/{Clustering => include}/GMUClusterManager.h (100%)
 rename Sources/GoogleMapsUtils/{Clustering/View => include}/GMUClusterRenderer.h (100%)
 rename Sources/GoogleMapsUtils/{Clustering/View => include}/GMUDefaultClusterIconGenerator+Testing.h (100%)
 rename Sources/GoogleMapsUtils/{Clustering/View => include}/GMUDefaultClusterIconGenerator.h (100%)
 rename Sources/GoogleMapsUtils/{Clustering/View => include}/GMUDefaultClusterRenderer+Testing.h (100%)
 rename Sources/GoogleMapsUtils/{Clustering/View => include}/GMUDefaultClusterRenderer.h (100%)
 rename Sources/GoogleMapsUtils/{Geometry/Model => include}/GMUFeature.h (100%)
 rename Sources/GoogleMapsUtils/{Geometry => include}/GMUGeoJSONParser.h (100%)
 rename Sources/GoogleMapsUtils/{Geometry/Model => include}/GMUGeometry.h (100%)
 rename Sources/GoogleMapsUtils/{Geometry/Model => include}/GMUGeometryCollection.h (100%)
 rename Sources/GoogleMapsUtils/{Geometry/Model => include}/GMUGeometryContainer.h (100%)
 rename Sources/GoogleMapsUtils/{Geometry => include}/GMUGeometryRenderer+Testing.h (100%)
 rename Sources/GoogleMapsUtils/{Geometry => include}/GMUGeometryRenderer.h (100%)
 rename Sources/GoogleMapsUtils/{Heatmap => include}/GMUGradient.h (100%)
 rename Sources/GoogleMapsUtils/{Clustering/Algo => include}/GMUGridBasedClusterAlgorithm.h (100%)
 rename Sources/GoogleMapsUtils/{Geometry/Model => include}/GMUGroundOverlay.h (100%)
 rename Sources/GoogleMapsUtils/{Heatmap => include}/GMUHeatmapTileLayer+Testing.h (100%)
 rename Sources/GoogleMapsUtils/{Heatmap => include}/GMUHeatmapTileLayer.h (100%)
 rename Sources/GoogleMapsUtils/{Geometry => include}/GMUKMLParser.h (100%)
 rename Sources/GoogleMapsUtils/{Geometry/Model => include}/GMULineString.h (100%)
 rename Sources/GoogleMapsUtils/{Clustering => include}/GMUMarkerClustering.h (100%)
 rename Sources/GoogleMapsUtils/{Clustering/Algo => include}/GMUNonHierarchicalDistanceBasedAlgorithm.h (100%)
 rename Sources/GoogleMapsUtils/{Geometry/Model => include}/GMUPair.h (100%)
 rename Sources/GoogleMapsUtils/{Geometry/Model => include}/GMUPlacemark.h (100%)
 rename Sources/GoogleMapsUtils/{Geometry/Model => include}/GMUPoint.h (100%)
 rename Sources/GoogleMapsUtils/{Geometry/Model => include}/GMUPolygon.h (100%)
 rename Sources/GoogleMapsUtils/{Clustering/Algo => include}/GMUSimpleClusterAlgorithm.h (100%)
 rename Sources/GoogleMapsUtils/{Clustering => include}/GMUStaticCluster.h (100%)
 rename Sources/GoogleMapsUtils/{Geometry/Model => include}/GMUStyle.h (100%)
 rename Sources/GoogleMapsUtils/{Geometry/Model => include}/GMUStyleMap.h (100%)
 rename Sources/GoogleMapsUtils/{Heatmap => include}/GMUWeightedLatLng.h (100%)
 rename Sources/GoogleMapsUtils/{Clustering/Algo => include}/GMUWrappingDictionaryKey.h (100%)
 rename Sources/GoogleMapsUtils/{QuadTree => include}/GQTBounds.h (100%)
 rename Sources/GoogleMapsUtils/{QuadTree => include}/GQTPoint.h (100%)
 rename Sources/GoogleMapsUtils/{QuadTree => include}/GQTPointQuadTree.h (100%)
 rename Sources/GoogleMapsUtils/{QuadTree => include}/GQTPointQuadTreeChild.h (100%)
 rename Sources/GoogleMapsUtils/{QuadTree => include}/GQTPointQuadTreeItem.h (100%)

diff --git a/Sources/GoogleMapsUtils/include/GoogleMapsUtils.h b/GoogleMapsUtils/GoogleMapsUtils.h
similarity index 100%
rename from Sources/GoogleMapsUtils/include/GoogleMapsUtils.h
rename to GoogleMapsUtils/GoogleMapsUtils.h
diff --git a/Sources/GoogleMapsUtils/Clustering/GMSMarker+GMUClusteritem.h b/Sources/GoogleMapsUtils/include/GMSMarker+GMUClusteritem.h
similarity index 100%
rename from Sources/GoogleMapsUtils/Clustering/GMSMarker+GMUClusteritem.h
rename to Sources/GoogleMapsUtils/include/GMSMarker+GMUClusteritem.h
diff --git a/Sources/GoogleMapsUtils/Clustering/GMUCluster.h b/Sources/GoogleMapsUtils/include/GMUCluster.h
similarity index 100%
rename from Sources/GoogleMapsUtils/Clustering/GMUCluster.h
rename to Sources/GoogleMapsUtils/include/GMUCluster.h
diff --git a/Sources/GoogleMapsUtils/Clustering/Algo/GMUClusterAlgorithm.h b/Sources/GoogleMapsUtils/include/GMUClusterAlgorithm.h
similarity index 100%
rename from Sources/GoogleMapsUtils/Clustering/Algo/GMUClusterAlgorithm.h
rename to Sources/GoogleMapsUtils/include/GMUClusterAlgorithm.h
diff --git a/Sources/GoogleMapsUtils/Clustering/View/GMUClusterIconGenerator.h b/Sources/GoogleMapsUtils/include/GMUClusterIconGenerator.h
similarity index 100%
rename from Sources/GoogleMapsUtils/Clustering/View/GMUClusterIconGenerator.h
rename to Sources/GoogleMapsUtils/include/GMUClusterIconGenerator.h
diff --git a/Sources/GoogleMapsUtils/Clustering/GMUClusterItem.h b/Sources/GoogleMapsUtils/include/GMUClusterItem.h
similarity index 100%
rename from Sources/GoogleMapsUtils/Clustering/GMUClusterItem.h
rename to Sources/GoogleMapsUtils/include/GMUClusterItem.h
diff --git a/Sources/GoogleMapsUtils/Clustering/GMUClusterManager+Testing.h b/Sources/GoogleMapsUtils/include/GMUClusterManager+Testing.h
similarity index 100%
rename from Sources/GoogleMapsUtils/Clustering/GMUClusterManager+Testing.h
rename to Sources/GoogleMapsUtils/include/GMUClusterManager+Testing.h
diff --git a/Sources/GoogleMapsUtils/Clustering/GMUClusterManager.h b/Sources/GoogleMapsUtils/include/GMUClusterManager.h
similarity index 100%
rename from Sources/GoogleMapsUtils/Clustering/GMUClusterManager.h
rename to Sources/GoogleMapsUtils/include/GMUClusterManager.h
diff --git a/Sources/GoogleMapsUtils/Clustering/View/GMUClusterRenderer.h b/Sources/GoogleMapsUtils/include/GMUClusterRenderer.h
similarity index 100%
rename from Sources/GoogleMapsUtils/Clustering/View/GMUClusterRenderer.h
rename to Sources/GoogleMapsUtils/include/GMUClusterRenderer.h
diff --git a/Sources/GoogleMapsUtils/Clustering/View/GMUDefaultClusterIconGenerator+Testing.h b/Sources/GoogleMapsUtils/include/GMUDefaultClusterIconGenerator+Testing.h
similarity index 100%
rename from Sources/GoogleMapsUtils/Clustering/View/GMUDefaultClusterIconGenerator+Testing.h
rename to Sources/GoogleMapsUtils/include/GMUDefaultClusterIconGenerator+Testing.h
diff --git a/Sources/GoogleMapsUtils/Clustering/View/GMUDefaultClusterIconGenerator.h b/Sources/GoogleMapsUtils/include/GMUDefaultClusterIconGenerator.h
similarity index 100%
rename from Sources/GoogleMapsUtils/Clustering/View/GMUDefaultClusterIconGenerator.h
rename to Sources/GoogleMapsUtils/include/GMUDefaultClusterIconGenerator.h
diff --git a/Sources/GoogleMapsUtils/Clustering/View/GMUDefaultClusterRenderer+Testing.h b/Sources/GoogleMapsUtils/include/GMUDefaultClusterRenderer+Testing.h
similarity index 100%
rename from Sources/GoogleMapsUtils/Clustering/View/GMUDefaultClusterRenderer+Testing.h
rename to Sources/GoogleMapsUtils/include/GMUDefaultClusterRenderer+Testing.h
diff --git a/Sources/GoogleMapsUtils/Clustering/View/GMUDefaultClusterRenderer.h b/Sources/GoogleMapsUtils/include/GMUDefaultClusterRenderer.h
similarity index 100%
rename from Sources/GoogleMapsUtils/Clustering/View/GMUDefaultClusterRenderer.h
rename to Sources/GoogleMapsUtils/include/GMUDefaultClusterRenderer.h
diff --git a/Sources/GoogleMapsUtils/Geometry/Model/GMUFeature.h b/Sources/GoogleMapsUtils/include/GMUFeature.h
similarity index 100%
rename from Sources/GoogleMapsUtils/Geometry/Model/GMUFeature.h
rename to Sources/GoogleMapsUtils/include/GMUFeature.h
diff --git a/Sources/GoogleMapsUtils/Geometry/GMUGeoJSONParser.h b/Sources/GoogleMapsUtils/include/GMUGeoJSONParser.h
similarity index 100%
rename from Sources/GoogleMapsUtils/Geometry/GMUGeoJSONParser.h
rename to Sources/GoogleMapsUtils/include/GMUGeoJSONParser.h
diff --git a/Sources/GoogleMapsUtils/Geometry/Model/GMUGeometry.h b/Sources/GoogleMapsUtils/include/GMUGeometry.h
similarity index 100%
rename from Sources/GoogleMapsUtils/Geometry/Model/GMUGeometry.h
rename to Sources/GoogleMapsUtils/include/GMUGeometry.h
diff --git a/Sources/GoogleMapsUtils/Geometry/Model/GMUGeometryCollection.h b/Sources/GoogleMapsUtils/include/GMUGeometryCollection.h
similarity index 100%
rename from Sources/GoogleMapsUtils/Geometry/Model/GMUGeometryCollection.h
rename to Sources/GoogleMapsUtils/include/GMUGeometryCollection.h
diff --git a/Sources/GoogleMapsUtils/Geometry/Model/GMUGeometryContainer.h b/Sources/GoogleMapsUtils/include/GMUGeometryContainer.h
similarity index 100%
rename from Sources/GoogleMapsUtils/Geometry/Model/GMUGeometryContainer.h
rename to Sources/GoogleMapsUtils/include/GMUGeometryContainer.h
diff --git a/Sources/GoogleMapsUtils/Geometry/GMUGeometryRenderer+Testing.h b/Sources/GoogleMapsUtils/include/GMUGeometryRenderer+Testing.h
similarity index 100%
rename from Sources/GoogleMapsUtils/Geometry/GMUGeometryRenderer+Testing.h
rename to Sources/GoogleMapsUtils/include/GMUGeometryRenderer+Testing.h
diff --git a/Sources/GoogleMapsUtils/Geometry/GMUGeometryRenderer.h b/Sources/GoogleMapsUtils/include/GMUGeometryRenderer.h
similarity index 100%
rename from Sources/GoogleMapsUtils/Geometry/GMUGeometryRenderer.h
rename to Sources/GoogleMapsUtils/include/GMUGeometryRenderer.h
diff --git a/Sources/GoogleMapsUtils/Heatmap/GMUGradient.h b/Sources/GoogleMapsUtils/include/GMUGradient.h
similarity index 100%
rename from Sources/GoogleMapsUtils/Heatmap/GMUGradient.h
rename to Sources/GoogleMapsUtils/include/GMUGradient.h
diff --git a/Sources/GoogleMapsUtils/Clustering/Algo/GMUGridBasedClusterAlgorithm.h b/Sources/GoogleMapsUtils/include/GMUGridBasedClusterAlgorithm.h
similarity index 100%
rename from Sources/GoogleMapsUtils/Clustering/Algo/GMUGridBasedClusterAlgorithm.h
rename to Sources/GoogleMapsUtils/include/GMUGridBasedClusterAlgorithm.h
diff --git a/Sources/GoogleMapsUtils/Geometry/Model/GMUGroundOverlay.h b/Sources/GoogleMapsUtils/include/GMUGroundOverlay.h
similarity index 100%
rename from Sources/GoogleMapsUtils/Geometry/Model/GMUGroundOverlay.h
rename to Sources/GoogleMapsUtils/include/GMUGroundOverlay.h
diff --git a/Sources/GoogleMapsUtils/Heatmap/GMUHeatmapTileLayer+Testing.h b/Sources/GoogleMapsUtils/include/GMUHeatmapTileLayer+Testing.h
similarity index 100%
rename from Sources/GoogleMapsUtils/Heatmap/GMUHeatmapTileLayer+Testing.h
rename to Sources/GoogleMapsUtils/include/GMUHeatmapTileLayer+Testing.h
diff --git a/Sources/GoogleMapsUtils/Heatmap/GMUHeatmapTileLayer.h b/Sources/GoogleMapsUtils/include/GMUHeatmapTileLayer.h
similarity index 100%
rename from Sources/GoogleMapsUtils/Heatmap/GMUHeatmapTileLayer.h
rename to Sources/GoogleMapsUtils/include/GMUHeatmapTileLayer.h
diff --git a/Sources/GoogleMapsUtils/Geometry/GMUKMLParser.h b/Sources/GoogleMapsUtils/include/GMUKMLParser.h
similarity index 100%
rename from Sources/GoogleMapsUtils/Geometry/GMUKMLParser.h
rename to Sources/GoogleMapsUtils/include/GMUKMLParser.h
diff --git a/Sources/GoogleMapsUtils/Geometry/Model/GMULineString.h b/Sources/GoogleMapsUtils/include/GMULineString.h
similarity index 100%
rename from Sources/GoogleMapsUtils/Geometry/Model/GMULineString.h
rename to Sources/GoogleMapsUtils/include/GMULineString.h
diff --git a/Sources/GoogleMapsUtils/Clustering/GMUMarkerClustering.h b/Sources/GoogleMapsUtils/include/GMUMarkerClustering.h
similarity index 100%
rename from Sources/GoogleMapsUtils/Clustering/GMUMarkerClustering.h
rename to Sources/GoogleMapsUtils/include/GMUMarkerClustering.h
diff --git a/Sources/GoogleMapsUtils/Clustering/Algo/GMUNonHierarchicalDistanceBasedAlgorithm.h b/Sources/GoogleMapsUtils/include/GMUNonHierarchicalDistanceBasedAlgorithm.h
similarity index 100%
rename from Sources/GoogleMapsUtils/Clustering/Algo/GMUNonHierarchicalDistanceBasedAlgorithm.h
rename to Sources/GoogleMapsUtils/include/GMUNonHierarchicalDistanceBasedAlgorithm.h
diff --git a/Sources/GoogleMapsUtils/Geometry/Model/GMUPair.h b/Sources/GoogleMapsUtils/include/GMUPair.h
similarity index 100%
rename from Sources/GoogleMapsUtils/Geometry/Model/GMUPair.h
rename to Sources/GoogleMapsUtils/include/GMUPair.h
diff --git a/Sources/GoogleMapsUtils/Geometry/Model/GMUPlacemark.h b/Sources/GoogleMapsUtils/include/GMUPlacemark.h
similarity index 100%
rename from Sources/GoogleMapsUtils/Geometry/Model/GMUPlacemark.h
rename to Sources/GoogleMapsUtils/include/GMUPlacemark.h
diff --git a/Sources/GoogleMapsUtils/Geometry/Model/GMUPoint.h b/Sources/GoogleMapsUtils/include/GMUPoint.h
similarity index 100%
rename from Sources/GoogleMapsUtils/Geometry/Model/GMUPoint.h
rename to Sources/GoogleMapsUtils/include/GMUPoint.h
diff --git a/Sources/GoogleMapsUtils/Geometry/Model/GMUPolygon.h b/Sources/GoogleMapsUtils/include/GMUPolygon.h
similarity index 100%
rename from Sources/GoogleMapsUtils/Geometry/Model/GMUPolygon.h
rename to Sources/GoogleMapsUtils/include/GMUPolygon.h
diff --git a/Sources/GoogleMapsUtils/Clustering/Algo/GMUSimpleClusterAlgorithm.h b/Sources/GoogleMapsUtils/include/GMUSimpleClusterAlgorithm.h
similarity index 100%
rename from Sources/GoogleMapsUtils/Clustering/Algo/GMUSimpleClusterAlgorithm.h
rename to Sources/GoogleMapsUtils/include/GMUSimpleClusterAlgorithm.h
diff --git a/Sources/GoogleMapsUtils/Clustering/GMUStaticCluster.h b/Sources/GoogleMapsUtils/include/GMUStaticCluster.h
similarity index 100%
rename from Sources/GoogleMapsUtils/Clustering/GMUStaticCluster.h
rename to Sources/GoogleMapsUtils/include/GMUStaticCluster.h
diff --git a/Sources/GoogleMapsUtils/Geometry/Model/GMUStyle.h b/Sources/GoogleMapsUtils/include/GMUStyle.h
similarity index 100%
rename from Sources/GoogleMapsUtils/Geometry/Model/GMUStyle.h
rename to Sources/GoogleMapsUtils/include/GMUStyle.h
diff --git a/Sources/GoogleMapsUtils/Geometry/Model/GMUStyleMap.h b/Sources/GoogleMapsUtils/include/GMUStyleMap.h
similarity index 100%
rename from Sources/GoogleMapsUtils/Geometry/Model/GMUStyleMap.h
rename to Sources/GoogleMapsUtils/include/GMUStyleMap.h
diff --git a/Sources/GoogleMapsUtils/Heatmap/GMUWeightedLatLng.h b/Sources/GoogleMapsUtils/include/GMUWeightedLatLng.h
similarity index 100%
rename from Sources/GoogleMapsUtils/Heatmap/GMUWeightedLatLng.h
rename to Sources/GoogleMapsUtils/include/GMUWeightedLatLng.h
diff --git a/Sources/GoogleMapsUtils/Clustering/Algo/GMUWrappingDictionaryKey.h b/Sources/GoogleMapsUtils/include/GMUWrappingDictionaryKey.h
similarity index 100%
rename from Sources/GoogleMapsUtils/Clustering/Algo/GMUWrappingDictionaryKey.h
rename to Sources/GoogleMapsUtils/include/GMUWrappingDictionaryKey.h
diff --git a/Sources/GoogleMapsUtils/QuadTree/GQTBounds.h b/Sources/GoogleMapsUtils/include/GQTBounds.h
similarity index 100%
rename from Sources/GoogleMapsUtils/QuadTree/GQTBounds.h
rename to Sources/GoogleMapsUtils/include/GQTBounds.h
diff --git a/Sources/GoogleMapsUtils/QuadTree/GQTPoint.h b/Sources/GoogleMapsUtils/include/GQTPoint.h
similarity index 100%
rename from Sources/GoogleMapsUtils/QuadTree/GQTPoint.h
rename to Sources/GoogleMapsUtils/include/GQTPoint.h
diff --git a/Sources/GoogleMapsUtils/QuadTree/GQTPointQuadTree.h b/Sources/GoogleMapsUtils/include/GQTPointQuadTree.h
similarity index 100%
rename from Sources/GoogleMapsUtils/QuadTree/GQTPointQuadTree.h
rename to Sources/GoogleMapsUtils/include/GQTPointQuadTree.h
diff --git a/Sources/GoogleMapsUtils/QuadTree/GQTPointQuadTreeChild.h b/Sources/GoogleMapsUtils/include/GQTPointQuadTreeChild.h
similarity index 100%
rename from Sources/GoogleMapsUtils/QuadTree/GQTPointQuadTreeChild.h
rename to Sources/GoogleMapsUtils/include/GQTPointQuadTreeChild.h
diff --git a/Sources/GoogleMapsUtils/QuadTree/GQTPointQuadTreeItem.h b/Sources/GoogleMapsUtils/include/GQTPointQuadTreeItem.h
similarity index 100%
rename from Sources/GoogleMapsUtils/QuadTree/GQTPointQuadTreeItem.h
rename to Sources/GoogleMapsUtils/include/GQTPointQuadTreeItem.h

From 04f90b1c6565a70feb25ee4694f0e64c429454ea Mon Sep 17 00:00:00 2001
From: Angela Yu <5506675+wangela@users.noreply.github.com>
Date: Fri, 2 Feb 2024 16:40:35 -0800
Subject: [PATCH 21/26] chore: exclude platforms from Swift package

---
 Package.swift | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/Package.swift b/Package.swift
index fc89ba1d..f5bf6a71 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.3
+// swift-tools-version:5.5
 
 // Copyright 2020 Google LLC
 //
@@ -16,10 +16,26 @@
 
 import PackageDescription
 
+#if os(macOS)
+#error("This package does not support macOS.")
+#endif
+
+#if os(tvOS)
+#error("This package does not support tvOS.")
+#endif
+
+#if os(visionOS)
+#error("This package does not support visionOS.")
+#endif
+
+#if os(watchOS)
+#error("This package does not support watchOS.")
+#endif
+
 let package = Package(
   name: "GoogleMapsUtils",
   platforms: [
-      .iOS(.v14)
+    .iOS(.v14),
   ],
   products: [
     .library(

From 05fb82082257a2d18fc2615f0f818fe16ace6ad3 Mon Sep 17 00:00:00 2001
From: Angela Yu <5506675+wangela@users.noreply.github.com>
Date: Fri, 2 Feb 2024 17:08:01 -0800
Subject: [PATCH 22/26] chore: flatten header files

---
 .../{Clustering => include}/GMSMarker+GMUClusteritem.m            | 0
 .../GoogleMapsUtils/{Clustering => include}/GMUClusterManager.m   | 0
 .../{Clustering/View => include}/GMUDefaultClusterIconGenerator.m | 0
 .../{Clustering/View => include}/GMUDefaultClusterRenderer.m      | 0
 Sources/GoogleMapsUtils/{Geometry/Model => include}/GMUFeature.m  | 0
 Sources/GoogleMapsUtils/{Geometry => include}/GMUGeoJSONParser.m  | 0
 .../{Geometry/Model => include}/GMUGeometryCollection.m           | 0
 .../GoogleMapsUtils/{Geometry => include}/GMUGeometryRenderer.m   | 0
 Sources/GoogleMapsUtils/{Heatmap => include}/GMUGradient.m        | 0
 .../{Clustering/Algo => include}/GMUGridBasedClusterAlgorithm.m   | 0
 .../{Geometry/Model => include}/GMUGroundOverlay.m                | 0
 .../GoogleMapsUtils/{Heatmap => include}/GMUHeatmapTileLayer.m    | 0
 Sources/GoogleMapsUtils/{Geometry => include}/GMUKMLParser.m      | 0
 .../GoogleMapsUtils/{Geometry/Model => include}/GMULineString.m   | 0
 .../Algo => include}/GMUNonHierarchicalDistanceBasedAlgorithm.m   | 0
 Sources/GoogleMapsUtils/{Geometry/Model => include}/GMUPair.m     | 0
 .../GoogleMapsUtils/{Geometry/Model => include}/GMUPlacemark.m    | 0
 Sources/GoogleMapsUtils/{Geometry/Model => include}/GMUPoint.m    | 0
 Sources/GoogleMapsUtils/{Geometry/Model => include}/GMUPolygon.m  | 0
 .../{Clustering/Algo => include}/GMUSimpleClusterAlgorithm.m      | 0
 .../GoogleMapsUtils/{Clustering => include}/GMUStaticCluster.m    | 0
 Sources/GoogleMapsUtils/{Geometry/Model => include}/GMUStyle.m    | 0
 Sources/GoogleMapsUtils/{Geometry/Model => include}/GMUStyleMap.m | 0
 Sources/GoogleMapsUtils/{Heatmap => include}/GMUWeightedLatLng.m  | 0
 .../{Clustering/Algo => include}/GMUWrappingDictionaryKey.m       | 0
 Sources/GoogleMapsUtils/{QuadTree => include}/GQTPointQuadTree.m  | 0
 .../GoogleMapsUtils/{QuadTree => include}/GQTPointQuadTreeChild.m | 0
 27 files changed, 0 insertions(+), 0 deletions(-)
 rename Sources/GoogleMapsUtils/{Clustering => include}/GMSMarker+GMUClusteritem.m (100%)
 rename Sources/GoogleMapsUtils/{Clustering => include}/GMUClusterManager.m (100%)
 rename Sources/GoogleMapsUtils/{Clustering/View => include}/GMUDefaultClusterIconGenerator.m (100%)
 rename Sources/GoogleMapsUtils/{Clustering/View => include}/GMUDefaultClusterRenderer.m (100%)
 rename Sources/GoogleMapsUtils/{Geometry/Model => include}/GMUFeature.m (100%)
 rename Sources/GoogleMapsUtils/{Geometry => include}/GMUGeoJSONParser.m (100%)
 rename Sources/GoogleMapsUtils/{Geometry/Model => include}/GMUGeometryCollection.m (100%)
 rename Sources/GoogleMapsUtils/{Geometry => include}/GMUGeometryRenderer.m (100%)
 rename Sources/GoogleMapsUtils/{Heatmap => include}/GMUGradient.m (100%)
 rename Sources/GoogleMapsUtils/{Clustering/Algo => include}/GMUGridBasedClusterAlgorithm.m (100%)
 rename Sources/GoogleMapsUtils/{Geometry/Model => include}/GMUGroundOverlay.m (100%)
 rename Sources/GoogleMapsUtils/{Heatmap => include}/GMUHeatmapTileLayer.m (100%)
 rename Sources/GoogleMapsUtils/{Geometry => include}/GMUKMLParser.m (100%)
 rename Sources/GoogleMapsUtils/{Geometry/Model => include}/GMULineString.m (100%)
 rename Sources/GoogleMapsUtils/{Clustering/Algo => include}/GMUNonHierarchicalDistanceBasedAlgorithm.m (100%)
 rename Sources/GoogleMapsUtils/{Geometry/Model => include}/GMUPair.m (100%)
 rename Sources/GoogleMapsUtils/{Geometry/Model => include}/GMUPlacemark.m (100%)
 rename Sources/GoogleMapsUtils/{Geometry/Model => include}/GMUPoint.m (100%)
 rename Sources/GoogleMapsUtils/{Geometry/Model => include}/GMUPolygon.m (100%)
 rename Sources/GoogleMapsUtils/{Clustering/Algo => include}/GMUSimpleClusterAlgorithm.m (100%)
 rename Sources/GoogleMapsUtils/{Clustering => include}/GMUStaticCluster.m (100%)
 rename Sources/GoogleMapsUtils/{Geometry/Model => include}/GMUStyle.m (100%)
 rename Sources/GoogleMapsUtils/{Geometry/Model => include}/GMUStyleMap.m (100%)
 rename Sources/GoogleMapsUtils/{Heatmap => include}/GMUWeightedLatLng.m (100%)
 rename Sources/GoogleMapsUtils/{Clustering/Algo => include}/GMUWrappingDictionaryKey.m (100%)
 rename Sources/GoogleMapsUtils/{QuadTree => include}/GQTPointQuadTree.m (100%)
 rename Sources/GoogleMapsUtils/{QuadTree => include}/GQTPointQuadTreeChild.m (100%)

diff --git a/Sources/GoogleMapsUtils/Clustering/GMSMarker+GMUClusteritem.m b/Sources/GoogleMapsUtils/include/GMSMarker+GMUClusteritem.m
similarity index 100%
rename from Sources/GoogleMapsUtils/Clustering/GMSMarker+GMUClusteritem.m
rename to Sources/GoogleMapsUtils/include/GMSMarker+GMUClusteritem.m
diff --git a/Sources/GoogleMapsUtils/Clustering/GMUClusterManager.m b/Sources/GoogleMapsUtils/include/GMUClusterManager.m
similarity index 100%
rename from Sources/GoogleMapsUtils/Clustering/GMUClusterManager.m
rename to Sources/GoogleMapsUtils/include/GMUClusterManager.m
diff --git a/Sources/GoogleMapsUtils/Clustering/View/GMUDefaultClusterIconGenerator.m b/Sources/GoogleMapsUtils/include/GMUDefaultClusterIconGenerator.m
similarity index 100%
rename from Sources/GoogleMapsUtils/Clustering/View/GMUDefaultClusterIconGenerator.m
rename to Sources/GoogleMapsUtils/include/GMUDefaultClusterIconGenerator.m
diff --git a/Sources/GoogleMapsUtils/Clustering/View/GMUDefaultClusterRenderer.m b/Sources/GoogleMapsUtils/include/GMUDefaultClusterRenderer.m
similarity index 100%
rename from Sources/GoogleMapsUtils/Clustering/View/GMUDefaultClusterRenderer.m
rename to Sources/GoogleMapsUtils/include/GMUDefaultClusterRenderer.m
diff --git a/Sources/GoogleMapsUtils/Geometry/Model/GMUFeature.m b/Sources/GoogleMapsUtils/include/GMUFeature.m
similarity index 100%
rename from Sources/GoogleMapsUtils/Geometry/Model/GMUFeature.m
rename to Sources/GoogleMapsUtils/include/GMUFeature.m
diff --git a/Sources/GoogleMapsUtils/Geometry/GMUGeoJSONParser.m b/Sources/GoogleMapsUtils/include/GMUGeoJSONParser.m
similarity index 100%
rename from Sources/GoogleMapsUtils/Geometry/GMUGeoJSONParser.m
rename to Sources/GoogleMapsUtils/include/GMUGeoJSONParser.m
diff --git a/Sources/GoogleMapsUtils/Geometry/Model/GMUGeometryCollection.m b/Sources/GoogleMapsUtils/include/GMUGeometryCollection.m
similarity index 100%
rename from Sources/GoogleMapsUtils/Geometry/Model/GMUGeometryCollection.m
rename to Sources/GoogleMapsUtils/include/GMUGeometryCollection.m
diff --git a/Sources/GoogleMapsUtils/Geometry/GMUGeometryRenderer.m b/Sources/GoogleMapsUtils/include/GMUGeometryRenderer.m
similarity index 100%
rename from Sources/GoogleMapsUtils/Geometry/GMUGeometryRenderer.m
rename to Sources/GoogleMapsUtils/include/GMUGeometryRenderer.m
diff --git a/Sources/GoogleMapsUtils/Heatmap/GMUGradient.m b/Sources/GoogleMapsUtils/include/GMUGradient.m
similarity index 100%
rename from Sources/GoogleMapsUtils/Heatmap/GMUGradient.m
rename to Sources/GoogleMapsUtils/include/GMUGradient.m
diff --git a/Sources/GoogleMapsUtils/Clustering/Algo/GMUGridBasedClusterAlgorithm.m b/Sources/GoogleMapsUtils/include/GMUGridBasedClusterAlgorithm.m
similarity index 100%
rename from Sources/GoogleMapsUtils/Clustering/Algo/GMUGridBasedClusterAlgorithm.m
rename to Sources/GoogleMapsUtils/include/GMUGridBasedClusterAlgorithm.m
diff --git a/Sources/GoogleMapsUtils/Geometry/Model/GMUGroundOverlay.m b/Sources/GoogleMapsUtils/include/GMUGroundOverlay.m
similarity index 100%
rename from Sources/GoogleMapsUtils/Geometry/Model/GMUGroundOverlay.m
rename to Sources/GoogleMapsUtils/include/GMUGroundOverlay.m
diff --git a/Sources/GoogleMapsUtils/Heatmap/GMUHeatmapTileLayer.m b/Sources/GoogleMapsUtils/include/GMUHeatmapTileLayer.m
similarity index 100%
rename from Sources/GoogleMapsUtils/Heatmap/GMUHeatmapTileLayer.m
rename to Sources/GoogleMapsUtils/include/GMUHeatmapTileLayer.m
diff --git a/Sources/GoogleMapsUtils/Geometry/GMUKMLParser.m b/Sources/GoogleMapsUtils/include/GMUKMLParser.m
similarity index 100%
rename from Sources/GoogleMapsUtils/Geometry/GMUKMLParser.m
rename to Sources/GoogleMapsUtils/include/GMUKMLParser.m
diff --git a/Sources/GoogleMapsUtils/Geometry/Model/GMULineString.m b/Sources/GoogleMapsUtils/include/GMULineString.m
similarity index 100%
rename from Sources/GoogleMapsUtils/Geometry/Model/GMULineString.m
rename to Sources/GoogleMapsUtils/include/GMULineString.m
diff --git a/Sources/GoogleMapsUtils/Clustering/Algo/GMUNonHierarchicalDistanceBasedAlgorithm.m b/Sources/GoogleMapsUtils/include/GMUNonHierarchicalDistanceBasedAlgorithm.m
similarity index 100%
rename from Sources/GoogleMapsUtils/Clustering/Algo/GMUNonHierarchicalDistanceBasedAlgorithm.m
rename to Sources/GoogleMapsUtils/include/GMUNonHierarchicalDistanceBasedAlgorithm.m
diff --git a/Sources/GoogleMapsUtils/Geometry/Model/GMUPair.m b/Sources/GoogleMapsUtils/include/GMUPair.m
similarity index 100%
rename from Sources/GoogleMapsUtils/Geometry/Model/GMUPair.m
rename to Sources/GoogleMapsUtils/include/GMUPair.m
diff --git a/Sources/GoogleMapsUtils/Geometry/Model/GMUPlacemark.m b/Sources/GoogleMapsUtils/include/GMUPlacemark.m
similarity index 100%
rename from Sources/GoogleMapsUtils/Geometry/Model/GMUPlacemark.m
rename to Sources/GoogleMapsUtils/include/GMUPlacemark.m
diff --git a/Sources/GoogleMapsUtils/Geometry/Model/GMUPoint.m b/Sources/GoogleMapsUtils/include/GMUPoint.m
similarity index 100%
rename from Sources/GoogleMapsUtils/Geometry/Model/GMUPoint.m
rename to Sources/GoogleMapsUtils/include/GMUPoint.m
diff --git a/Sources/GoogleMapsUtils/Geometry/Model/GMUPolygon.m b/Sources/GoogleMapsUtils/include/GMUPolygon.m
similarity index 100%
rename from Sources/GoogleMapsUtils/Geometry/Model/GMUPolygon.m
rename to Sources/GoogleMapsUtils/include/GMUPolygon.m
diff --git a/Sources/GoogleMapsUtils/Clustering/Algo/GMUSimpleClusterAlgorithm.m b/Sources/GoogleMapsUtils/include/GMUSimpleClusterAlgorithm.m
similarity index 100%
rename from Sources/GoogleMapsUtils/Clustering/Algo/GMUSimpleClusterAlgorithm.m
rename to Sources/GoogleMapsUtils/include/GMUSimpleClusterAlgorithm.m
diff --git a/Sources/GoogleMapsUtils/Clustering/GMUStaticCluster.m b/Sources/GoogleMapsUtils/include/GMUStaticCluster.m
similarity index 100%
rename from Sources/GoogleMapsUtils/Clustering/GMUStaticCluster.m
rename to Sources/GoogleMapsUtils/include/GMUStaticCluster.m
diff --git a/Sources/GoogleMapsUtils/Geometry/Model/GMUStyle.m b/Sources/GoogleMapsUtils/include/GMUStyle.m
similarity index 100%
rename from Sources/GoogleMapsUtils/Geometry/Model/GMUStyle.m
rename to Sources/GoogleMapsUtils/include/GMUStyle.m
diff --git a/Sources/GoogleMapsUtils/Geometry/Model/GMUStyleMap.m b/Sources/GoogleMapsUtils/include/GMUStyleMap.m
similarity index 100%
rename from Sources/GoogleMapsUtils/Geometry/Model/GMUStyleMap.m
rename to Sources/GoogleMapsUtils/include/GMUStyleMap.m
diff --git a/Sources/GoogleMapsUtils/Heatmap/GMUWeightedLatLng.m b/Sources/GoogleMapsUtils/include/GMUWeightedLatLng.m
similarity index 100%
rename from Sources/GoogleMapsUtils/Heatmap/GMUWeightedLatLng.m
rename to Sources/GoogleMapsUtils/include/GMUWeightedLatLng.m
diff --git a/Sources/GoogleMapsUtils/Clustering/Algo/GMUWrappingDictionaryKey.m b/Sources/GoogleMapsUtils/include/GMUWrappingDictionaryKey.m
similarity index 100%
rename from Sources/GoogleMapsUtils/Clustering/Algo/GMUWrappingDictionaryKey.m
rename to Sources/GoogleMapsUtils/include/GMUWrappingDictionaryKey.m
diff --git a/Sources/GoogleMapsUtils/QuadTree/GQTPointQuadTree.m b/Sources/GoogleMapsUtils/include/GQTPointQuadTree.m
similarity index 100%
rename from Sources/GoogleMapsUtils/QuadTree/GQTPointQuadTree.m
rename to Sources/GoogleMapsUtils/include/GQTPointQuadTree.m
diff --git a/Sources/GoogleMapsUtils/QuadTree/GQTPointQuadTreeChild.m b/Sources/GoogleMapsUtils/include/GQTPointQuadTreeChild.m
similarity index 100%
rename from Sources/GoogleMapsUtils/QuadTree/GQTPointQuadTreeChild.m
rename to Sources/GoogleMapsUtils/include/GQTPointQuadTreeChild.m

From ec2033b1f147b6733fb1264487529554525f503f Mon Sep 17 00:00:00 2001
From: Angela Yu <5506675+wangela@users.noreply.github.com>
Date: Fri, 2 Feb 2024 17:13:30 -0800
Subject: [PATCH 23/26] chore: move top-level header file

---
 GoogleMapsUtils/GoogleMapsUtils.h             | 70 -------------------
 .../GoogleMapsUtils/include/GoogleMapsUtils.h | 70 +++++++++++++++++++
 2 files changed, 70 insertions(+), 70 deletions(-)
 delete mode 100644 GoogleMapsUtils/GoogleMapsUtils.h
 create mode 100644 Sources/GoogleMapsUtils/include/GoogleMapsUtils.h

diff --git a/GoogleMapsUtils/GoogleMapsUtils.h b/GoogleMapsUtils/GoogleMapsUtils.h
deleted file mode 100644
index 1f0b8dc2..00000000
--- a/GoogleMapsUtils/GoogleMapsUtils.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Copyright (c) 2017 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for GoogleMapsUtils.
-FOUNDATION_EXPORT double GoogleMapsUtilsVersionNumber;
-
-//! Project version string for GoogleMapsUtils.
-FOUNDATION_EXPORT const unsigned char GoogleMapsUtilsVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <GoogleMapsUtils/PublicHeader.h>
-
-// Heatmap
-#import <GoogleMapsUtils/GMUGradient.h>
-#import <GoogleMapsUtils/GMUHeatmapTileLayer.h>
-#import <GoogleMapsUtils/GMUWeightedLatLng.h>
-
-// Clustering
-#import <GoogleMapsUtils/GMUClusterAlgorithm.h>
-#import <GoogleMapsUtils/GMUGridBasedClusterAlgorithm.h>
-#import <GoogleMapsUtils/GMUNonHierarchicalDistanceBasedAlgorithm.h>
-#import <GoogleMapsUtils/GMUSimpleClusterAlgorithm.h>
-#import <GoogleMapsUtils/GMUWrappingDictionaryKey.h>
-#import <GoogleMapsUtils/GMUCluster.h>
-#import <GoogleMapsUtils/GMUClusterItem.h>
-#import <GoogleMapsUtils/GMUClusterManager.h>
-#import <GoogleMapsUtils/GMUClusterManager+Testing.h>
-#import <GoogleMapsUtils/GMUStaticCluster.h>
-#import <GoogleMapsUtils/GMUClusterIconGenerator.h>
-#import <GoogleMapsUtils/GMUClusterRenderer.h>
-#import <GoogleMapsUtils/GMUDefaultClusterIconGenerator.h>
-#import <GoogleMapsUtils/GMUDefaultClusterRenderer.h>
-#import <GoogleMapsUtils/GMSMarker+GMUClusteritem.h>
-
-// Geometry
-#import <GoogleMapsUtils/GMUFeature.h>
-#import <GoogleMapsUtils/GMUGeometry.h>
-#import <GoogleMapsUtils/GMUGeometryCollection.h>
-#import <GoogleMapsUtils/GMUGeometryContainer.h>
-#import <GoogleMapsUtils/GMUGroundOverlay.h>
-#import <GoogleMapsUtils/GMULineString.h>
-#import <GoogleMapsUtils/GMUPlacemark.h>
-#import <GoogleMapsUtils/GMUPoint.h>
-#import <GoogleMapsUtils/GMUPolygon.h>
-#import <GoogleMapsUtils/GMUStyle.h>
-#import <GoogleMapsUtils/GMUGeoJSONParser.h>
-#import <GoogleMapsUtils/GMUGeometryRenderer.h>
-#import <GoogleMapsUtils/GMUKMLParser.h>
-#import <GoogleMapsUtils/GMUStyleMap.h>
-#import <GoogleMapsUtils/GMUPair.h>
-
-// QuadTree
-#import <GoogleMapsUtils/GQTBounds.h>
-#import <GoogleMapsUtils/GQTPoint.h>
-#import <GoogleMapsUtils/GQTPointQuadTree.h>
-#import <GoogleMapsUtils/GQTPointQuadTreeChild.h>
-#import <GoogleMapsUtils/GQTPointQuadTreeItem.h>
diff --git a/Sources/GoogleMapsUtils/include/GoogleMapsUtils.h b/Sources/GoogleMapsUtils/include/GoogleMapsUtils.h
new file mode 100644
index 00000000..445398ce
--- /dev/null
+++ b/Sources/GoogleMapsUtils/include/GoogleMapsUtils.h
@@ -0,0 +1,70 @@
+/* Copyright (c) 2017 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import <UIKit/UIKit.h"
+
+//! Project version number for GoogleMapsUtils.
+FOUNDATION_EXPORT double GoogleMapsUtilsVersionNumber;
+
+//! Project version string for GoogleMapsUtils.
+FOUNDATION_EXPORT const unsigned char GoogleMapsUtilsVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import "PublicHeader.h"
+
+// Heatmap
+#import "GMUGradient.h"
+#import "GMUHeatmapTileLayer.h"
+#import "GMUWeightedLatLng.h"
+
+// Clustering
+#import "GMUClusterAlgorithm.h"
+#import "GMUGridBasedClusterAlgorithm.h"
+#import "GMUNonHierarchicalDistanceBasedAlgorithm.h"
+#import "GMUSimpleClusterAlgorithm.h"
+#import "GMUWrappingDictionaryKey.h"
+#import "GMUCluster.h"
+#import "GMUClusterItem.h"
+#import "GMUClusterManager.h"
+#import "GMUClusterManager+Testing.h"
+#import "GMUStaticCluster.h"
+#import "GMUClusterIconGenerator.h"
+#import "GMUClusterRenderer.h"
+#import "GMUDefaultClusterIconGenerator.h"
+#import "GMUDefaultClusterRenderer.h"
+#import "GMSMarker+GMUClusteritem.h"
+
+// Geometry
+#import "GMUFeature.h"
+#import "GMUGeometry.h"
+#import "GMUGeometryCollection.h"
+#import "GMUGeometryContainer.h"
+#import "GMUGroundOverlay.h"
+#import "GMULineString.h"
+#import "GMUPlacemark.h"
+#import "GMUPoint.h"
+#import "GMUPolygon.h"
+#import "GMUStyle.h"
+#import "GMUGeoJSONParser.h"
+#import "GMUGeometryRenderer.h"
+#import "GMUKMLParser.h"
+#import "GMUStyleMap.h"
+#import "GMUPair.h"
+
+// QuadTree
+#import "GQTBounds.h"
+#import "GQTPoint.h"
+#import "GQTPointQuadTree.h"
+#import "GQTPointQuadTreeChild.h"
+#import "GQTPointQuadTreeItem.h"

From 5b81e608f77f88bcf5c95bf3799aa55cd9fa2969 Mon Sep 17 00:00:00 2001
From: Angela Yu <5506675+wangela@users.noreply.github.com>
Date: Fri, 2 Feb 2024 22:58:16 -0800
Subject: [PATCH 24/26] chore: fix package manifest and headers

---
 GoogleMapsUtils/Info.plist                    | 24 -------------------
 Package.resolved                              | 16 +++++++++++++
 Package.swift                                 | 20 ++--------------
 .../include/GMUMarkerClustering.h             | 18 +++++++-------
 .../GoogleMapsUtils/include/GoogleMapsUtils.h |  7 +++++-
 5 files changed, 33 insertions(+), 52 deletions(-)
 delete mode 100644 GoogleMapsUtils/Info.plist
 create mode 100644 Package.resolved

diff --git a/GoogleMapsUtils/Info.plist b/GoogleMapsUtils/Info.plist
deleted file mode 100644
index fcd36391..00000000
--- a/GoogleMapsUtils/Info.plist
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>$(MARKETING_VERSION)</string>
-	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
-	<key>NSPrincipalClass</key>
-	<string></string>
-</dict>
-</plist>
diff --git a/Package.resolved b/Package.resolved
new file mode 100644
index 00000000..859db975
--- /dev/null
+++ b/Package.resolved
@@ -0,0 +1,16 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "GoogleMaps",
+        "repositoryURL": "https://github.com/googlemaps/ios-maps-sdk",
+        "state": {
+          "branch": null,
+          "revision": "c71307e6003e426ceeeaff09f04bbd66bff68b26",
+          "version": "8.3.1"
+        }
+      }
+    ]
+  },
+  "version": 1
+}
diff --git a/Package.swift b/Package.swift
index f5bf6a71..63242cd4 100644
--- a/Package.swift
+++ b/Package.swift
@@ -16,22 +16,6 @@
 
 import PackageDescription
 
-#if os(macOS)
-#error("This package does not support macOS.")
-#endif
-
-#if os(tvOS)
-#error("This package does not support tvOS.")
-#endif
-
-#if os(visionOS)
-#error("This package does not support visionOS.")
-#endif
-
-#if os(watchOS)
-#error("This package does not support watchOS.")
-#endif
-
 let package = Package(
   name: "GoogleMapsUtils",
   platforms: [
@@ -55,12 +39,12 @@ let package = Package(
         .product(name: "GoogleMapsCore", package: "ios-maps-sdk"),
         .product(name: "GoogleMapsBase", package: "ios-maps-sdk")
       ],
-      publicHeadersPath: "Sources/GoogleMapsUtils/include"
+      publicHeadersPath: "include"
     ),
     .target(
       name: "GoogleMapsUtilsSwift",
       dependencies: [
-        "GoogleMapsUtils",
+        .target(name: "GoogleMapsUtils"),
         .product(name: "GoogleMaps", package: "ios-maps-sdk"),
         .product(name: "GoogleMapsCore", package: "ios-maps-sdk"),
         .product(name: "GoogleMapsBase", package: "ios-maps-sdk")
diff --git a/Sources/GoogleMapsUtils/include/GMUMarkerClustering.h b/Sources/GoogleMapsUtils/include/GMUMarkerClustering.h
index cce2477d..21d3a1d8 100644
--- a/Sources/GoogleMapsUtils/include/GMUMarkerClustering.h
+++ b/Sources/GoogleMapsUtils/include/GMUMarkerClustering.h
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-#import <Google-Maps-iOS-Utils/GMUCluster.h>
-#import <Google-Maps-iOS-Utils/GMUClusterItem.h>
-#import <Google-Maps-iOS-Utils/GMUClusterManager.h>
-#import <Google-Maps-iOS-Utils/GMUDefaultClusterIconGenerator.h>
-#import <Google-Maps-iOS-Utils/GMUDefaultClusterRenderer.h>
-#import <Google-Maps-iOS-Utils/GMUGridBasedClusterAlgorithm.h>
-#import <Google-Maps-iOS-Utils/GMUNonHierarchicalDistanceBasedAlgorithm.h>
-#import <Google-Maps-iOS-Utils/GMUStaticCluster.h>
+#import "GMUCluster.h"
+#import "GMUClusterItem.h"
+#import "GMUClusterManager.h"
+#import "GMUDefaultClusterIconGenerator.h"
+#import "GMUDefaultClusterRenderer.h"
+#import "GMUGridBasedClusterAlgorithm.h"
+#import "GMUNonHierarchicalDistanceBasedAlgorithm.h"
+#import "GMUStaticCluster.h"
 
-#import "Google-Maps-iOS-Utils/GQTPointQuadTree.h"
+#import "GQTPointQuadTree.h"
diff --git a/Sources/GoogleMapsUtils/include/GoogleMapsUtils.h b/Sources/GoogleMapsUtils/include/GoogleMapsUtils.h
index 445398ce..5101ce30 100644
--- a/Sources/GoogleMapsUtils/include/GoogleMapsUtils.h
+++ b/Sources/GoogleMapsUtils/include/GoogleMapsUtils.h
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#import <UIKit/UIKit.h"
+#import <UIKit/UIKit.h>
 
 //! Project version number for GoogleMapsUtils.
 FOUNDATION_EXPORT double GoogleMapsUtilsVersionNumber;
@@ -26,9 +26,11 @@ FOUNDATION_EXPORT const unsigned char GoogleMapsUtilsVersionString[];
 // Heatmap
 #import "GMUGradient.h"
 #import "GMUHeatmapTileLayer.h"
+#import "GMUHeatmapTileLayer+Testing.h"
 #import "GMUWeightedLatLng.h"
 
 // Clustering
+#import "GMUMarkerClustering.h"
 #import "GMUClusterAlgorithm.h"
 #import "GMUGridBasedClusterAlgorithm.h"
 #import "GMUNonHierarchicalDistanceBasedAlgorithm.h"
@@ -42,7 +44,9 @@ FOUNDATION_EXPORT const unsigned char GoogleMapsUtilsVersionString[];
 #import "GMUClusterIconGenerator.h"
 #import "GMUClusterRenderer.h"
 #import "GMUDefaultClusterIconGenerator.h"
+#import "GMUDefaultClusterIconGenerator+Testing.h"
 #import "GMUDefaultClusterRenderer.h"
+#import "GMUDefaultClusterRenderer+Testing.h"
 #import "GMSMarker+GMUClusteritem.h"
 
 // Geometry
@@ -58,6 +62,7 @@ FOUNDATION_EXPORT const unsigned char GoogleMapsUtilsVersionString[];
 #import "GMUStyle.h"
 #import "GMUGeoJSONParser.h"
 #import "GMUGeometryRenderer.h"
+#import "GMUGeometryRenderer+Testing.h"
 #import "GMUKMLParser.h"
 #import "GMUStyleMap.h"
 #import "GMUPair.h"

From 5741dbfed24df7e602569262f2f0707de18a2567 Mon Sep 17 00:00:00 2001
From: Angela Yu <5506675+wangela@users.noreply.github.com>
Date: Wed, 14 Feb 2024 12:52:23 -0800
Subject: [PATCH 25/26] chore: update podspec and xcconfig

---
 Google-Maps-iOS-Utils.podspec          | 35 +++++++++++++-------------
 XcodeConfig/GMU-Target.common.xcconfig |  4 +--
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/Google-Maps-iOS-Utils.podspec b/Google-Maps-iOS-Utils.podspec
index e93dea43..4c2c5436 100644
--- a/Google-Maps-iOS-Utils.podspec
+++ b/Google-Maps-iOS-Utils.podspec
@@ -16,52 +16,53 @@ Pod::Spec.new do |s|
   s.authors      = "Google Inc."
   s.platform     = :ios, '14.0'
   s.source       = { :git => "https://github.com/googlemaps/google-maps-ios-utils.git",
-                     :tag => "v#{s.version.to_s}" }
+                    :branch => "wangela/8-0-0" }
   s.requires_arc = true
   s.module_name = "GoogleMapsUtils"
-  s.swift_version = '5.0'
+  s.swift_version = '5.3'
 
   s.dependency 'GoogleMaps'
   s.static_framework = true
 
   s.subspec 'QuadTree' do |sp|
-    sp.public_header_files = "src/#{sp.base_name}/**/*.h"
-    sp.source_files = "src/#{sp.base_name}/**/*.{h,m,swift}"
+    sp.public_header_files = "Sources/GoogleMapsUtils/include/*.h"
+    sp.source_files = "Sources/GoogleMapsUtils/include/*.{h,m}", "Sources/GoogleMapsUtilsSwift/#{sp.base_name}/**/*.swift"
   end
 
   s.subspec 'Clustering' do |sp|
-    sp.public_header_files = "src/#{sp.base_name}/**/*.h"
-    sp.source_files = "src/#{sp.base_name}/**/*.{h,m,swift}"
-    sp.exclude_files = "src/#{sp.base_name}/GMUMarkerClustering.h"
+    sp.public_header_files = "Sources/GoogleMapsUtils/include/*.h"
+    sp.source_files = "Sources/GoogleMapsUtils/include/*.{h,m}", "Sources/GoogleMapsUtilsSwift/#{sp.base_name}/**/*.swift"
+    sp.exclude_files = "Sources/GoogleMapsUtils/include/GMUMarkerClustering.h"
     sp.dependency 'Google-Maps-iOS-Utils/QuadTree'
   end
 
   s.subspec 'Geometry' do |sp|
-     sp.public_header_files = "src/#{sp.base_name}/**/*.h"
-     sp.source_files = "src/#{sp.base_name}/**/*.{h,m,swift}"
+     sp.public_header_files = "Sources/GoogleMapsUtils/include/*.h"
+     sp.source_files = "Sources/GoogleMapsUtils/include/*.{h,m}", "Sources/GoogleMapsUtilsSwift/#{sp.base_name}/**/*.swift"
   end
 
   s.subspec 'Heatmap' do |sp|
-    sp.public_header_files = "src/#{sp.base_name}/**/*.h"
-    sp.source_files = "src/#{sp.base_name}/**/*.{h,m,swift}"
+    sp.public_header_files = "Sources/GoogleMapsUtils/include/*.h"
+    sp.source_files = "Sources/GoogleMapsUtils/include/*.{h,m}", "Sources/GoogleMapsUtilsSwift/#{sp.base_name}/**/*.swift"
     sp.dependency 'Google-Maps-iOS-Utils/QuadTree'
+    sp.dependency 'GoogleMaps'
   end
 
   s.subspec 'GeometryUtils' do |sp|
-    sp.source_files = "src/#{sp.base_name}/**/*.{h,m,swift}"
+    sp.source_files = "Sources/GoogleMapsUtils/include/*.{h,m}", "Sources/GoogleMapsUtilsSwift/#{sp.base_name}/**/*.swift"
   end
 
   s.test_spec 'Tests' do |unit_tests|
     unit_tests.source_files = [
-      "GoogleMapsUtils/GoogleMapsUtils.h",
-      "test/common/Model/*.{h,m,swift}",
-      "test/unit/**/*.{h,m,swift}",
+      "Sources/GoogleMapsUtils/include/GoogleMapsUtils.h",
+      "Tests/GoogleMapsUtilsTests/common/Model/*.{h,m,swift}",
+      "Tests/GoogleMapsUtilsTests/unit/**/*.{h,m,swift}",
     ]
     unit_tests.resources = [
-      "test/resources/**/*.{geojson,kml}"
+      "Tests/GoogleMapsUtilsTests/resources/**/*.{geojson,kml}"
     ]
     unit_tests.pod_target_xcconfig = {
-      'SWIFT_OBJC_BRIDGING_HEADER' => "$(PODS_TARGET_SRCROOT)/test/unit/BridgingHeader/UnitTest-Bridging-Header.h"
+      'SWIFT_OBJC_BRIDGING_HEADER' => "$(PODS_TARGET_SRCROOT)/Tests/GoogleMapsUtilsTests/unit/BridgingHeader/UnitTest-Bridging-Header.h"
     }
     unit_tests.dependency 'OCMock'
   end
diff --git a/XcodeConfig/GMU-Target.common.xcconfig b/XcodeConfig/GMU-Target.common.xcconfig
index 0ad07ece..9216d647 100644
--- a/XcodeConfig/GMU-Target.common.xcconfig
+++ b/XcodeConfig/GMU-Target.common.xcconfig
@@ -1,7 +1,7 @@
 // Custom project config.
-IPHONEOS_DEPLOYMENT_TARGET = 7.0
+IPHONEOS_DEPLOYMENT_TARGET = 14.0
 USE_HEADERMAP = YES
-HEADER_SEARCH_PATHS = $(inherited) "${SRCROOT}/../src" "${SRCROOT}/../test"
+HEADER_SEARCH_PATHS = $(inherited) "${SRCROOT}/../Sources" "${SRCROOT}/../Tests"
 CLANG_ENABLE_MODULES = YES
 CODE_SIGNING_ALLOWED = NO
 CODE_SIGNING_REQUIRED = NO

From de4e482df1fd729362db91239269e1e92cb0d787 Mon Sep 17 00:00:00 2001
From: Angela Yu <5506675+wangela@users.noreply.github.com>
Date: Wed, 14 Feb 2024 16:26:57 -0800
Subject: [PATCH 26/26] chore: try adding resource bundle

---
 Google-Maps-iOS-Utils.podspec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Google-Maps-iOS-Utils.podspec b/Google-Maps-iOS-Utils.podspec
index 4c2c5436..6b7730e4 100644
--- a/Google-Maps-iOS-Utils.podspec
+++ b/Google-Maps-iOS-Utils.podspec
@@ -22,6 +22,7 @@ Pod::Spec.new do |s|
   s.swift_version = '5.3'
 
   s.dependency 'GoogleMaps'
+  s.ios.resource_bundle = { 'GoogleMaps' => 'Resources/**/*' }
   s.static_framework = true
 
   s.subspec 'QuadTree' do |sp|