[wip] Common with Turf

mapbox · Nov 2, 2024 · fb37991 · fb37991
1 parent fb97a45
commit fb37991
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 52 deletions.
diff --git a/Apps/Examples/Examples/All Examples/GeofencingExample.swift b/Apps/Examples/Examples/All Examples/GeofencingExample.swift
@@ -268,7 +268,7 @@ extension GeofencingExample {
         NSLayoutConstraint.activate(textLayoutConstraints)
         geofenceDisabledText = textView
 
-        let isConsentGiven = GeofencingUtils.getUserConsent()
+        let isConsentGiven = true
 
         self.geofencingBt?.isHidden = !isConsentGiven
         self.geofenceDisabledText?.isHidden = isConsentGiven

diff --git a/Package.resolved b/Package.resolved
@@ -5,26 +5,26 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/mapbox/mapbox-common-ios.git",
       "state" : {
-        "revision" : "c5ff61ca878f937407276d17137b8bab5a05f632",
-        "version" : "24.8.0-beta.1"
+        "branch" : "sapial/CORESDK-3099/0",
+        "revision" : "b49f9ace1249eaef95b5823b9bffda15bfaef599"
       }
     },
     {
       "identity" : "mapbox-core-maps-ios",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/mapbox/mapbox-core-maps-ios.git",
       "state" : {
-        "revision" : "1ce341acc0a5e2d0f0f7c3dedb8553bb22888437",
-        "version" : "11.8.0-beta.1"
+        "branch" : "sapial/CORESDK-3099/0",
+        "revision" : "eff168cfed784957bd1792ac1ab7a9059f10ab16"
       }
     },
     {
       "identity" : "turf-swift",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/mapbox/turf-swift.git",
       "state" : {
-        "revision" : "1997fb3c3dc0d8181690a1ec192ed907bcead9e8",
-        "version" : "3.0.0"
+        "branch" : "main",
+        "revision" : "f869ec2055ace4f95101b623a45f1506fa6f1503"
       }
     }
   ],

diff --git a/Package.swift b/Package.swift
@@ -20,14 +20,17 @@ let package = Package(
             targets: ["MapboxMaps"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/mapbox/turf-swift.git", exact: "3.0.0"),
-    ] + coreMaps.packageDependencies + common.packageDependencies,
+        .package(url: "https://github.com/mapbox/mapbox-common-ios.git", branch: "sapial/CORESDK-3099/0"),
+        .package(url: "https://github.com/mapbox/mapbox-core-maps-ios.git", branch: "sapial/CORESDK-3099/0"),
+        .package(url: "https://github.com/mapbox/turf-swift.git", branch: "main")
+    ] + coreMaps.packageDependencies,
     targets: [
         .target(
             name: "MapboxMaps",
             dependencies: [
                 coreMaps.mapsTargetDependencies,
-                common.mapsTargetDependencies,
+                .product(name: "MapboxCoreMaps", package: "mapbox-core-maps-ios"),
+                .product(name: "MapboxCommon", package: "mapbox-common-ios"),
                 .product(name: "Turf", package: "turf-swift")
             ],
             path: mapboxMapsPath,
@@ -63,7 +66,7 @@ let package = Package(
                 .process("Resources/MapInitOptionsTests.xib"),
             ]
         )
-    ] + coreMaps.packageTargets + common.packageTargets
+    ] + coreMaps.packageTargets
 )
 
 struct MapsDependency {
@@ -132,4 +135,4 @@ struct MapsDependency {
     var registryURL: String {
         return "https://api.mapbox.com/downloads/v2/\(registryProjectName)/\(registryReleaseFolder)/ios/packages/\(version)/\(registryFileName)"
     }
-}
+}
diff --git a/Sources/MapboxMaps/Foundation/Extensions/Geofencing/Geofencing+Turf.swift b/Sources/MapboxMaps/Foundation/Extensions/Geofencing/Geofencing+Turf.swift