From e267bb4abeae73b14be760bb5cd6b30756970db0 Mon Sep 17 00:00:00 2001 From: Roman Gardukevich Date: Wed, 18 Dec 2024 15:50:32 +0200 Subject: [PATCH] Cherry-pick for `11.9.0` release (#2394) Co-authored-by: Ivan Persidsky --- .../xcshareddata/swiftpm/Package.resolved | 12 ++++++------ CHANGELOG.md | 13 ++++++++++++- LICENSE.md | 4 ++-- MapboxMaps.podspec | 8 ++++---- Package.resolved | 12 ++++++------ Package.swift | 6 +++--- .../Documentation.docc/API Catalogs/Style.md | 1 + Sources/MapboxMaps/Info.plist | 2 +- Sources/MapboxMaps/MapboxMaps.json | 2 +- .../Style/Generated/Layers/ClipLayer.swift | 17 +++-------------- Sources/MapboxMaps/Style/Generated/Rain.swift | 6 +++--- Sources/MapboxMaps/Style/Generated/Snow.swift | 6 +++--- Sources/MapboxMaps/Style/Types/StyleImage.swift | 3 +-- scripts/release/packager/versions.json | 6 +++--- 14 files changed, 49 insertions(+), 49 deletions(-) diff --git a/Apps/Apps.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Apps/Apps.xcworkspace/xcshareddata/swiftpm/Package.resolved index ab1ad7684b4a..407265999957 100644 --- a/Apps/Apps.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Apps/Apps.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -14,8 +14,8 @@ "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" } }, { @@ -23,8 +23,8 @@ "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" } }, { @@ -32,8 +32,8 @@ "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" } } ], diff --git a/CHANGELOG.md b/CHANGELOG.md index 6fa85de97591..d88d75c2d628 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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. diff --git a/LICENSE.md b/LICENSE.md index 01eeb907c3d7..19fdc659cad8 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ ## License -Mapbox Maps for iOS version 11.9.0-rc.1 +Mapbox Maps for iOS version 11.9.0 Mapbox Maps iOS SDK Copyright © 2021 - 2024 Mapbox, Inc. All rights reserved. @@ -31,7 +31,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. --- -### MapboxCoreMaps,11.9.0-rc.1,Mapbox ToS,Mapbox,https://www.mapbox.com/ +### MapboxCoreMaps,11.9.0,Mapbox ToS,Mapbox,https://www.mapbox.com/ ``` Mapbox Core Maps version 11.0 diff --git a/MapboxMaps.podspec b/MapboxMaps.podspec index ee118741e711..d349b8003688 100644 --- a/MapboxMaps.podspec +++ b/MapboxMaps.podspec @@ -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 @@ -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 diff --git a/Package.resolved b/Package.resolved index 8bc14f29a4a0..784cdfbd8ed2 100644 --- a/Package.resolved +++ b/Package.resolved @@ -5,8 +5,8 @@ "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" } }, { @@ -14,8 +14,8 @@ "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" } }, { @@ -23,8 +23,8 @@ "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" } } ], diff --git a/Package.swift b/Package.swift index eecc362d4d75..9190cd33ad94 100644 --- a/Package.swift +++ b/Package.swift @@ -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 @@ -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( diff --git a/Sources/MapboxMaps/Documentation.docc/API Catalogs/Style.md b/Sources/MapboxMaps/Documentation.docc/API Catalogs/Style.md index e64afca2cb0f..074b55f9d6b7 100644 --- a/Sources/MapboxMaps/Documentation.docc/API Catalogs/Style.md +++ b/Sources/MapboxMaps/Documentation.docc/API Catalogs/Style.md @@ -15,6 +15,7 @@ - ``StyleDecodable`` - ``StyleEncodable`` - ``StyleError`` +- ``StyleImage`` - ``TypeConversionError`` - ``LightInfo`` - ``LightType`` diff --git a/Sources/MapboxMaps/Info.plist b/Sources/MapboxMaps/Info.plist index 010cd10d7933..1c0205e22fa1 100644 --- a/Sources/MapboxMaps/Info.plist +++ b/Sources/MapboxMaps/Info.plist @@ -17,6 +17,6 @@ CFBundleShortVersionString 11.9.0 CFBundleVersion - 141 + 142 diff --git a/Sources/MapboxMaps/MapboxMaps.json b/Sources/MapboxMaps/MapboxMaps.json index 87b5c95f5b80..cd180051971c 100644 --- a/Sources/MapboxMaps/MapboxMaps.json +++ b/Sources/MapboxMaps/MapboxMaps.json @@ -1,3 +1,3 @@ { - "version" : "11.9.0-rc.1" + "version" : "11.9.0" } diff --git a/Sources/MapboxMaps/Style/Generated/Layers/ClipLayer.swift b/Sources/MapboxMaps/Style/Generated/Layers/ClipLayer.swift index 46abb47a37c3..ac15548fe99f 100644 --- a/Sources/MapboxMaps/Style/Generated/Layers/ClipLayer.swift +++ b/Sources/MapboxMaps/Style/Generated/Layers/ClipLayer.swift @@ -4,62 +4,51 @@ import UIKit /// Layer that removes 3D content from map. /// /// - SeeAlso: [Mapbox Style Specification](https://www.mapbox.com/mapbox-gl-style-spec/#layers-clip) -@_documentation(visibility: public) -@_spi(Experimental) public struct ClipLayer: Layer, Equatable { +public struct ClipLayer: Layer, Equatable { // MARK: - Conformance to `Layer` protocol /// Unique layer name - @_documentation(visibility: public) public var id: String /// Rendering type of this layer. - @_documentation(visibility: public) public let type: LayerType /// An expression specifying conditions on source features. /// Only features that match the filter are displayed. - @_documentation(visibility: public) public var filter: Exp? /// Name of a source description to be used for this layer. /// Required for all layer types except ``BackgroundLayer``, ``SkyLayer``, and ``LocationIndicatorLayer``. - @_documentation(visibility: public) public var source: String? /// Layer to use from a vector tile source. /// /// Required for vector tile sources. /// Prohibited for all other source types, including GeoJSON sources. - @_documentation(visibility: public) public var sourceLayer: String? /// The slot this layer is assigned to. If specified, and a slot with that name exists, it will be placed at that position in the layer order. - @_documentation(visibility: public) public var slot: Slot? /// The minimum zoom level for the layer. At zoom levels less than the minzoom, the layer will be hidden. - @_documentation(visibility: public) public var minZoom: Double? /// The maximum zoom level for the layer. At zoom levels equal to or greater than the maxzoom, the layer will be hidden. - @_documentation(visibility: public) public var maxZoom: Double? /// Whether this layer is displayed. - @_documentation(visibility: public) public var visibility: Value /// Removes content from layers with the specified scope. By default all layers are affected. For example specifying `basemap` will only remove content from the Mapbox Standard style layers which have the same scope /// Default value: []. @_documentation(visibility: public) - public var clipLayerScope: Value<[String]>? + @_spi(Experimental) public var clipLayerScope: Value<[String]>? /// Layer types that will also be removed if fallen below this clip layer. /// Default value: []. @_documentation(visibility: public) - public var clipLayerTypes: Value<[ClipLayerTypes]>? + @_spi(Experimental) public var clipLayerTypes: Value<[ClipLayerTypes]>? - @_documentation(visibility: public) public init(id: String, source: String) { self.source = source self.id = id diff --git a/Sources/MapboxMaps/Style/Generated/Rain.swift b/Sources/MapboxMaps/Style/Generated/Rain.swift index f49efba717a9..e3bef4acae2b 100644 --- a/Sources/MapboxMaps/Style/Generated/Rain.swift +++ b/Sources/MapboxMaps/Style/Generated/Rain.swift @@ -19,7 +19,7 @@ public struct Rain: Codable, Equatable, StyleEncodable { @_spi(Experimental) public var centerThinning: Value? - /// Transition options for centerThinning + /// Transition options for center-thinning @_documentation(visibility: public) @_spi(Experimental) public var centerThinningTransition: StyleTransition? @@ -91,8 +91,8 @@ public struct Rain: Codable, Equatable, StyleEncodable { public var vignetteTransition: StyleTransition? public enum CodingKeys: String, CodingKey { - case centerThinning = "centerThinning" - case centerThinningTransition = "centerThinning-transition" + case centerThinning = "center-thinning" + case centerThinningTransition = "center-thinning-transition" case color = "color" case colorTransition = "color-transition" case density = "density" diff --git a/Sources/MapboxMaps/Style/Generated/Snow.swift b/Sources/MapboxMaps/Style/Generated/Snow.swift index 0f98f440a639..283a4f2dea27 100644 --- a/Sources/MapboxMaps/Style/Generated/Snow.swift +++ b/Sources/MapboxMaps/Style/Generated/Snow.swift @@ -19,7 +19,7 @@ public struct Snow: Codable, Equatable, StyleEncodable { @_spi(Experimental) public var centerThinning: Value? - /// Transition options for centerThinning + /// Transition options for center-thinning @_documentation(visibility: public) @_spi(Experimental) public var centerThinningTransition: StyleTransition? @@ -91,8 +91,8 @@ public struct Snow: Codable, Equatable, StyleEncodable { public var vignetteTransition: StyleTransition? public enum CodingKeys: String, CodingKey { - case centerThinning = "centerThinning" - case centerThinningTransition = "centerThinning-transition" + case centerThinning = "center-thinning" + case centerThinningTransition = "center-thinning-transition" case color = "color" case colorTransition = "color-transition" case density = "density" diff --git a/Sources/MapboxMaps/Style/Types/StyleImage.swift b/Sources/MapboxMaps/Style/Types/StyleImage.swift index dee12ecf1cba..b6939d413808 100644 --- a/Sources/MapboxMaps/Style/Types/StyleImage.swift +++ b/Sources/MapboxMaps/Style/Types/StyleImage.swift @@ -1,6 +1,5 @@ import UIKit -@_spi(Experimental) /// An image to be used in the Style public struct StyleImage: Equatable, Sendable { @@ -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) } diff --git a/scripts/release/packager/versions.json b/scripts/release/packager/versions.json index 87de21fb2149..a0355c0841ca 100644 --- a/scripts/release/packager/versions.json +++ b/scripts/release/packager/versions.json @@ -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" }