[lts/v10] Release v10.19.0 (#2311)

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

@@ -15,26 +15,26 @@
         "repositoryURL": "https://github.com/mapbox/mapbox-common-ios.git",
         "state": {
           "branch": null,
-          "revision": "c2aa7022afdcf5a070ace4e3b608562101a04690",
-          "version": "23.10.1"
+          "revision": "462930ede08570c1636601c5d5bdad35c6d96330",
+          "version": "23.11.0"
         }
       },
       {
         "package": "MapboxCoreMaps",
         "repositoryURL": "https://github.com/mapbox/mapbox-core-maps-ios.git",
         "state": {
           "branch": null,
-          "revision": "51f776b11bcff34ced88fcf14e4ed9c568257232",
-          "version": "10.18.0"
+          "revision": "a46690fa9a8def6a5b77f380082bccdf63170a02",
+          "version": "10.19.1"
         }
       },
       {
         "package": "MapboxMobileEvents",
         "repositoryURL": "https://github.com/mapbox/mapbox-events-ios.git",
         "state": {
           "branch": null,
-          "revision": "91ae071c0232c144251dfe0d0724525deaf293d4",
-          "version": "1.0.10"
+          "revision": "990bab73cf50242a05f29b6a9cfeb30592150c13",
+          "version": "2.0.0"
         }
       },
       {

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 Mapbox welcomes participation and contributions from everyone.
 
+# 10.19.0 - September 24, 2024
+
+* Remove bitcode from framework binaries across the stack
+* Update MapboxCoreMaps to 10.19.1 and MapboxCommon to 23.11.0, MapboxMobileEvents to 2.0.0
+
 # 10.18.2 - June 12, 2024
 
 * Update Turf to 2.8.0

MapboxMaps.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |m|
 
-  maps_version = '10.18.2'
+  maps_version = '10.19.0'
 
   m.name = 'MapboxMaps'
   m.version = maps_version
@@ -25,9 +25,9 @@ Pod::Spec.new do |m|
   # TODO: remove after Cocoapods 1.12 is released
   m.pod_target_xcconfig = { 'CODE_SIGNING_ALLOWED' => 'NO' }
 
-  m.dependency 'MapboxCoreMaps', '10.18.0'
-  m.dependency 'MapboxMobileEvents', '1.0.10'
-  m.dependency 'MapboxCommon', '23.10.1'
+  m.dependency 'MapboxCoreMaps', '10.19.1'
+  m.dependency 'MapboxMobileEvents', '2.0.0'
+  m.dependency 'MapboxCommon', '23.11.0'
   m.dependency 'Turf', '2.8.0'
 
 end

Package.resolved

@@ -15,26 +15,26 @@
         "repositoryURL": "https://github.com/mapbox/mapbox-common-ios.git",
         "state": {
           "branch": null,
-          "revision": "c2aa7022afdcf5a070ace4e3b608562101a04690",
-          "version": "23.10.1"
+          "revision": "462930ede08570c1636601c5d5bdad35c6d96330",
+          "version": "23.11.0"
         }
       },
       {
         "package": "MapboxCoreMaps",
         "repositoryURL": "https://github.com/mapbox/mapbox-core-maps-ios.git",
         "state": {
           "branch": null,
-          "revision": "51f776b11bcff34ced88fcf14e4ed9c568257232",
-          "version": "10.18.0"
+          "revision": "a46690fa9a8def6a5b77f380082bccdf63170a02",
+          "version": "10.19.1"
         }
       },
       {
         "package": "MapboxMobileEvents",
         "repositoryURL": "https://github.com/mapbox/mapbox-events-ios.git",
         "state": {
           "branch": null,
-          "revision": "91ae071c0232c144251dfe0d0724525deaf293d4",
-          "version": "1.0.10"
+          "revision": "990bab73cf50242a05f29b6a9cfeb30592150c13",
+          "version": "2.0.0"
         }
       },
       {

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.18.0")),
+        .package(name: "MapboxCoreMaps", url: "https://github.com/mapbox/mapbox-core-maps-ios.git", .exact("10.19.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.10.1")),
+        .package(name: "MapboxMobileEvents", url: "https://github.com/mapbox/mapbox-events-ios.git", .exact("2.0.0")),
+        .package(name: "MapboxCommon", url: "https://github.com/mapbox/mapbox-common-ios.git", .exact("23.11.0")),
         .package(name: "Turf", url: "https://github.com/mapbox/turf-swift.git", .exact("2.8.0")),
         .package(name: "CocoaImageHashing", url: "https://github.com/ameingast/cocoaimagehashing", .exact("1.9.0"))
     ],

Sources/MapboxMaps/Info.plist

@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>10.18.2</string>
+	<string>10.19.0</string>
 	<key>CFBundleVersion</key>
-	<string>90</string>
+	<string>91</string>
 </dict>
 </plist>

Sources/MapboxMaps/MapboxMaps.json

@@ -1,3 +1,3 @@
 {
-    "version" : "10.18.2"
+    "version" : "10.19.0"
 }

Sources/MapboxMaps/Style/Style+Localization.swift

