Skip to content

Commit

Permalink
Prepare 10.10.2 (#1912)
Browse files Browse the repository at this point in the history
* Update CommonSDK to 23.2.3

* Update SDK version

* Update changelog

* Update submodules SSH key (#1854)

* Enable CircleCI contexts for shared environment variables (#1852)

* Use the latest v4 Slack Orb

* Add 'Slack Orb' context for each job

* MAPSIOS-556: Adopt shared context for CocoaPods trunk token

* MAPSIOS-558: Adopt shared context for Fastlane Match password

* MAPSIOS-557: Adopt shared context for SDK Registry token

* MAPSIOS-555: Adopt shared context for Apple credentials/ASC token

* Fix missing contexts, reuse CircleCI token (#1859)

* Enable GoogleCloud shared credentials (#1861)

* Add missing public mapbox token (#1863)

* Add Mapbox public token to unit tests (#1865)

* Move mapbox token to build unit tests (#1866)

* Add public Mapbox token to build unit test jobs

* Revert "Add Mapbox public token to unit tests (#1865)"

This reverts commit efba681.

* Try to fix podspec upload job
  • Loading branch information
OdNairy authored Feb 17, 2023
1 parent 862ca6e commit 0be655e
Show file tree
Hide file tree
Showing 10 changed files with 218 additions and 56 deletions.
245 changes: 201 additions & 44 deletions .circleci/config.yml

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions .fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ ENV["SPACESHIP_SKIP_2FA_UPGRADE"] = "1"
platform :ios do

lane :build_examples_tests do
app_store_connect_api_key
setup_circle_ci
sync_code_signing
update_code_signing_settings(
Expand Down
4 changes: 2 additions & 2 deletions Apps/Apps.xcworkspace/xcshareddata/swiftpm/Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"repositoryURL": "https://github.com/mapbox/mapbox-common-ios.git",
"state": {
"branch": null,
"revision": "82f54cb3717aadcc88cd5302112add73644844d8",
"version": "23.2.1"
"revision": "3160f782fcc9ec0db4e2d8e7629d4bb1c8d704b1",
"version": "23.2.3"
}
},
{
Expand Down
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@

Mapbox welcomes participation and contributions from everyone.

## 10.10.2 - February 17, 2023

- Update CommonSDK to v23.2.3. (https://github.com/mapbox/mapbox-maps-ios/pull/1912)

## 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

Expand Down
4 changes: 2 additions & 2 deletions MapboxMaps.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |m|

maps_version = '10.10.1'
maps_version = '10.10.2'

m.name = 'MapboxMaps'
m.version = maps_version
Expand All @@ -23,7 +23,7 @@ Pod::Spec.new do |m|

m.dependency 'MapboxCoreMaps', '10.10.0'
m.dependency 'MapboxMobileEvents', '1.0.10'
m.dependency 'MapboxCommon', '23.2.1'
m.dependency 'MapboxCommon', '23.2.3'
m.dependency 'Turf', '~> 2.0'

end
4 changes: 2 additions & 2 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"repositoryURL": "https://github.com/mapbox/mapbox-common-ios.git",
"state": {
"branch": null,
"revision": "82f54cb3717aadcc88cd5302112add73644844d8",
"version": "23.2.1"
"revision": "3160f782fcc9ec0db4e2d8e7629d4bb1c8d704b1",
"version": "23.2.3"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ let package = Package(
.package(name: "MapboxCoreMaps", url: "https://github.com/mapbox/mapbox-core-maps-ios.git", .exact("10.10.0")),
// 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.2.1")),
.package(name: "MapboxCommon", url: "https://github.com/mapbox/mapbox-common-ios.git", .exact("23.2.3")),
.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"))
],
Expand Down
4 changes: 2 additions & 2 deletions Sources/MapboxMaps/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>10.10.1</string>
<string>10.10.2</string>
<key>CFBundleVersion</key>
<string>60</string>
<string>61</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion Sources/MapboxMaps/MapboxMaps.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version" : "10.10.1"
"version" : "10.10.2"
}
2 changes: 1 addition & 1 deletion scripts/release/packager/versions.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"MapboxCoreMaps": "10.10.0",
"MapboxMobileEvents": "v1.0.10",
"MapboxCommon": "23.2.1",
"MapboxCommon": "23.2.3",
"Turf": "v2.6.1"
}

0 comments on commit 0be655e

Please sign in to comment.