Merge branch 'main' into feature/style-dsl

Apps/Apps.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -14,17 +14,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/mapbox/mapbox-common-ios.git",
       "state" : {
-        "revision" : "0ee31944d6df0f61f944d980431362b9c5186a15",
-        "version" : "24.3.0-beta.1"
+        "revision" : "2af5c688a58d8019af1376a0a76f505a5f36a27b",
+        "version" : "24.3.0-rc.1"
       }
     },
     {
       "identity" : "mapbox-core-maps-ios",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/mapbox/mapbox-core-maps-ios.git",
       "state" : {
-        "revision" : "f58f001bb6ac25db92421d3a9ac2c0780cce60d7",
-        "version" : "11.3.0-beta.1"
+        "revision" : "a85b77f312ecd430245c618d107050fa42d5afc2",
+        "version" : "11.3.0-rc.1"
       }
     },
     {

CHANGELOG.md

@@ -11,6 +11,11 @@ Mapbox welcomes participation and contributions from everyone.
 ### Features ✨ and improvements 🏁
 * Introduce an experimental Style DSL, enabling developers to add map style content like Sources, Layers, Style Images, Terrain, Light and Atmosphere to their map style at runtime in a declarative pattern. See the documentation [here](https://docs.mapbox.com/ios/maps/api/11.2.0-beta.1/documentation/mapboxmaps/style-dsl) for more information. For SwiftUI users, this Style DSL provides a more natural approach to manipulating content.
 [tile store] Expose API for estimating Tile Region downloads and storage size.
+# 11.3.0-rc.1 - 27 March, 2024
+
+* [tile store] Expose API for estimating Tile Region downloads and storage size.
+* Remove metal view's contentScaleFactor assertion.
+* Bump core maps version to 11.3.0-rc.1 and common sdk to 24.3.0-rc.1.
 
 # 11.3.0-beta.1 - 14 March, 2024
 

MapboxMaps.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |m|
 
-  maps_version = '11.3.0-beta.1'
+  maps_version = '11.3.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.3.0-beta.1'
-  m.dependency 'MapboxCommon', '24.3.0-beta.1'
+  m.dependency 'MapboxCoreMaps', '11.3.0-rc.1'
+  m.dependency 'MapboxCommon', '24.3.0-rc.1'
   m.dependency 'Turf', '2.8.0'
 
 end

Package.resolved

@@ -5,17 +5,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/mapbox/mapbox-common-ios.git",
       "state" : {
-        "revision" : "0ee31944d6df0f61f944d980431362b9c5186a15",
-        "version" : "24.3.0-beta.1"
+        "revision" : "2af5c688a58d8019af1376a0a76f505a5f36a27b",
+        "version" : "24.3.0-rc.1"
       }
     },
     {
       "identity" : "mapbox-core-maps-ios",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/mapbox/mapbox-core-maps-ios.git",
       "state" : {
-        "revision" : "f58f001bb6ac25db92421d3a9ac2c0780cce60d7",
-        "version" : "11.3.0-beta.1"
+        "revision" : "a85b77f312ecd430245c618d107050fa42d5afc2",
+        "version" : "11.3.0-rc.1"
       }
     },
     {

Package.swift

@@ -4,8 +4,8 @@
 import PackageDescription
 import Foundation
 
-let coreMaps = MapsDependency.coreMaps(version: "11.3.0-beta.1")
-let common = MapsDependency.common(version: "24.3.0-beta.1")
+let coreMaps = MapsDependency.coreMaps(version: "11.3.0-rc.1")
+let common = MapsDependency.common(version: "24.3.0-rc.1")
 
 let mapboxMapsPath: String? = nil
 

Sources/MapboxMaps/Foundation/MapView.swift

@@ -584,9 +584,11 @@ open class MapView: UIView, SizeTrackingLayerDelegate {
         mapboxMap.size = size
 
         metalView.drawableSize = CGSize(width: size.width * pixelRatio, height: size.height * pixelRatio)
-        // DrawableSize setter will recalculate `contentScaleFactor` if the new drawableSize doesn't fit into
-        // the current bounds.size and scale.
-        assert(metalView.contentScaleFactor == pixelRatio)
+        if metalView.contentScaleFactor != pixelRatio {
+            // DrawableSize setter will recalculate `contentScaleFactor` if the new drawableSize doesn't fit into
+            // the current bounds.size and scale.
+            Log.error(forMessage: "MetalView content scale factor \(metalView.contentScaleFactor) is not equal to pixel ratio \(pixelRatio)")
+        }
 
         // GL-Native will trigger update on `mapboxMap.size` update but it will come in the next frame.
         // To reduce glitches we can schedule repaint in the next frame to resize map texture.

Sources/MapboxMaps/Info.plist

@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>11.3.0</string>
 	<key>CFBundleVersion</key>
-	<string>116</string>
+	<string>118</string>
 </dict>
 </plist>

Sources/MapboxMaps/MapboxMaps.json

@@ -1,3 +1,3 @@
 {
-    "version" : "11.3.0-beta.1"
+    "version" : "11.3.0-rc.1"
 }

Tests/MapboxMapsTests/Integration Tests/OfflineManagerIntegrationTests.swift

@@ -178,6 +178,7 @@ final class OfflineManagerIntegrationTestCase: IntegrationTestCase {
     }
 
     func testMapCanBeLoadediWithoutNetworkConnectivity() throws {
+        try XCTSkipIf(true, "Skip until MAPSNAT-1943 is fixed")
         try guardForMetalDevice()
 
         let rootView = try XCTUnwrap(rootViewController?.view)

scripts/release/packager/versions.json

@@ -1,5 +1,5 @@
 {
-    "MapboxCoreMaps": "11.3.0-beta.1",
-    "MapboxCommon": "24.3.0-beta.1",
+    "MapboxCoreMaps": "11.3.0-rc.1",
+    "MapboxCommon": "24.3.0-rc.1",
     "Turf": "2.8.0"
 }