Skip to content

Commit

Permalink
Bump the gl-native to latest snapshot and adopt the API (#2291)
Browse files Browse the repository at this point in the history
  • Loading branch information
aleksproger committed Sep 9, 2024
1 parent c1ec37b commit 0ce96e6
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 60 deletions.
4 changes: 2 additions & 2 deletions MapboxMaps.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ Pod::Spec.new do |m|
m.source_files = 'Sources/MapboxMaps/**/*.{swift,h}'
m.resource_bundles = { 'MapboxMapsResources' => ['Sources/**/*.{xcassets,strings}', 'Sources/MapboxMaps/MapboxMaps.json', 'Sources/MapboxMaps/PrivacyInfo.xcprivacy'] }

m.dependency 'MapboxCoreMaps', '11.7.0-beta.2'
m.dependency 'MapboxCommon', '24.7.0-beta.2'
m.dependency 'MapboxCoreMaps', '11.8.0-SNAPSHOT.0909T1106Z.a39ac04'
m.dependency 'MapboxCommon', '24.8.0-SNAPSHOT.0909T1105Z.a39ac04'
m.dependency 'Turf', '3.0.0'

end
18 changes: 0 additions & 18 deletions Package.resolved
Original file line number Diff line number Diff line change
@@ -1,23 +1,5 @@
{
"pins" : [
{
"identity" : "mapbox-common-ios",
"kind" : "remoteSourceControl",
"location" : "https://github.com/mapbox/mapbox-common-ios.git",
"state" : {
"revision" : "b4197f12f928066645e08b70c12ce1e22e50e2c3",
"version" : "24.6.0"
}
},
{
"identity" : "mapbox-core-maps-ios",
"kind" : "remoteSourceControl",
"location" : "https://github.com/mapbox/mapbox-core-maps-ios.git",
"state" : {
"revision" : "455ad90488ab033a50ab4b7283fa78184309eef3",
"version" : "11.6.0"
}
},
{
"identity" : "turf-swift",
"kind" : "remoteSourceControl",
Expand Down
4 changes: 2 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import PackageDescription
import Foundation

let coreMaps = MapsDependency.coreMaps(version: "11.7.0-beta.2")
let common = MapsDependency.common(version: "24.7.0-beta.2")
let coreMaps = MapsDependency.coreMaps(version: "11.8.0-SNAPSHOT.0909T1106Z.a39ac04", checksum: "ed293b1d4c6a2eb5230a66f1473a8ee1956e45f2d36f99cc87726f5e5a8ee642")
let common = MapsDependency.common(version: "24.8.0-SNAPSHOT.0909T1105Z.a39ac04", checksum: "e5c0e5acb17e2afea0adeddc702a0b26c1625d6f156714cba4762cecaf116a7c")

let mapboxMapsPath: String? = nil

Expand Down
1 change: 0 additions & 1 deletion Sources/MapboxMaps/Foundation/CoreAliases.swift
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,4 @@ typealias CoreInteraction = MapboxCoreMaps_Private.Interaction
typealias CoreInteractionHandler = MapboxCoreMaps_Private.InteractionHandler
typealias CoreRenderedQueryGeometry = MapboxCoreMaps_Private.RenderedQueryGeometry
typealias CoreFeaturesetFeatureId = MapboxCoreMaps_Private.FeaturesetFeatureId
typealias CoreFeatureIdentifier = MapboxCoreMaps_Private.FeatureIdentifier
typealias CoreFeaturesetQueryTarget = MapboxCoreMaps_Private.FeaturesetQueryTarget

This file was deleted.

27 changes: 2 additions & 25 deletions Sources/MapboxMaps/Interactions/FeaturesetFeatureId.swift
Original file line number Diff line number Diff line change
Expand Up @@ -28,33 +28,10 @@ public struct FeaturesetFeatureId: Hashable {
}

var core: CoreFeaturesetFeatureId {
CoreFeaturesetFeatureId(featureId: .fromNSString(id), featureNamespace: namespace)
CoreFeaturesetFeatureId(featureId: id, featureNamespace: namespace)
}

init(core: CoreFeaturesetFeatureId) {
self.init(id: core.featureId.string, namespace: core.featureNamespace)
}
}

// TODO: remove when core migrates to string id
extension CoreFeatureIdentifier {
var string: String {
if isDouble() {
return String(getDouble())
}
if isLongLong() {
return String(getLongLong())
}

if isUnsignedLongLong() {
return String(getUnsignedLongLong())
}

if isNSString() {
return getNSString()
}

assertionFailure("Invalid id")
return ""
self.init(id: core.featureId, namespace: core.featureNamespace)
}
}
4 changes: 4 additions & 0 deletions scripts/api-compatibility-check/breakage_allowlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1830,3 +1830,7 @@ Var PolylineAnnotation.tapHandler has declared type change from ((MapboxMaps.Map
Func MapboxMap.queryRenderedFeatures(with:options:completion:) has been renamed to Func queryRenderedFeatures(with:targets:completion:)
Func MapboxMap.queryRenderedFeatures(with:options:completion:) is now with @_documentation
Func MapboxMap.queryRenderedFeatures(with:options:completion:) is now with @_spi

// Sendable support in some gl-native objects
Extension CoordinateBounds is now with @Sendable
Extension GlyphsRasterizationOptions is now with @Sendable
4 changes: 2 additions & 2 deletions scripts/release/packager/versions.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"MapboxCoreMaps": "11.7.0-beta.2",
"MapboxCommon": "24.7.0-beta.2",
"MapboxCoreMaps": "11.8.0-SNAPSHOT.0909T1106Z.a39ac04",
"MapboxCommon": "24.8.0-SNAPSHOT.0909T1105Z.a39ac04",
"Turf": "3.0.0"
}

0 comments on commit 0ce96e6

Please sign in to comment.