Skip to content

Commit

Permalink
Fix Xcode 16 compilation (#2323)
Browse files Browse the repository at this point in the history
Co-authored-by: Aleksei Sapitskii <[email protected]>
  • Loading branch information
OdNairy and aleksproger authored Oct 9, 2024
1 parent 36908eb commit 6eca811
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 7 deletions.
10 changes: 5 additions & 5 deletions .fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ platform :ios do
team_id: "GJZR2MEM28", # Developer Portal Team ID,
profile_name: lane_context[SharedValues::MATCH_PROVISIONING_PROFILE_MAPPING]["mapbox.ExamplesUITests.xctrunner"],
targets: ["ExamplesUITests"],
code_sign_identity: "Apple Development: Machiney McMachineface",
code_sign_identity: "Apple Development: Created via API",
)
update_code_signing_settings(
use_automatic_signing: false,
path: "Apps/Examples/Examples.xcodeproj",
team_id: "GJZR2MEM28", # Developer Portal Team ID,
profile_name: lane_context[SharedValues::MATCH_PROVISIONING_PROFILE_MAPPING]["com.mapbox.examples"],
targets: ["Examples"],
code_sign_identity: "Apple Development: Machiney McMachineface",
code_sign_identity: "Apple Development: Created via API",
)
run_tests(
workspace: 'Apps/Apps.xcworkspace',
Expand Down Expand Up @@ -95,7 +95,7 @@ platform :ios do
team_id: "GJZR2MEM28", # Developer Portal Team ID,
profile_name: lane_context[SharedValues::MATCH_PROVISIONING_PROFILE_MAPPING]["com.mapbox.examples"],
targets: ["Examples"],
code_sign_identity: "Apple Development: Machiney McMachineface",
code_sign_identity: "Apple Development: Created via API",
entitlements_file_path: "Examples/Examples_CarPlay.entitlements"
)
sync_code_signing(type: "appstore")
Expand All @@ -114,7 +114,7 @@ platform :ios do

lane :build_tests do
sh("cd .. && xcodegen")
app_store_connect_api_key # Generate API Token
# app_store_connect_api_key # Generate API Token
setup_circle_ci
sync_code_signing(app_identifier: "com.mapbox.MapboxMapsTestHost")
update_code_signing_settings(
Expand All @@ -123,7 +123,7 @@ platform :ios do
team_id: "GJZR2MEM28", # Developer Portal Team ID,
profile_name: lane_context[SharedValues::MATCH_PROVISIONING_PROFILE_MAPPING]["com.mapbox.MapboxMapsTestHost"],
targets: ["MapboxTestHost"],
code_sign_identity: "Apple Development: Machiney McMachineface",
code_sign_identity: "Apple Development: Created via API",
)
run_tests(
project: 'MapboxMaps.xcodeproj',
Expand Down
1 change: 1 addition & 0 deletions Sources/.swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ opt_in_rules:
- missing_docs
disabled_rules:
- file_length
- non_optional_string_data_conversion
3 changes: 2 additions & 1 deletion Sources/MapboxMaps/Annotations/ViewAnnotationManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,10 @@ public final class ViewAnnotationManager {
/// The complete list of annotations associated with the receiver.
@available(*, deprecated, message: "Use ViewAnnotation")
public var annotations: [UIView: ViewAnnotationOptions] {
idsByView.compactMapValues { [mapboxMap] id in
let values = idsByView.compactMapValues { [mapboxMap] id in
try? mapboxMap.options(forViewAnnotationWithId: id)
}
return values
}

internal init(containerView: UIView, mapboxMap: MapboxMapProtocol, displayLink: Signal<Void>) {
Expand Down
2 changes: 2 additions & 0 deletions Tests/.swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ disabled_rules:
- type_body_length
- file_length
- function_body_length
- non_optional_string_data_conversion
- static_over_final_class
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ final class GeometryTests: XCTestCase {
expectedTurfMultiPolygon.coordinates)
}

// // MARK: - Turf Geometry → Geometry
// MARK: - Turf Geometry → Geometry
func testGeometryToMBXGeometry_Point() {
// Given
let point = Point(CLLocationCoordinate2D(latitude: -10, longitude: 10))
Expand Down

0 comments on commit 6eca811

Please sign in to comment.