Skip to content

Commit

Permalink
Cherry-pick for 11.9.0 release (#2394)
Browse files Browse the repository at this point in the history
Co-authored-by: Ivan Persidsky <ivan.persidskii@mapbox.com>
  • Loading branch information
OdNairy and persidskiy authored Dec 18, 2024
1 parent 515e445 commit e267bb4
Show file tree
Hide file tree
Showing 14 changed files with 49 additions and 49 deletions.
12 changes: 6 additions & 6 deletions Apps/Apps.xcworkspace/xcshareddata/swiftpm/Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,26 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/mapbox/mapbox-common-ios.git",
"state" : {
"revision" : "7231fe68dd707a8109f6d46ee698ef666b18b64f",
"version" : "24.9.0-rc.1"
"revision" : "480f648b20b87a3a55f30bb6d76d6dc7d8412ec4",
"version" : "24.9.0"
}
},
{
"identity" : "mapbox-core-maps-ios",
"kind" : "remoteSourceControl",
"location" : "https://github.com/mapbox/mapbox-core-maps-ios.git",
"state" : {
"revision" : "d815e2e13c08cce16bd9dba9349541578f5a34de",
"version" : "11.9.0-rc.1"
"revision" : "9fdb574d24d4a012a051d6a875e1c2753796de07",
"version" : "11.9.0"
}
},
{
"identity" : "turf-swift",
"kind" : "remoteSourceControl",
"location" : "https://github.com/mapbox/turf-swift.git",
"state" : {
"revision" : "f869ec2055ace4f95101b623a45f1506fa6f1503",
"version" : "4.0.0-beta.1"
"revision" : "bf840e6b9529d105687840fe2c9dcd74197d46d1",
"version" : "4.0.0"
}
}
],
Expand Down
13 changes: 12 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,21 @@ Mapbox welcomes participation and contributions from everyone.

## main

* Localize geofencing attribution dialog.

## 11.9.0 - 18 December, 2024

* Remove experimental SPI from `StyleImage`.
* Promote ClipLayer to stable.
* Fix the encoding/decoding key for `Rain/centerThinning` and `Snow/centerThinning`.
* Update CoreMaps to 11.9.0 and Common to 24.9.0.

## 11.9.0-beta.1 - 9 December, 2024

* Add a new API to disable custom resizing implementation of the MapView. To disable the custom resizing implementation, set `MapView.resizingAnimation` to `.none`.
* Add `to-hsla` expression support.

## 11.9.0-beta.1
## 11.9.0-beta.1 - 28 November, 2024

⚠️⚠️⚠️ 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.
Expand Down
4 changes: 2 additions & 2 deletions LICENSE.md

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

8 changes: 4 additions & 4 deletions MapboxMaps.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |m|

maps_version = '11.9.0-rc.1'
maps_version = '11.9.0'

m.name = 'MapboxMaps'
m.version = maps_version
Expand All @@ -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.9.0-rc.1'
m.dependency 'MapboxCommon', '24.9.0-rc.1'
m.dependency 'Turf', '4.0.0-beta.1'
m.dependency 'MapboxCoreMaps', '11.9.0'
m.dependency 'MapboxCommon', '24.9.0'
m.dependency 'Turf', '4.0.0'

end
12 changes: 6 additions & 6 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,26 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/mapbox/mapbox-common-ios.git",
"state" : {
"revision" : "7231fe68dd707a8109f6d46ee698ef666b18b64f",
"version" : "24.9.0-rc.1"
"revision" : "480f648b20b87a3a55f30bb6d76d6dc7d8412ec4",
"version" : "24.9.0"
}
},
{
"identity" : "mapbox-core-maps-ios",
"kind" : "remoteSourceControl",
"location" : "https://github.com/mapbox/mapbox-core-maps-ios.git",
"state" : {
"revision" : "d815e2e13c08cce16bd9dba9349541578f5a34de",
"version" : "11.9.0-rc.1"
"revision" : "9fdb574d24d4a012a051d6a875e1c2753796de07",
"version" : "11.9.0"
}
},
{
"identity" : "turf-swift",
"kind" : "remoteSourceControl",
"location" : "https://github.com/mapbox/turf-swift.git",
"state" : {
"revision" : "f869ec2055ace4f95101b623a45f1506fa6f1503",
"version" : "4.0.0-beta.1"
"revision" : "bf840e6b9529d105687840fe2c9dcd74197d46d1",
"version" : "4.0.0"
}
}
],
Expand Down
6 changes: 3 additions & 3 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
import PackageDescription
import Foundation

let coreMaps = MapsDependency.coreMaps(version: "11.9.0-rc.1")
let coreMaps = MapsDependency.coreMaps(version: "11.9.0")

let common = MapsDependency.common(version: "24.9.0-rc.1")
let common = MapsDependency.common(version: "24.9.0")

let mapboxMapsPath: String? = nil

Expand All @@ -21,7 +21,7 @@ let package = Package(
targets: ["MapboxMaps"]),
],
dependencies: [
.package(url: "https://github.com/mapbox/turf-swift.git", exact: "4.0.0-beta.1"),
.package(url: "https://github.com/mapbox/turf-swift.git", exact: "4.0.0"),
] + coreMaps.packageDependencies + common.packageDependencies,
targets: [
.target(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
- ``StyleDecodable``
- ``StyleEncodable``
- ``StyleError``
- ``StyleImage``
- ``TypeConversionError``
- ``LightInfo``
- ``LightType``
Expand Down
2 changes: 1 addition & 1 deletion Sources/MapboxMaps/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
<key>CFBundleShortVersionString</key>
<string>11.9.0</string>
<key>CFBundleVersion</key>
<string>141</string>
<string>142</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion Sources/MapboxMaps/MapboxMaps.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version" : "11.9.0-rc.1"
"version" : "11.9.0"
}
17 changes: 3 additions & 14 deletions Sources/MapboxMaps/Style/Generated/Layers/ClipLayer.swift

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

6 changes: 3 additions & 3 deletions Sources/MapboxMaps/Style/Generated/Rain.swift

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

6 changes: 3 additions & 3 deletions Sources/MapboxMaps/Style/Generated/Snow.swift

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

3 changes: 1 addition & 2 deletions Sources/MapboxMaps/Style/Types/StyleImage.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import UIKit

@_spi(Experimental)
/// An image to be used in the Style
public struct StyleImage: Equatable, Sendable {

Expand Down Expand Up @@ -36,7 +35,7 @@ extension StyleImage: MapStyleContent, PrimitiveMapContent {

extension StyleImage {
/// Initialize a StyleImage from an existing UIImage
init?(named name: String, sdf: Bool = false, contentInsets: UIEdgeInsets = .zero) {
public init?(named name: String, sdf: Bool = false, contentInsets: UIEdgeInsets = .zero) {
guard let image = UIImage(named: name) else { return nil }
self.init(id: name, image: image, sdf: sdf, contentInsets: contentInsets)
}
Expand Down
6 changes: 3 additions & 3 deletions scripts/release/packager/versions.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"MapboxCoreMaps": "11.9.0-rc.1",
"MapboxCommon": "24.9.0-rc.1",
"Turf": "4.0.0-beta.1"
"MapboxCoreMaps": "11.9.0",
"MapboxCommon": "24.9.0",
"Turf": "4.0.0"
}

0 comments on commit e267bb4

Please sign in to comment.