chore: fix package manifest and headers

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
+}

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")

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"

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"