Skip to content

Fix Swift 6 concurrency warnings and retroactive conformance (#199) #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
twostraws merged 1 commit into from
Apr 5, 2026
Merged

Fix Swift 6 concurrency warnings and retroactive conformance (#199) #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions ControlRoom/Controllers/LocalSearchController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,16 +115,17 @@ class LocalSearchController: NSObject, ObservableObject {
/// Adds `MKLocalSearchCompleterDelegate` conformance so the controller can use the delegate's callback methods
extension LocalSearchController: MKLocalSearchCompleterDelegate {
/// Called if `MKLocalSearchCompleter` return valid results from a query string
func completerDidUpdateResults(_ completer: MKLocalSearchCompleter) {
guard let callback else { return }
nonisolated func completerDidUpdateResults(_ completer: MKLocalSearchCompleter) {
let results = completer.results.map {
LocalSearchResult( result: $0 )
LocalSearchResult(result: $0)
}
Task { @MainActor [weak self] in
self?.callback?(results)
}
callback(results)
}

/// Called if `MKLocalSearchCompleter` encounters an error
func completer(_ completer: MKLocalSearchCompleter, didFailWithError error: Error) {
nonisolated func completer(_ completer: MKLocalSearchCompleter, didFailWithError error: Error) {
print(error)
}
}
8 changes: 8 additions & 0 deletions ControlRoom/Extensions/CLLocationCoordinate2D-Identifiable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,16 @@
import CoreLocation
import Foundation

#if swift(>=5.10)
extension CLLocationCoordinate2D: @retroactive Identifiable {
public var id: String {
"\(latitude)-\(longitude)"
}
}
#else
extension CLLocationCoordinate2D: Identifiable {
public var id: String {
"\(latitude)-\(longitude)"
}
}
#endif
Loading