Skip to content

Commit

Permalink
Adapt latest gl-native and common (#2356)
Browse files Browse the repository at this point in the history
  • Loading branch information
aleksproger authored Nov 21, 2024
1 parent a3e4391 commit d061b47
Show file tree
Hide file tree
Showing 20 changed files with 182 additions and 208 deletions.
8 changes: 4 additions & 4 deletions Apps/Apps.xcworkspace/xcshareddata/swiftpm/Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/mapbox/mapbox-common-ios.git",
"state" : {
"revision" : "2b9ec86affbf41f0e800f0c1c96be31c02e6854f",
"version" : "24.8.0"
"revision" : "47bcfcfb8c377456fa23429d705a43fa166617af",
"version" : "24.9.0-sapial-release-naive-sdks-1-daily-2024-11-14-17-16"
}
},
{
"identity" : "mapbox-core-maps-ios",
"kind" : "remoteSourceControl",
"location" : "https://github.com/mapbox/mapbox-core-maps-ios.git",
"state" : {
"revision" : "c8d61110fb8b9f6452060a1df65dfc494d30afb2",
"version" : "11.8.0"
"revision" : "345af077c1c6cc84afec71f76b2d09e761ca44e6",
"version" : "24.9.0-sapial-release-naive-sdks-1-daily-2024-11-14-17-16"
}
},
{
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ Mapbox welcomes participation and contributions from everyone.

## main

⚠️⚠️⚠️ Potentially breaking changes ⚠️⚠️⚠️
* Mark `symbolElevationReference`, `symbolZOffset`, `lineTrimColor `, `lineTrimFadeRange`, `lineZOffset` as Experimental in AnnotationManagers. This is potentially breaking change, however those properties are not marked as experimental only in AnnotationManagers by mistake.
In order to continue use them use the following import `@_spi(Experimental) import MapboxMaps`.

* Add two separete Geofence examples in SwiftUI - `GeofencingPlayground` and `GeofencingUserLocation`
* Add support for Base and Height alignment in FillExtrusionLayer.
* Add support for `pitchAlignment` in BackgroundLayer.
* Add support for `zOffset` in FillLayer, PolygonAnnotation[Manager] and PolygonAnnotationGroup.
Expand All @@ -15,6 +20,8 @@ That initializer doesn't require to wrap arguments in `Argument` cases. For exam
## 11.8.0 - 11 November, 2024

* Add two separated Geofence examples in SwiftUI - `GeofencingPlayground` and `GeofencingUserLocation`
* Expose `lineElevationReference`, `lineCrossSlope`, `iconSizeScaleRange`, `textSizeScaleRange` as experimental
* Mark `ClipLayer` as stable

## 11.8.0-rc.1 - 23 October, 2024

Expand Down
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.8.0'
m.dependency 'MapboxCommon', '24.8.0'
m.dependency 'MapboxCoreMaps', '11.9.0-SNAPSHOT.1112T1941Z.8130abf'
m.dependency 'MapboxCommon', '24.9.0-SNAPSHOT.1112T0225Z.a361369'
m.dependency 'Turf', '4.0.0-beta.1'

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" : "2b9ec86affbf41f0e800f0c1c96be31c02e6854f",
"version" : "24.8.0"
}
},
{
"identity" : "mapbox-core-maps-ios",
"kind" : "remoteSourceControl",
"location" : "https://github.com/mapbox/mapbox-core-maps-ios.git",
"state" : {
"revision" : "c8d61110fb8b9f6452060a1df65dfc494d30afb2",
"version" : "11.8.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.8.0")
let common = MapsDependency.common(version: "24.8.0")
let coreMaps = MapsDependency.coreMaps(version: "11.9.0-SNAPSHOT.1112T1941Z.8130abf", checksum: "0ef6877a48fbd153ab2d4f5605234d44b344d4089e5190f0d216bc79e8b55339")
let common = MapsDependency.common(version: "24.9.0-SNAPSHOT.1112T0225Z.a361369", checksum: "e828f210cc591daf087206066d5117c0d4c10e8ec07c233ab1cd8d800a834a63")

let mapboxMapsPath: String? = nil

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
- ``TransitionOptions-struct``
- ``ModelScaleMode``
- ``SymbolElevationReference``
- ``BackgroundPitchAlignment``
- ``FillExtrusionBaseAlignment``
- ``FillExtrusionHeightAlignment``
- ``BackgroundPitchAlignment``

<!-- Next two are arguable regarding it's category -->
- ``ImageContent``
Expand Down

This file was deleted.

48 changes: 24 additions & 24 deletions Sources/MapboxMaps/Style/Generated/Layers/SymbolLayer.swift

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 18 additions & 18 deletions Sources/MapboxMaps/Style/Generated/Properties/Properties.swift

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit d061b47

Please sign in to comment.