[release/v11.1] Update versions, cherry-picks (#1986)

* Make padding optional in `cameraForCoordinateBounds` (#1978) * Make padding optional in `cameraForCoordinateBounds` and `cameraForCoordinates` * Add changelog entry * Update API breakage allowlist * Add missing dependencies to DebugApp (#1983) * Add missing dependencies to DebugApp * Make MAPBOXMAPS_PATH project-specific, not target-specific as it's redundant * Remove redundant artifacts (#1969) * Update release readme maps version * Remove xcodebuild log generated by a wrapper * Update SDK version to 11.1.0 * Update CoreMaps/Common * Changelog * Update license --------- Co-authored-by: Roman Laitarenko <[email protected]> Co-authored-by: Aleksei Sapitskii <[email protected]>
mapbox · Jan 17, 2024 · 3fa9b66 · 3fa9b66
1 parent 61801f1
commit 3fa9b66
Show file tree

Hide file tree

Showing 15 changed files with 35 additions and 29 deletions.
diff --git a/Apps/Apps.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Apps/Apps.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -14,17 +14,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/mapbox/mapbox-common-ios.git",
       "state" : {
-        "revision" : "660cc68685c4ca551cc2815ab3607d54d906c8a7",
-        "version" : "24.1.0-rc.1"
+        "revision" : "6ed3e33b51d3e3162843885f6914d7fb175609c6",
+        "version" : "24.1.0"
       }
     },
     {
       "identity" : "mapbox-core-maps-ios",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/mapbox/mapbox-core-maps-ios.git",
       "state" : {
-        "revision" : "8b3d2e9bf0886995cd6c05f39f7a5ac4691d0fc9",
-        "version" : "11.1.0-rc.1"
+        "revision" : "d9cdf51cf4b897811a5c5d5135d3c772830e2b7c",
+        "version" : "11.1.0"
       }
     },
     {

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,10 +2,12 @@
 
 Mapbox welcomes participation and contributions from everyone.
 
-## main
+## 11.1.0 - 17 January, 2024
 
 * Add `customData` field in Annotaion and deprecate `userInfo`. `userInfo` behaviour rolled back to v10 behaviour.
 * Fixed a bug where the attribution dialog does not appear when there is a presented view controller.
+* Make padding optional in `MapboxMap.camera(for:padding:bearing:pitch:maxZoom:offset:)` and `MapboxMap.camera(for:padding:bearing:pitch:)`.
+* Update CoreMaps to 11.1.0 and Common to 24.1.0
 
 ## 11.1.0-rc.1 - 04 January, 2024
 

diff --git a/LICENSE.md b/LICENSE.md
diff --git a/MapboxMaps.podspec b/MapboxMaps.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |m|
 
-  maps_version = '11.1.0-rc.1'
+  maps_version = '11.1.0'
 
   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.1.0-rc.1'
-  m.dependency 'MapboxCommon', '24.1.0-rc.1'
+  m.dependency 'MapboxCoreMaps', '11.1.0'
+  m.dependency 'MapboxCommon', '24.1.0'
   m.dependency 'Turf', '2.7.0'
 
 end
diff --git a/Package.resolved b/Package.resolved
@@ -5,17 +5,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/mapbox/mapbox-common-ios.git",
       "state" : {
-        "revision" : "660cc68685c4ca551cc2815ab3607d54d906c8a7",
-        "version" : "24.1.0-rc.1"
+        "revision" : "6ed3e33b51d3e3162843885f6914d7fb175609c6",
+        "version" : "24.1.0"
       }
     },
     {
       "identity" : "mapbox-core-maps-ios",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/mapbox/mapbox-core-maps-ios.git",
       "state" : {
-        "revision" : "8b3d2e9bf0886995cd6c05f39f7a5ac4691d0fc9",
-        "version" : "11.1.0-rc.1"
+        "revision" : "d9cdf51cf4b897811a5c5d5135d3c772830e2b7c",
+        "version" : "11.1.0"
       }
     },
     {

diff --git a/Package.swift b/Package.swift
@@ -3,9 +3,9 @@
 
 import PackageDescription
 
-let coreMaps = MapsDependency.coreMaps(version: "11.1.0-rc.1")
+let coreMaps = MapsDependency.coreMaps(version: "11.1.0")
 
-let common = MapsDependency.common(version: "24.1.0-rc.1")
+let common = MapsDependency.common(version: "24.1.0")
 
 let mapboxMapsPath: String? = nil
 

diff --git a/Sources/MapboxMaps/Foundation/MapboxMap.swift b/Sources/MapboxMaps/Foundation/MapboxMap.swift
@@ -30,7 +30,7 @@ protocol MapboxMapProtocol: AnyObject {
     func pointIsAboveHorizon(_ point: CGPoint) -> Bool
     // swiftlint:disable:next function_parameter_count
     func camera(for coordinateBounds: CoordinateBounds,
-                padding: UIEdgeInsets,
+                padding: UIEdgeInsets?,
                 bearing: Double?,
                 pitch: Double?,
                 maxZoom: Double?,
@@ -436,15 +436,15 @@ public final class MapboxMap: StyleManager {
     ///   - offset: The center of the given bounds relative to the map's center, measured in points.
     /// - Returns: A `CameraOptions` that fits the provided constraints
     public func camera(for coordinateBounds: CoordinateBounds, // swiftlint:disable:this function_parameter_count
-                       padding: UIEdgeInsets,
+                       padding: UIEdgeInsets?,
                        bearing: Double?,
                        pitch: Double?,
                        maxZoom: Double?,
                        offset: CGPoint?) -> CameraOptions {
         return CameraOptions(
             __map.cameraForCoordinateBounds(
                 for: coordinateBounds,
-                padding: padding.toMBXEdgeInsetsValue(),
+                padding: padding?.toMBXEdgeInsetsValue(),
                 bearing: bearing?.NSNumber,
                 pitch: pitch?.NSNumber,
                 maxZoom: maxZoom?.NSNumber,

diff --git a/Sources/MapboxMaps/Info.plist b/Sources/MapboxMaps/Info.plist
@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>11.1.0</string>
 	<key>CFBundleVersion</key>
-	<string>111</string>
+	<string>112</string>
 </dict>
 </plist>
diff --git a/Sources/MapboxMaps/MapboxMaps.json b/Sources/MapboxMaps/MapboxMaps.json
@@ -1,3 +1,3 @@
 {
-    "version" : "11.1.0-rc.1"
+    "version" : "11.1.0"
 }
diff --git a/Tests/MapboxMapsTests/Foundation/Mocks/MockMapboxMap.swift b/Tests/MapboxMapsTests/Foundation/Mocks/MockMapboxMap.swift
@@ -124,15 +124,15 @@ final class MockMapboxMap: MapboxMapProtocol {
 
     struct CameraForCoordinateBoundsParams {
         var coordinateBounds: CoordinateBounds
-        var padding: UIEdgeInsets
+        var padding: UIEdgeInsets?
         var bearing: Double?
         var pitch: Double?
         var maxZoom: Double?
         var offset: CGPoint?
     }
     let cameraForCoordinateBoundsStub = Stub<CameraForCoordinateBoundsParams, MapboxMaps.CameraOptions>(defaultReturnValue: .random())
     // swiftlint:disable:next function_parameter_count
-    func camera(for coordinateBounds: CoordinateBounds, padding: UIEdgeInsets, bearing: Double?, pitch: Double?, maxZoom: Double?, offset: CGPoint?) -> MapboxMaps.CameraOptions {
+    func camera(for coordinateBounds: CoordinateBounds, padding: UIEdgeInsets?, bearing: Double?, pitch: Double?, maxZoom: Double?, offset: CGPoint?) -> MapboxMaps.CameraOptions {
         cameraForCoordinateBoundsStub.call(with: .init(coordinateBounds: coordinateBounds, padding: padding, bearing: bearing, pitch: pitch, maxZoom: maxZoom, offset: offset))
     }
 

diff --git a/scripts/api-compatibility-check/breakage_allowlist.txt b/scripts/api-compatibility-check/breakage_allowlist.txt
@@ -1315,3 +1315,6 @@ Var ModelLayer.slot has declared type change from Swift.String? to MapboxMaps.Sl
 Var RasterLayer.slot has declared type change from Swift.String? to MapboxMaps.Slot?
 Var SkyLayer.slot has declared type change from Swift.String? to MapboxMaps.Slot?
 Var SymbolLayer.slot has declared type change from Swift.String? to MapboxMaps.Slot?
+
+// Optional padding in camera for coordinate bounds
+Func MapboxMap.camera(for:padding:bearing:pitch:maxZoom:offset:) has parameter 1 type change from UIKit.UIEdgeInsets to UIKit.UIEdgeInsets?
diff --git a/scripts/release/README-dynamic.md b/scripts/release/README-dynamic.md
@@ -1,4 +1,4 @@
-# Mapbox Maps SDK v10 for iOS
+# Mapbox Maps SDK v11 for iOS
 
 ## Xcode Installation Instructions
 
@@ -17,5 +17,5 @@
 
 4. Add `import MapboxMaps` to your Swift source file.
 
-5. Please see the [Migration Guide](https://docs.mapbox.com/ios/maps/guides/migrate-to-v10/)
+5. Please see the [Migration Guide](https://docs.mapbox.com/ios/maps/guides/migrate-to-v11/)
    for further guidelines.
diff --git a/scripts/release/README-static.md b/scripts/release/README-static.md
@@ -1,4 +1,4 @@
-# Mapbox Maps SDK v10 for iOS
+# Mapbox Maps SDK v11 for iOS
 
 ## Xcode Installation Instructions
 
@@ -27,5 +27,5 @@
 
 6. Add `import MapboxMaps` to your Swift source file.
 
-7. Please see the [Migration Guide](https://docs.mapbox.com/ios/maps/guides/migrate-to-v10/)
+7. Please see the [Migration Guide](https://docs.mapbox.com/ios/maps/guides/migrate-to-v11/)
    for further guidelines.
diff --git a/scripts/release/packager/create-xcframework.sh b/scripts/release/packager/create-xcframework.sh
@@ -113,6 +113,7 @@ done
 
 echo "$BUILD_XCFRAMEWORK_COMMAND"
 eval "$BUILD_XCFRAMEWORK_COMMAND"
+rm -f xcodebuild.log # Remove build log that generated on the CI with xcodebuild wrapper
 
 # Clean Up
 step "Cleaning up intermediate artifacts for $PRODUCT"

diff --git a/scripts/release/packager/versions.json b/scripts/release/packager/versions.json
@@ -1,5 +1,5 @@
 {
-    "MapboxCoreMaps": "11.1.0-rc.1",
-    "MapboxCommon": "24.1.0-rc.1",
+    "MapboxCoreMaps": "11.1.0",
+    "MapboxCommon": "24.1.0",
     "Turf": "2.7.0"
 }