From f6fd82d06d835c42649c1d69e9a4c50d3f8d951b Mon Sep 17 00:00:00 2001 From: Roman Gardukevich Date: Wed, 23 Aug 2023 12:07:33 +0300 Subject: [PATCH] [10.16] Update versions (#1761) * Update Common, CoreMaps and version label * Add 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, 25 insertions(+), 21 deletions(-) diff --git a/Apps/Apps.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Apps/Apps.xcworkspace/xcshareddata/swiftpm/Package.resolved index 893212d456cf..304240a575bb 100644 --- a/Apps/Apps.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Apps/Apps.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/mapbox/mapbox-common-ios.git", "state": { "branch": null, - "revision": "f285346249993928f1b4b3ad149ce4a22e83b964", - "version": "23.8.0-beta.1" + "revision": "914d9e9c258e036b6758c4b4cf8ef39bc5058f48", + "version": "23.8.0-rc.2" } }, { @@ -24,8 +24,8 @@ "repositoryURL": "https://github.com/mapbox/mapbox-core-maps-ios.git", "state": { "branch": null, - "revision": "6d39335dcb53899828120d39ad54a506a18fff53", - "version": "10.16.0-beta.1" + "revision": "c1e3b2d777ab02fcbee43aeaa04398cb7582b0c5", + "version": "10.16.0-rc.2" } }, { diff --git a/CHANGELOG.md b/CHANGELOG.md index b7192950ca11..5e308dce3140 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,10 +4,14 @@ Mapbox welcomes participation and contributions from everyone. ## main -## 10.16.0-beta.1 - Aug 9, 2023 +## 10.16.0-rc.1 - August 23, 2023 -* Update MapboxCoreMaps to 10.16.0-beta.1 and MapboxCommon to 23.8.0-beta.1. * Add privacy policy attribution dialog action. +* Update MapboxCoreMaps to 10.16.0-rc.2 and MapboxCommon to 23.8.0-rc.2. + +## 10.16.0-beta.1 - August 9, 2023 + +* Update MapboxCoreMaps to 10.16.0-beta.1 and MapboxCommon to 23.8.0-beta.1. ## 10.15.0-rc.1 - July 13, 2023 diff --git a/LICENSE.md b/LICENSE.md index 6d5308b8829e..6cf14b0ce3f8 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ ## License -Mapbox Maps for iOS version 10.16.0-beta.1 +Mapbox Maps for iOS version 10.16.0-rc.1 Mapbox Maps iOS SDK Copyright © 2021 - 2023 Mapbox, Inc. All rights reserved. @@ -31,7 +31,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. --- -### MapboxCoreMaps,10.16.0-beta.1,Mapbox ToS,Mapbox,https://www.mapbox.com/ +### MapboxCoreMaps,10.16.0-rc.2,Mapbox ToS,Mapbox,https://www.mapbox.com/ ``` Mapbox Core Maps version 10.0 diff --git a/MapboxMaps.podspec b/MapboxMaps.podspec index e23dd9735d40..7524ccd1395f 100644 --- a/MapboxMaps.podspec +++ b/MapboxMaps.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |m| - maps_version = '10.16.0-beta.1' + maps_version = '10.16.0-rc.1' m.name = 'MapboxMaps' m.version = maps_version @@ -25,9 +25,9 @@ Pod::Spec.new do |m| # TODO: remove after Cocoapods 1.12 is released m.pod_target_xcconfig = { 'CODE_SIGNING_ALLOWED' => 'NO' } - m.dependency 'MapboxCoreMaps', '10.16.0-beta.1' + m.dependency 'MapboxCoreMaps', '10.16.0-rc.2' m.dependency 'MapboxMobileEvents', '1.0.10' - m.dependency 'MapboxCommon', '23.8.0-beta.1' + m.dependency 'MapboxCommon', '23.8.0-rc.2' m.dependency 'Turf', '~> 2.0' end diff --git a/Package.resolved b/Package.resolved index 893212d456cf..304240a575bb 100644 --- a/Package.resolved +++ b/Package.resolved @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/mapbox/mapbox-common-ios.git", "state": { "branch": null, - "revision": "f285346249993928f1b4b3ad149ce4a22e83b964", - "version": "23.8.0-beta.1" + "revision": "914d9e9c258e036b6758c4b4cf8ef39bc5058f48", + "version": "23.8.0-rc.2" } }, { @@ -24,8 +24,8 @@ "repositoryURL": "https://github.com/mapbox/mapbox-core-maps-ios.git", "state": { "branch": null, - "revision": "6d39335dcb53899828120d39ad54a506a18fff53", - "version": "10.16.0-beta.1" + "revision": "c1e3b2d777ab02fcbee43aeaa04398cb7582b0c5", + "version": "10.16.0-rc.2" } }, { diff --git a/Package.swift b/Package.swift index 8b0cf19f3bca..ce724d95b9d3 100644 --- a/Package.swift +++ b/Package.swift @@ -13,10 +13,10 @@ let package = Package( targets: ["MapboxMaps"]), ], dependencies: [ - .package(name: "MapboxCoreMaps", url: "https://github.com/mapbox/mapbox-core-maps-ios.git", .exact("10.16.0-beta.1")), + .package(name: "MapboxCoreMaps", url: "https://github.com/mapbox/mapbox-core-maps-ios.git", .exact("10.16.0-rc.2")), // We keep MME dependency for compatibility reasons .package(name: "MapboxMobileEvents", url: "https://github.com/mapbox/mapbox-events-ios.git", .exact("1.0.10")), - .package(name: "MapboxCommon", url: "https://github.com/mapbox/mapbox-common-ios.git", .exact("23.8.0-beta.1")), + .package(name: "MapboxCommon", url: "https://github.com/mapbox/mapbox-common-ios.git", .exact("23.8.0-rc.2")), .package(name: "Turf", url: "https://github.com/mapbox/turf-swift.git", from: "2.0.0"), .package(name: "CocoaImageHashing", url: "https://github.com/ameingast/cocoaimagehashing", .exact("1.9.0")) ], diff --git a/Sources/MapboxMaps/Info.plist b/Sources/MapboxMaps/Info.plist index 296691087a96..1da75b6223d8 100644 --- a/Sources/MapboxMaps/Info.plist +++ b/Sources/MapboxMaps/Info.plist @@ -17,6 +17,6 @@ CFBundleShortVersionString 10.16.0 CFBundleVersion - 78 + 79 diff --git a/Sources/MapboxMaps/MapboxMaps.json b/Sources/MapboxMaps/MapboxMaps.json index 9fbcb425bd4e..d3cb7437265e 100644 --- a/Sources/MapboxMaps/MapboxMaps.json +++ b/Sources/MapboxMaps/MapboxMaps.json @@ -1,3 +1,3 @@ { - "version" : "10.16.0-beta.1" + "version" : "10.16.0-rc.1" } diff --git a/scripts/release/packager/versions.json b/scripts/release/packager/versions.json index bc73b8fe849e..f7f24690294a 100644 --- a/scripts/release/packager/versions.json +++ b/scripts/release/packager/versions.json @@ -1,6 +1,6 @@ { - "MapboxCoreMaps": "10.16.0-beta.1", + "MapboxCoreMaps": "10.16.0-rc.2", "MapboxMobileEvents": "v1.0.10", - "MapboxCommon": "23.8.0-beta.1", + "MapboxCommon": "23.8.0-rc.2", "Turf": "v2.6.1" }