Prepare patch release 11.6.1 (#2293)

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

@@ -14,17 +14,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/mapbox/mapbox-common-ios.git",
       "state" : {
-        "revision" : "b4197f12f928066645e08b70c12ce1e22e50e2c3",
-        "version" : "24.6.0"
+        "revision" : "3cbd3eba5a316e4213b4860db398d5777f9de957",
+        "version" : "24.6.1"
       }
     },
     {
       "identity" : "mapbox-core-maps-ios",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/mapbox/mapbox-core-maps-ios.git",
       "state" : {
-        "revision" : "455ad90488ab033a50ab4b7283fa78184309eef3",
-        "version" : "11.6.0"
+        "revision" : "80f08d877ff8a6ba1ad46d357e7863bb0a98f414",
+        "version" : "11.6.1"
       }
     },
     {

CHANGELOG.md

@@ -4,6 +4,12 @@ Mapbox welcomes participation and contributions from everyone.
 
 ## main
 
+## 11.6.1 - 10 September, 2024
+
+* Upgrade MapboxCommon to v24.6.1.
+* Upgrade MapboxCoreMaps to v11.6.1.
+* Fix for offline retrieval of 3d tiles for standard style.
+
 ## 11.6.0 - 14 August, 2024
 
 * Expose getters for `MapOptions.orientation`, `MapOptions.constrainMode` and `MapOptions.viewportMode`.

MapboxMaps.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |m|
 
-  maps_version = '11.6.0'
+  maps_version = '11.6.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.6.0'
-  m.dependency 'MapboxCommon', '24.6.0'
+  m.dependency 'MapboxCoreMaps', '11.6.1'
+  m.dependency 'MapboxCommon', '24.6.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" : "b4197f12f928066645e08b70c12ce1e22e50e2c3",
-        "version" : "24.6.0"
+        "revision" : "3cbd3eba5a316e4213b4860db398d5777f9de957",
+        "version" : "24.6.1"
       }
     },
     {
       "identity" : "mapbox-core-maps-ios",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/mapbox/mapbox-core-maps-ios.git",
       "state" : {
-        "revision" : "455ad90488ab033a50ab4b7283fa78184309eef3",
-        "version" : "11.6.0"
+        "revision" : "80f08d877ff8a6ba1ad46d357e7863bb0a98f414",
+        "version" : "11.6.1"
       }
     },
     {

Package.swift

@@ -4,8 +4,8 @@
 import PackageDescription
 import Foundation
 
-let coreMaps = MapsDependency.coreMaps(version: "11.6.0")
-let common = MapsDependency.common(version: "24.6.0")
+let coreMaps = MapsDependency.coreMaps(version: "11.6.1")
+let common = MapsDependency.common(version: "24.6.1")
 
 let mapboxMapsPath: String? = nil
 

Sources/MapboxMaps/Info.plist

@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>11.6.0</string>
+	<string>11.6.1</string>
 	<key>CFBundleVersion</key>
-	<string>132</string>
+	<string>133</string>
 </dict>
 </plist>

Sources/MapboxMaps/MapboxMaps.json

@@ -1,3 +1,3 @@
 {
-    "version" : "11.6.0"
+    "version" : "11.6.1"
 }

Sources/MapboxMaps/Style/Style+Localization.swift

@@ -108,7 +108,7 @@ extension StyleManager {
                                                      options: .caseInsensitive)
 
         if case .expression(let textField) = symbolLayer.textField {
-            var stringExpression = String(decoding: try JSONEncoder().encode(textField), as: UTF8.self)
+            var stringExpression = String(data: try JSONEncoder().encode(textField), encoding: .utf8)!
             stringExpression.updateOnceExpression(replacement: replacement, regex: expressionCoalesce)
             stringExpression.updateExpression(replacement: replacement, regex: expressionAbbr)
 

Tests/MapboxMapsTests/Helpers/Encodable+JsonString.swift

@@ -2,6 +2,6 @@ import Foundation
 
 extension Encodable {
     func jsonString() throws -> String {
-        try String(decoding: JSONEncoder().encode(self), as: UTF8.self)
+        try String(data: JSONEncoder().encode(self), encoding: .utf8)!
     }
 }

Tests/MapboxMapsTests/Style/ExpressionTests/FormatOptionsTests.swift

@@ -112,15 +112,15 @@ final class FormatOptionsTests: XCTestCase {
 
         let encoded = try DictionaryEncoder().encode(formatOptions)
         XCTAssertEqual(
-            String(decoding: try JSONSerialization.data(withJSONObject: encoded["font-scale"] as Any), as: UTF8.self),
+            String(data: try JSONSerialization.data(withJSONObject: encoded["font-scale"] as Any), encoding: .utf8)!,
             #"["case",[">=",["to-number",["get","point_count"]],4],1,2]"#
         )
         XCTAssertEqual(
-            String(decoding: try JSONSerialization.data(withJSONObject: encoded["text-font"] as Any), as: UTF8.self),
+            String(data: try JSONSerialization.data(withJSONObject: encoded["text-font"] as Any), encoding: .utf8)!,
             #"["case",[">=",["to-number",["get","point_count"]],4],["Open Sans Semibold"],["Arial Unicode MS Bold"]]"#
         )
         XCTAssertEqual(
-            String(decoding: try JSONSerialization.data(withJSONObject: encoded["text-color"] as Any), as: UTF8.self),
+            String(data: try JSONSerialization.data(withJSONObject: encoded["text-color"] as Any), encoding: .utf8)!,
             ##"["case",[">=",["to-number",["get","point_count"]],4],"#ffffff","#000000"]"##
         )
     }

Tests/MapboxMapsTests/Style/StyleIntegrationTests.swift

@@ -226,7 +226,7 @@ internal class StyleIntegrationTests: MapViewIntegrationTestCase {
         XCTAssertNoThrow {
             let convertedExpression = try self.mapView.mapboxMap.convertExpressionForLocalization(symbolLayer: symbolLayer, localeValue: "zh")
             let data = try JSONSerialization.data(withJSONObject: XCTUnwrap(convertedExpression), options: [.prettyPrinted])
-            let convertedString = String(decoding: data, as: UTF8.self).replacingOccurrences(of: " ", with: "").replacingOccurrences(of: "\n", with: "")
+            let convertedString = String(data: data, encoding: .utf8)!.replacingOccurrences(of: " ", with: "").replacingOccurrences(of: "\n", with: "")
 
             let result = "[\"format\",[\"coalesce\",[\"get\",\"name_zh\"],[\"get\",\"name\"]]]"
             XCTAssertEqual(result, convertedString)
@@ -261,7 +261,7 @@ internal class StyleIntegrationTests: MapViewIntegrationTestCase {
             ],
         ]
 
-        let styleJSON: String =  String(decoding: try! JSONSerialization.data(withJSONObject: styleJSONObject, options: [.prettyPrinted]), as: UTF8.self)
+        let styleJSON: String =  String(data: try! JSONSerialization.data(withJSONObject: styleJSONObject, options: [.prettyPrinted]), encoding: .utf8)!
         XCTAssertFalse(styleJSON.isEmpty, "ValueConverter should create valid JSON string.")
 
         let styleJSONFinishedLoading = expectation(description: "Style JSON has finished loading")

Tests/MapboxMapsTests/Style/StyleTransitionTests.swift

@@ -18,7 +18,7 @@ class StyleTransitionTests: XCTestCase {
         let encoder = JSONEncoder()
         encoder.outputFormatting = .sortedKeys
         let encodedTransition = try! encoder.encode(transition)
-        let dataString = String(decoding: encodedTransition, as: UTF8.self)
+        let dataString = String(data: encodedTransition, encoding: .utf8)!
 
         XCTAssertEqual(dataString, jsonString)
     }

scripts/release/packager/versions.json

@@ -1,5 +1,5 @@
 {
-    "MapboxCoreMaps": "11.6.0",
-    "MapboxCommon": "24.6.0",
+    "MapboxCoreMaps": "11.6.1",
+    "MapboxCommon": "24.6.1",
     "Turf": "2.8.0"
 }