From 32bb4e4766b7434dcf0f50fd6728aa5765faa5b9 Mon Sep 17 00:00:00 2001 From: Patrick Leonard Date: Wed, 24 Apr 2024 16:31:45 -0400 Subject: [PATCH] Update versions, license, changelog (#2126) --- .../xcshareddata/swiftpm/Package.resolved | 8 ++++---- CHANGELOG.md | 13 +++++++++---- LICENSE.md | 4 ++-- MapboxMaps.podspec | 6 +++--- Package.resolved | 13 +++++++++++-- Package.swift | 4 ++-- Sources/MapboxMaps/Info.plist | 4 ++-- Sources/MapboxMaps/MapboxMaps.json | 2 +- scripts/release/packager/versions.json | 4 ++-- 9 files changed, 36 insertions(+), 22 deletions(-) diff --git a/Apps/Apps.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Apps/Apps.xcworkspace/xcshareddata/swiftpm/Package.resolved index da904d40339..bd80e47561c 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" : "15aed0b292a0fe0672113c1b69be04bd350c8bb3", - "version" : "24.3.1" + "revision" : "2db19ddde415b79f35de497240cd6ba563416657", + "version" : "24.4.0-beta.1" } }, { @@ -23,8 +23,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mapbox/mapbox-core-maps-ios.git", "state" : { - "revision" : "3638d2841f8a2ef6a995c659457d6133a6f0d1be", - "version" : "11.3.0" + "revision" : "40da10b7dd365ef2350a35ccb5abefe726a0761c", + "version" : "11.4.0-beta.1" } }, { diff --git a/CHANGELOG.md b/CHANGELOG.md index 15a2271d4d3..e51ec944ece 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ Mapbox welcomes participation and contributions from everyone. ## main +## 11.4.0-beta.1 - 24 April, 2024 + +⚠️⚠️⚠️ Known Issues ⚠️⚠️⚠️ +* In v11.4.0-beta.1, setting a `RasterLayer`’s `rasterColor` property with an expression will block the layer from rendering. This issue will be resolved in v11.4.0-rc.1. + ### Experimental API breaking changes ⚠️ In this release, we introduce the new [Declarative Styling API](https://docs.tilestream.net/ios/maps/api/latest/documentation/mapboxmaps/declarative-map-styling) for UIKit and SwiftUI. This change is based on `MapContent` introduced for SwiftUI; therefore, it has been restructured. The changes are compatible; however, in some rare cases, you may need to adjust your code. @@ -80,12 +85,12 @@ mapView.mapboxMap.setMapStyleContent { // Bearing animator has started. }.store(in: &cancelables) ``` -* Allow to add slots at runtime. -* Expose API to interact with styile imports using Declarative Styling and regular imperative API. +* Allow adding slots at runtime. +* Expose API to interact with style imports using Declarative Styling and regular imperative API. * Expose `StyleImport` for declarative styling as `MapStyleContent`. * Expose `removeStyleImport`, `moveStyleImport`, `updateStyleImport`, `addStyleImport` methods on `StyleManager` -* Allow to assign layerPosition to 2D and 3D location indicators in imperative API. -* Make Puck2D and Puck3D to be positioned according to relative layer positon in declarative API instead of always top-most position. +* Allow assigning layerPosition to 2D and 3D location indicators in imperative API. +* Make Puck2D and Puck3D to be positioned according to relative layer position in declarative API instead of always top-most position. * Add codesign for XCFrameworks. * `MapboxMap.loadStyle()` and `Snapshotter.loadStyle()` now correctly call the `completion` closure. diff --git a/LICENSE.md b/LICENSE.md index 417bde7d384..c808071e39c 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ ## License -Mapbox Maps for iOS version 11.3.0 +Mapbox Maps for iOS version 11.4.0-beta.1 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.3.0,Mapbox ToS,Mapbox,https://www.mapbox.com/ +### MapboxCoreMaps,11.4.0-beta.1,Mapbox ToS,Mapbox,https://www.mapbox.com/ ``` Mapbox Core Maps version 10.0 diff --git a/MapboxMaps.podspec b/MapboxMaps.podspec index 0290b411e75..68004abcba3 100644 --- a/MapboxMaps.podspec +++ b/MapboxMaps.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |m| - maps_version = '11.3.0' + maps_version = '11.4.0-beta.1' 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.4.0-SNAPSHOT.0422T0943Z.e5a8c75' - m.dependency 'MapboxCommon', '24.3.1' + m.dependency 'MapboxCoreMaps', '11.4.0-beta.1' + m.dependency 'MapboxCommon', '24.4.0-beta.1' m.dependency 'Turf', '2.8.0' end diff --git a/Package.resolved b/Package.resolved index fd736c349b6..a315bfd7a99 100644 --- a/Package.resolved +++ b/Package.resolved @@ -5,8 +5,17 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mapbox/mapbox-common-ios.git", "state" : { - "revision" : "15aed0b292a0fe0672113c1b69be04bd350c8bb3", - "version" : "24.3.1" + "revision" : "2db19ddde415b79f35de497240cd6ba563416657", + "version" : "24.4.0-beta.1" + } + }, + { + "identity" : "mapbox-core-maps-ios", + "kind" : "remoteSourceControl", + "location" : "https://github.com/mapbox/mapbox-core-maps-ios.git", + "state" : { + "revision" : "40da10b7dd365ef2350a35ccb5abefe726a0761c", + "version" : "11.4.0-beta.1" } }, { diff --git a/Package.swift b/Package.swift index bb3aee8cb23..2ed617c2877 100644 --- a/Package.swift +++ b/Package.swift @@ -4,8 +4,8 @@ import PackageDescription import Foundation -let coreMaps = MapsDependency.coreMaps(version: "11.4.0-SNAPSHOT.0422T0943Z.e5a8c75", checksum: "feb71b4e2d1d1da16fdf994fddbf2daf2eed92afad8047795fd10b5ce8a0f575") -let common = MapsDependency.common(version: "24.3.1") +let coreMaps = MapsDependency.coreMaps(version: "11.4.0-beta.1") +let common = MapsDependency.common(version: "24.4.0-beta.1") let mapboxMapsPath: String? = nil diff --git a/Sources/MapboxMaps/Info.plist b/Sources/MapboxMaps/Info.plist index 3ee1ac7a3fa..1a5fa1d6d12 100644 --- a/Sources/MapboxMaps/Info.plist +++ b/Sources/MapboxMaps/Info.plist @@ -15,8 +15,8 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 11.3.0 + 11.4.0 CFBundleVersion - 119 + 120 diff --git a/Sources/MapboxMaps/MapboxMaps.json b/Sources/MapboxMaps/MapboxMaps.json index 539efe730dd..00359099d0b 100644 --- a/Sources/MapboxMaps/MapboxMaps.json +++ b/Sources/MapboxMaps/MapboxMaps.json @@ -1,3 +1,3 @@ { - "version" : "11.3.0" + "version" : "11.4.0-beta.1" } diff --git a/scripts/release/packager/versions.json b/scripts/release/packager/versions.json index a267ae67f5e..312f8cdb9fa 100644 --- a/scripts/release/packager/versions.json +++ b/scripts/release/packager/versions.json @@ -1,5 +1,5 @@ { - "MapboxCoreMaps": "11.4.0-SNAPSHOT.0422T0943Z.e5a8c75", - "MapboxCommon": "24.3.1", + "MapboxCoreMaps": "11.4.0-beta.1", + "MapboxCommon": "24.4.0-beta.1", "Turf": "2.8.0" }