@@ -108,7 +108,9 @@ extension Style {
                                                      options: .caseInsensitive)
 
         if case .expression(let textField) = symbolLayer.textField {
-            var stringExpression = String(decoding: try JSONEncoder().encode(textField), as: UTF8.self)
+            guard var stringExpression = String(data: try JSONEncoder().encode(textField), encoding: .utf8) else {
+                return nil
+            }
             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

@@ -96,7 +96,7 @@ final class FormatOptionsTests: XCTestCase {
         XCTAssertEqual(encoded["font-scale"] as? Double, 1)
         XCTAssertEqual(encoded["text-font"] as? [String], ["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"]"##
         )
     }
@@ -136,15 +136,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

@@ -247,7 +247,7 @@ internal class StyleIntegrationTests: MapViewIntegrationTestCase {
         let convertedExpression = try! style!.convertExpressionForLocalization(symbolLayer: symbolLayer, localeValue: "zh")
 
         let data = try! JSONSerialization.data(withJSONObject: 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)

Tests/MapboxMapsTests/Style/StyleTransitionTests.swift

@@ -16,7 +16,7 @@ class StyleTransitionTests: XCTestCase {
     func testEncodeHasCorrectConversion() {
         let transition = StyleTransition(duration: 1.0, delay: 0.5)
         let encodedTransition = try! JSONEncoder().encode(transition)
-        let dataString = String(decoding: encodedTransition, as: UTF8.self)
+        let dataString = String(data: encodedTransition, encoding: .utf8)
 
         XCTAssertEqual(dataString, jsonString)
     }

baselines/binary-size/MapboxMaps.json

@@ -1,33 +1,33 @@
 {
   "binary_name": "MapboxMaps.xcframework",
-  "created": "2022-12-19T12:10:20.121611",
-  "binary_size": 19613669,
+  "created": "2024-09-24T12:45:57.753990",
+  "binary_size": 12698407,
   "platform": {
-    "MapboxMaps_iphoneos_arm64": 2405512,
-    "MapboxMaps_iphoneos_arm64_bitcodeSize": 15695872,
-    "MapboxMaps_iphoneos_arm64_debugSymbolsSize": 190104,
+    "MapboxMaps_iphoneos_arm64": 2444040,
+    "MapboxMaps_iphoneos_arm64_bitcodeSize": 0,
+    "MapboxMaps_iphoneos_arm64_debugSymbolsSize": 196920,
     "MapboxMaps_iphoneos_arm64_humanReadableSize": "2.3 MB",
-    "MapboxMaps_iphonesimulator_arm64": 2409568,
+    "MapboxMaps_iphonesimulator_arm64": 2481536,
     "MapboxMaps_iphonesimulator_arm64_bitcodeSize": 0,
-    "MapboxMaps_iphonesimulator_arm64_debugSymbolsSize": 189664,
-    "MapboxMaps_iphonesimulator_arm64_humanReadableSize": "2.3 MB",
-    "MapboxMaps_iphonesimulator_x86_64": 2475840,
+    "MapboxMaps_iphonesimulator_arm64_debugSymbolsSize": 196416,
+    "MapboxMaps_iphonesimulator_arm64_humanReadableSize": "2.4 MB",
+    "MapboxMaps_iphonesimulator_x86_64": 2564512,
     "MapboxMaps_iphonesimulator_x86_64_bitcodeSize": 0,
-    "MapboxMaps_iphonesimulator_x86_64_debugSymbolsSize": 190080,
+    "MapboxMaps_iphonesimulator_x86_64_debugSymbolsSize": 197072,
     "MapboxMaps_iphonesimulator_x86_64_humanReadableSize": "2.4 MB"
   },
   "core": {},
   "build": {
-    "build": 56338,
+    "build": 141708,
     "project": "mapbox-maps-ios",
     "branch": "HEAD",
-    "sha": "96b72437db29820c0431cfdfd67e7e3cd860fece",
-    "author": "Mai Mai",
-    "timestamp": 1671438467,
-    "message": "Fix assertion failure\n",
-    "xcode": "Xcode 13.1 Build version 13A1030d",
-    "metrics-sha": "b5adb2df9eeed65aab59adcd584e5b4822f0a67f"
+    "sha": "b0d5af27c954b1ec6a04cedbbb04907bd4356bc0",
+    "author": "Aleksei Sapitskii",
+    "timestamp": 1727181797,
+    "message": "Disable bitcode in iOS SDK\n",
+    "xcode": "Xcode 14.1 Build version 14B47b",
+    "metrics-sha": "b0d5af27c954b1ec6a04cedbbb04907bd4356bc0"
   },
-  "name": "ios-maps-v10",
+  "name": "ios-maps-v10-benchmark",
   "version": "3"
-}
+}

project.yml

@@ -16,6 +16,7 @@ settings:
     GCC_WARN_64_TO_32_BIT_CONVERSION: $(GCC_WARN_64_TO_32_BIT_CONVERSION)
     CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER: "YES"
     MTL_FAST_MATH: "YES"
+    ENABLE_BITCODE: "NO"
   configs:
     Debug:
       ONLY_ACTIVE_ARCH: "YES"

scripts/release/packager/create-xcframework.sh

@@ -38,7 +38,7 @@ xcodebuild archive \
   ARCHS='x86_64 arm64' \
   EXCLUDED_ARCHS= \
   MACH_O_TYPE="$MACH_O_TYPE" \
-  ENABLE_BITCODE=YES \
+  ENABLE_BITCODE=NO \
   LLVM_LTO=NO
 
 # Create iOS Device Framework
@@ -57,7 +57,7 @@ xcodebuild archive \
   ARCHS='arm64' \
   EXCLUDED_ARCHS= \
   MACH_O_TYPE="$MACH_O_TYPE" \
-  ENABLE_BITCODE=YES \
+  ENABLE_BITCODE=NO \
   LLVM_LTO=NO
 
 # Create XCFramework

scripts/release/packager/versions.json

@@ -1,6 +1,6 @@
 {
-	"MapboxCoreMaps": "10.18.0",
-	"MapboxMobileEvents": "v1.0.10",
-	"MapboxCommon": "23.10.1",
+	"MapboxCoreMaps": "10.19.1",
+	"MapboxMobileEvents": "v2.0.0",
+	"MapboxCommon": "23.11.0",
 	"Turf": "v2.8.0"
 }