diff --git a/Apps/Examples/Examples/All Examples/GeofencingExample.swift b/Apps/Examples/Examples/All Examples/GeofencingExample.swift index 0eff70377d91..c279ca605fc0 100644 --- 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 index 079647cdf2b9..d498acbfa82b 100644 --- a/Package.resolved +++ b/Package.resolved @@ -5,8 +5,8 @@ "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" } }, { @@ -14,8 +14,8 @@ "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" } }, { @@ -23,8 +23,8 @@ "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 index 99e422654602..64f2af2a1554 100644 --- 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)" } -} +} \ No newline at end of file diff --git a/Sources/MapboxMaps/Foundation/Extensions/Geofencing/Geofencing+Turf.swift b/Sources/MapboxMaps/Foundation/Extensions/Geofencing/Geofencing+Turf.swift deleted file mode 100644 index 8ee572975879..000000000000 --- a/Sources/MapboxMaps/Foundation/Extensions/Geofencing/Geofencing+Turf.swift +++ /dev/null @@ -1,40 +0,0 @@ -@_spi(Experimental) @_spi(Internal) import MapboxCommon - -@_spi(Experimental) -extension GeofenceState { - /// Create `GeofenceState` - @_spi(Experimental) - public init(feature: Turf.Feature, timestamp: Date?) { - self.init(_feature: MapboxCommon.Feature(feature), timestamp: timestamp) - } - - /// The feature linked to this state - @_spi(Experimental) - public var feature: Turf.Feature { Turf.Feature(_feature) } -} - -@_spi(Experimental) -extension GeofencingEvent { - /// Create `GeofenceEvent` - @_spi(Experimental) - public init(feature: Turf.Feature, timestamp: Date) { - self.init(_feature: MapboxCommon.Feature(feature), timestamp: timestamp) - } - - /// The feature linked to this event - @_spi(Experimental) - public var feature: Turf.Feature { Turf.Feature(_feature) } -} - -@_spi(Experimental) -extension GeofencingService { - /// Adds a feature to be monitored for geofencing activities. - /// You can add extra properties (see GeofencingPropertiesKeys) to the Feature to configure how geofencing engine behaves per each specific feature. - /// If a feature with the same ID already exist it will be overwritten and its state reset - @_spi(Experimental) - public func addFeature(feature: Turf.Feature, callback: @escaping (Result) -> Void) { - self.addFeature(feature: MapboxCommon.Feature(feature)) { result in - callback(result) - } - } -}