From f111b00aa5ef584a03827b3677597738c00c488e Mon Sep 17 00:00:00 2001 From: Roman Gardukevich Date: Wed, 25 Jan 2023 17:45:55 +0200 Subject: [PATCH] Update Maps versions (#1875) * Update CoreMaps and Common * Update license * Update changelog --- .../xcshareddata/swiftpm/Package.resolved | 8 ++++---- CHANGELOG.md | 3 ++- LICENSE.md | 3 +-- MapboxMaps.podspec | 4 ++-- Package.resolved | 8 ++++---- Package.swift | 4 ++-- scripts/release/packager/versions.json | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Apps/Apps.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Apps/Apps.xcworkspace/xcshareddata/swiftpm/Package.resolved index 9d62454a265..7767c27cd91 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": "d6e7b7d8df0ec523eb63412daf2f2fa4f58e0a55", - "version": "23.3.0-beta.1" + "revision": "775d6d749821f41ab25798eeaad1089ae250fd4c", + "version": "23.3.0-rc.1" } }, { @@ -24,8 +24,8 @@ "repositoryURL": "https://github.com/mapbox/mapbox-core-maps-ios.git", "state": { "branch": null, - "revision": "439dc92d71ee10f7fb6c3ca89468586c65bb5108", - "version": "10.11.0-beta.1" + "revision": "d16dc2b0a053611b81b3b2ce4052a8662f849d72", + "version": "10.11.0-rc.1" } }, { diff --git a/CHANGELOG.md b/CHANGELOG.md index fcbf056f5d4..d7b60649957 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ Mapbox welcomes participation and contributions from everyone. * Improve stability of attribution parsing. ([#1849](https://github.com/mapbox/mapbox-maps-ios/pull/1849)) * Enable `Expression` to be created without an operator so `clusterProperties` can support advanced use cases. ([#1855](https://github.com/mapbox/mapbox-maps-ios/pull/1855)) +* Update CoreMaps `10.11.0-rc.1` and CommonSDK `23.3.0-rc.1`. ([#1856](https://github.com/mapbox/mapbox-maps-ios/pull/1875)) ## 10.11.0-beta.1 - January 12, 2023 @@ -22,7 +23,7 @@ Mapbox welcomes participation and contributions from everyone. ## 10.10.1 - December 20, 2022 -* [CarPlay] Fix map view permanently pausing when moving to window on foreground ([#1808])(https://github.com/mapbox/mapbox-maps-ios/pull/1808) +* [CarPlay] Fix map view permanently pausing when moving to window on foreground ([#1808](https://github.com/mapbox/mapbox-maps-ios/pull/1808)) ## 10.10.0 - December 8, 2022 diff --git a/LICENSE.md b/LICENSE.md index e1d26ef8274..41722897957 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -10,7 +10,7 @@ The software and files in this repository (collectively, “Software”) are lic ## Acknowledgements This application makes use of the following third party libraries: -### MapboxCoreMaps,10.11.0-beta.1,Mapbox ToS,Mapbox,https://www.mapbox.com/ +### MapboxCoreMaps,10.11.0-rc.1,Mapbox ToS,Mapbox,https://www.mapbox.com/ ``` Mapbox Core Maps version 10.0 @@ -1424,4 +1424,3 @@ All other rights reserved. ``` --- - diff --git a/MapboxMaps.podspec b/MapboxMaps.podspec index 01642f8c32d..86d9f3c3582 100644 --- a/MapboxMaps.podspec +++ b/MapboxMaps.podspec @@ -21,9 +21,9 @@ Pod::Spec.new do |m| m.source_files = 'Sources/MapboxMaps/**/*.{swift,h}' m.resources = ['Sources/**/*.{xcassets,strings}', 'Sources/MapboxMaps/MapboxMaps.json'] - m.dependency 'MapboxCoreMaps', '10.11.0-beta.1' + m.dependency 'MapboxCoreMaps', '10.11.0-rc.1' m.dependency 'MapboxMobileEvents', '1.0.10' - m.dependency 'MapboxCommon', '23.3.0-beta.1' + m.dependency 'MapboxCommon', '23.3.0-rc.1' m.dependency 'Turf', '~> 2.0' end diff --git a/Package.resolved b/Package.resolved index 9d62454a265..7767c27cd91 100644 --- a/Package.resolved +++ b/Package.resolved @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/mapbox/mapbox-common-ios.git", "state": { "branch": null, - "revision": "d6e7b7d8df0ec523eb63412daf2f2fa4f58e0a55", - "version": "23.3.0-beta.1" + "revision": "775d6d749821f41ab25798eeaad1089ae250fd4c", + "version": "23.3.0-rc.1" } }, { @@ -24,8 +24,8 @@ "repositoryURL": "https://github.com/mapbox/mapbox-core-maps-ios.git", "state": { "branch": null, - "revision": "439dc92d71ee10f7fb6c3ca89468586c65bb5108", - "version": "10.11.0-beta.1" + "revision": "d16dc2b0a053611b81b3b2ce4052a8662f849d72", + "version": "10.11.0-rc.1" } }, { diff --git a/Package.swift b/Package.swift index cc458a46762..1f1a76f06a4 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.11.0-beta.1")), + .package(name: "MapboxCoreMaps", url: "https://github.com/mapbox/mapbox-core-maps-ios.git", .exact("10.11.0-rc.1")), // 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.3.0-beta.1")), + .package(name: "MapboxCommon", url: "https://github.com/mapbox/mapbox-common-ios.git", .exact("23.3.0-rc.1")), .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/scripts/release/packager/versions.json b/scripts/release/packager/versions.json index 6ab405cb12c..885e51662d6 100644 --- a/scripts/release/packager/versions.json +++ b/scripts/release/packager/versions.json @@ -1,6 +1,6 @@ { - "MapboxCoreMaps": "10.11.0-beta.1", + "MapboxCoreMaps": "10.11.0-rc.1", "MapboxMobileEvents": "v1.0.10", - "MapboxCommon": "23.3.0-beta.1", + "MapboxCommon": "23.3.0-rc.1", "Turf": "v2.6.1" }