From 5cb40e3fcf0f4934ffe927d18e631987120dad24 Mon Sep 17 00:00:00 2001 From: Aleksei Sapitskii <45671572+aleksproger@users.noreply.github.com> Date: Thu, 15 Feb 2024 16:48:23 +0200 Subject: [PATCH] Prepare release 11.2.0-rc.1 (#2034) * Bump versions, update changelog and license * Fix changelog --- .../xcshareddata/swiftpm/Package.resolved | 8 ++++---- CHANGELOG.md | 8 +++++++- LICENSE.md | 4 ++-- MapboxMaps.podspec | 6 +++--- Package.resolved | 8 ++++---- Package.swift | 4 ++-- Sources/MapboxMaps/Info.plist | 2 +- Sources/MapboxMaps/MapboxMaps.json | 2 +- scripts/release/packager/versions.json | 4 ++-- 9 files changed, 26 insertions(+), 20 deletions(-) diff --git a/Apps/Apps.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Apps/Apps.xcworkspace/xcshareddata/swiftpm/Package.resolved index 8cb2f9db37c0..687075ea88e0 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" : "f7804e860a7d99fac4aafda0bd790eee76150e6c", - "version" : "24.2.0-beta.1" + "revision" : "f082e51e09fc01bd0457e692807fffd2955fe12a", + "version" : "24.2.0-rc.2" } }, { @@ -23,8 +23,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mapbox/mapbox-core-maps-ios.git", "state" : { - "revision" : "6f1e56f01edb6145b9229f6eb4cd6c0557b647ac", - "version" : "11.2.0-beta.1" + "revision" : "cb02b9f9f2909b309e9f2374783ca090c1029c95", + "version" : "11.2.0-rc.1" } }, { diff --git a/CHANGELOG.md b/CHANGELOG.md index 23e24e750e7b..a072ec7bc66e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,12 +7,18 @@ Mapbox welcomes participation and contributions from everyone. * Add `onClusterTap` and `onClusterLongPress` to AnnotationManagers(UIKit) and AnnotationGroups(SwiftUI) which support clustering * Add annotations drag handlers callbacks `dragBeginHandler`, `dragChangeHandler`, `dragEndHandler` to all Annotation types. +## 11.2.0-rc.1 - 15 February, 2024 + +### Bug fixes 🐞 + +* Fix Map and encompassing List scroll at the same time +* visionOS small enhancements + ## 11.2.0-beta.1 - 1 February, 2024 ### Features ✨ and improvements 🏁 * vision OS support. 🚀 -* Vision OS support. 🚀 * Add easing curve parameter to `CameraAnimationsManager.fly(to:duration:curve:completion)`, make `TimingCurve` public with few more options. * Expose `MapboxMap.centerAltitudeMode` and ensure correct `centerAltitudeMode` on gesture ending. * Expose extra configuration methods for `MapboxMap`: `setNorthOrientation(_:)`, `setConstrainMode(_:)` and `setViewportMode(_:)`. diff --git a/LICENSE.md b/LICENSE.md index 65779ed34584..e756526c30ef 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ ## License -Mapbox Maps for iOS version 11.2.0-beta.1 +Mapbox Maps for iOS version 11.2.0-rc.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.2.0-beta.1,Mapbox ToS,Mapbox,https://www.mapbox.com/ +### MapboxCoreMaps,11.2.0-rc.1,Mapbox ToS,Mapbox,https://www.mapbox.com/ ``` Mapbox Core Maps version 10.0 diff --git a/MapboxMaps.podspec b/MapboxMaps.podspec index 02d237c89529..9b0102c61f1c 100644 --- a/MapboxMaps.podspec +++ b/MapboxMaps.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |m| - maps_version = '11.2.0-beta.1' + maps_version = '11.2.0-rc.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.2.0-beta.1' - m.dependency 'MapboxCommon', '24.2.0-beta.1' + m.dependency 'MapboxCoreMaps', '11.2.0-rc.1' + m.dependency 'MapboxCommon', '24.2.0-rc.2' m.dependency 'Turf', '2.8.0' end diff --git a/Package.resolved b/Package.resolved index a77633593b02..51def856b784 100644 --- a/Package.resolved +++ b/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mapbox/mapbox-common-ios.git", "state" : { - "revision" : "f7804e860a7d99fac4aafda0bd790eee76150e6c", - "version" : "24.2.0-beta.1" + "revision" : "f082e51e09fc01bd0457e692807fffd2955fe12a", + "version" : "24.2.0-rc.2" } }, { @@ -14,8 +14,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mapbox/mapbox-core-maps-ios.git", "state" : { - "revision" : "6f1e56f01edb6145b9229f6eb4cd6c0557b647ac", - "version" : "11.2.0-beta.1" + "revision" : "cb02b9f9f2909b309e9f2374783ca090c1029c95", + "version" : "11.2.0-rc.1" } }, { diff --git a/Package.swift b/Package.swift index 41e324ec4c55..88a155c289e3 100644 --- a/Package.swift +++ b/Package.swift @@ -4,8 +4,8 @@ import PackageDescription import Foundation -let coreMaps = MapsDependency.coreMaps(version: "11.2.0-beta.1") -let common = MapsDependency.common(version: "24.2.0-beta.1") +let coreMaps = MapsDependency.coreMaps(version: "11.2.0-rc.1") +let common = MapsDependency.common(version: "24.2.0-rc.2") let mapboxMapsPath: String? = nil diff --git a/Sources/MapboxMaps/Info.plist b/Sources/MapboxMaps/Info.plist index e542dbfdfe92..702df2f0fcf5 100644 --- a/Sources/MapboxMaps/Info.plist +++ b/Sources/MapboxMaps/Info.plist @@ -17,6 +17,6 @@ CFBundleShortVersionString 11.2.0 CFBundleVersion - 113 + 114 diff --git a/Sources/MapboxMaps/MapboxMaps.json b/Sources/MapboxMaps/MapboxMaps.json index 5d3cdbb5716f..8a5a4b3a5d0e 100644 --- a/Sources/MapboxMaps/MapboxMaps.json +++ b/Sources/MapboxMaps/MapboxMaps.json @@ -1,3 +1,3 @@ { - "version" : "11.2.0-beta.1" + "version" : "11.2.0-rc.1" } diff --git a/scripts/release/packager/versions.json b/scripts/release/packager/versions.json index d65972e665bd..6f67aed7ef5f 100644 --- a/scripts/release/packager/versions.json +++ b/scripts/release/packager/versions.json @@ -1,5 +1,5 @@ { - "MapboxCoreMaps": "11.2.0-beta.1", - "MapboxCommon": "24.2.0-beta.1", + "MapboxCoreMaps": "11.2.0-rc.1", + "MapboxCommon": "24.2.0-rc.2", "Turf": "2.8.0" }