Merge pull request #780 from OneBusAway/more-fixes

More fixes

.github/workflows/obakittests.yml

@@ -8,20 +8,20 @@ on:
 
 jobs:
   build:
-    runs-on: macos-14
+    runs-on: macos-15
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
-    - uses: actions/cache@v2
+    - uses: actions/cache@v4
       with:
         path: .build
         key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
         restore-keys: |
           ${{ runner.os }}-spm-
 
     - name: Switch Xcode 15
-      run: sudo xcode-select -switch /Applications/Xcode_15.4.app
+      run: sudo xcode-select -switch /Applications/Xcode_16.1.app
 
     - name: Install xcodegen
       run: brew install xcodegen
@@ -33,7 +33,7 @@ jobs:
     - name: Build OneBusAway
       run: xcodebuild clean build-for-testing
         -scheme 'App'
-        -destination 'platform=iOS Simulator,name=iPhone 15'
+        -destination 'platform=iOS Simulator,name=iPhone 16'
         -quiet
 
     # Unit Test
@@ -42,7 +42,7 @@ jobs:
         -only-testing:OBAKitTests
         -project 'OBAKit.xcodeproj'
         -scheme 'App'
-        -destination 'platform=iOS Simulator,name=iPhone 15'
+        -destination 'platform=iOS Simulator,name=iPhone 16'
         -resultBundlePath OBAKitTests.xcresult
         -quiet
 

OBAKit/Bookmarks/BookmarksViewController.swift

@@ -158,13 +158,13 @@ public class BookmarksViewController: UIViewController,
         let sortMenu = UIMenu(title: Strings.sort, options: .displayInline, children: [groupSortAction, distanceSortAction])
         navigationItem.rightBarButtonItem = UIBarButtonItem(title: "MORE", image: UIImage(systemName: "arrow.up.arrow.down.circle"), menu: sortMenu)
     }
-    
+
     // MARK: Refresh Widget
     func reloadWidget() {
         print("Reloading the widget")
         WidgetCenter.shared.reloadTimelines(ofKind: "OBAWidget")
     }
-    
+
     // MARK: - Refresh Control
 
     @objc private func refreshControlPulled() {

OBAKit/Bookmarks/TripBookmarkCell.swift

@@ -116,7 +116,8 @@ final class TripBookmarkTableCell: OBAListViewCell {
     ])
 
     // MARK: - UI Builders
-    private class func buildLabel(textStyle: UIFont.TextStyle) -> UILabel {
+
+    private static func buildLabel(textStyle: UIFont.TextStyle) -> UILabel {
         let label = UILabel.obaLabel(font: .preferredFont(forTextStyle: textStyle))
         label.setContentCompressionResistancePriority(.required, for: .vertical)
         label.setCompressionResistance(horizontal: .required, vertical: .required)
@@ -141,9 +142,9 @@ final class TripBookmarkTableCell: OBAListViewCell {
 
         isAccessibilityElement = true
         accessibilityTraits = [.button, .updatesFrequently]
-        
+
         let sizeTraits: [UITrait] = [UITraitVerticalSizeClass.self, UITraitHorizontalSizeClass.self]
-        registerForTraitChanges(sizeTraits) { (self: Self, previousTraitCollection: UITraitCollection) in
+        registerForTraitChanges(sizeTraits) { (self: Self, _) in
             self.layoutView()
         }
     }

OBAKit/DeepLinks/AppLinksRouter.swift

@@ -20,7 +20,7 @@ public class AppLinksRouter: NSObject {
     public init?(application: Application) {
         self.application = application
     }
-    
+
     /// The base URL for all operations in this object.
     private var baseURL: URL? {
         application.regionsService.currentRegion?.sidecarBaseURL
@@ -33,7 +33,7 @@ public class AppLinksRouter: NSObject {
     ///   - region: The region in which the link will exist.
     public func url(for stop: Stop, region: Region) -> URL? {
         guard let baseURL else { return nil }
-        
+
         guard var components = URLComponents(url: baseURL, resolvingAgainstBaseURL: false) else { return nil }
         components.path = String(format: "/regions/%d/stops/%@", region.regionIdentifier, stop.id)
 
@@ -49,7 +49,7 @@ public class AppLinksRouter: NSObject {
     ///   - region: The region in which the `ArrivalDeparture` exists.
     public func encode(arrivalDeparture: ArrivalDeparture, region: Region) -> URL? {
         guard let baseURL else { return nil }
-        
+
         var components = URLComponents(url: baseURL, resolvingAgainstBaseURL: false)!
         components.path = String(format: deepLinkPathFormat, region.regionIdentifier, arrivalDeparture.stopID)
         components.queryItems = [

OBAKit/Donations/StripeExtensions.swift

@@ -8,7 +8,7 @@
 #if canImport(Stripe)
 import StripePaymentSheet
 
-extension PaymentSheetResult: Equatable {
+extension PaymentSheetResult: @retroactive Equatable {
     public static func == (lhs: PaymentSheetResult, rhs: PaymentSheetResult) -> Bool {
         switch (lhs, rhs) {
         case (.completed, .completed), (.canceled, .canceled):

OBAKit/Extensions/ModelExtensions.swift

@@ -13,7 +13,7 @@ import OBAKitCore
 
 // MARK: - Bookmark/MKAnnotation
 
-extension Bookmark: MKAnnotation {
+extension Bookmark: @retroactive MKAnnotation {
     public var coordinate: CLLocationCoordinate2D {
         stop.coordinate
     }
@@ -25,7 +25,7 @@ extension Bookmark: MKAnnotation {
 
 // MARK: - Region/MKAnnotation
 
-extension Region: MKAnnotation {
+extension Region: @retroactive MKAnnotation {
     public var coordinate: CLLocationCoordinate2D {
         centerCoordinate
     }
@@ -41,7 +41,7 @@ extension Region: MKAnnotation {
 /// Includes additional methods for rendering extra data directly onto the map.
 ///
 /// - Note: See `StopAnnotationView`for more details.
-extension Stop: MKAnnotation {
+extension Stop: @retroactive MKAnnotation {
     public var coordinate: CLLocationCoordinate2D {
         location.coordinate
     }
@@ -64,7 +64,7 @@ extension Stop: MKAnnotation {
 // MARK: - TripStatus/MKAnnotation
 
 /// Adds conformance to `MKAnnotation` to `TripStatus`.
-extension TripStatus: MKAnnotation {
+extension TripStatus: @retroactive MKAnnotation {
 
     public var coordinate: CLLocationCoordinate2D {
         lastKnownLocation?.coordinate ?? CLLocationCoordinate2D(latitude: 0, longitude: 0)
@@ -85,7 +85,7 @@ extension TripStatus: MKAnnotation {
 /// Adds conformance to `MKAnnotation` to `TripStopTime`.
 ///
 /// - Note: See `MinimalStopAnnotationView`for more details.
-extension TripStopTime: MKAnnotation {
+extension TripStopTime: @retroactive MKAnnotation {
     public var coordinate: CLLocationCoordinate2D {
         stop.location.coordinate
     }

OBAKit/Mapping/MapViewController.swift

@@ -629,10 +629,8 @@ class MapViewController: UIViewController,
             }
             else {
                 promptUserOnRegionMismatch = false
-                if
-                    let regionMismatchBulletin = RegionMismatchBulletin(application: application),
-                    let uiApp = application.delegate?.uiApplication
-                {
+                if let regionMismatchBulletin = RegionMismatchBulletin(application: application),
+                   let uiApp = application.delegate?.uiApplication {
                     self.regionMismatchBulletin = regionMismatchBulletin
                     self.regionMismatchBulletin?.show(in: uiApp)
                 }

OBAKit/Mapping/PulsingAnnotationView.swift

@@ -118,7 +118,7 @@ class PulsingAnnotationView: MKAnnotationView {
         layer.anchorPoint = CGPoint(x: 0.5, y: 0.5)
         calloutOffset = CGPoint(x: 0, y: 4)
         self.bounds = bounds
-        
+
         registerForTraitChanges([UITraitUserInterfaceStyle.self]) { (self: Self, previousTraitCollection: UITraitCollection) in
             if self.traitCollection.userInterfaceStyle != previousTraitCollection.userInterfaceStyle {
                 self.rebuildLayers()

OBAKit/Mapping/StopAnnotationView.swift

@@ -76,7 +76,7 @@ class StopAnnotationView: MKAnnotationView {
         updateAccessibility()
 
         NotificationCenter.default.addObserver(self, selector: #selector(voiceoverStatusDidChange), name: UIAccessibility.voiceOverStatusDidChangeNotification, object: nil)
-        
+
         registerForTraitChanges([UITraitUserInterfaceStyle.self]) { (self: Self, previousTraitCollection: UITraitCollection) in
             if self.traitCollection.userInterfaceStyle != previousTraitCollection.userInterfaceStyle {
                 self.rebuildIcon()
@@ -174,7 +174,7 @@ class StopAnnotationView: MKAnnotationView {
         // we should skip the callout and push directly to the annotation's destination view.
         canShowCallout = !UIAccessibility.isVoiceOverRunning
     }
-    
+
     private func rebuildIcon() {
         guard
             let stop = annotation as? Stop,

OBAKit/Onboarding/DataMigration/DataMigrationError+Localization.swift

@@ -7,7 +7,7 @@
 
 import OBAKitCore
 
-extension DataMigrationError: LocalizedError {
+extension DataMigrationError: @retroactive LocalizedError {
     public var errorDescription: String? {
         switch self {
         case .invalidAPIService(let explanation):
@@ -22,7 +22,7 @@ extension DataMigrationError: LocalizedError {
     }
 }
 
-extension DataMigrationBookmarkError: LocalizedError {
+extension DataMigrationBookmarkError: @retroactive LocalizedError {
     public var errorDescription: String? {
         switch self {
         case .noActiveTrips:

OBAKit/Orchestration/Application.swift

@@ -94,7 +94,7 @@ public class Application: CoreApplication, PushServiceDelegate {
     /// Handles all deep-linking into the app.
     @objc public private(set) lazy var appLinksRouter: AppLinksRouter? = {
         let router = AppLinksRouter(application: self)
-        
+
         router?.showStopHandler = { [weak self] stop in
             guard
                 let self = self,

OBAKit/Reporting/StopProblemViewController.swift

@@ -14,7 +14,7 @@ import OBAKitCore
 // This seems...busted. I can't figure out when this
 // initializer will actually be called, though. Do I even
 // really need it?
-extension StopProblemCode: InputTypeInitiable {
+extension StopProblemCode: @retroactive InputTypeInitiable {
     public init?(string stringValue: String) {
         return nil
     }

OBAKit/Reporting/VehicleProblemViewController.swift

@@ -14,7 +14,7 @@ import OBAKitCore
 // This seems...busted. I can't figure out when this
 // initializer will actually be called, though. Do I even
 // really need it?
-extension TripProblemCode: InputTypeInitiable {
+extension TripProblemCode: @retroactive InputTypeInitiable {
     public init?(string stringValue: String) {
         return nil
     }

OBAKit/Stops/NearbyStopsViewController.swift

@@ -128,7 +128,7 @@ class NearbyStopsViewController: UIViewController,
             directions[stop.direction] = list
         }
 
-        let tapHandler = { [unowned self] (vm: StopViewModel) -> Void in
+        let tapHandler = { [unowned self] (vm: StopViewModel) in
             self.application.viewRouter.navigateTo(stopID: vm.stopID, from: self)
         }
 

OBAKit/Stops/StopHeaderController.swift

@@ -149,9 +149,9 @@ class StopHeaderView: UIView {
         ])
 
         addGestureRecognizer(toggleRouteDetailsGestureRecognizer)
-        
+
         let sizeTraits: [UITrait] = [UITraitVerticalSizeClass.self, UITraitHorizontalSizeClass.self]
-        registerForTraitChanges(sizeTraits) { (self: Self, previousTraitCollection: UITraitCollection) in
+        registerForTraitChanges(sizeTraits) { (self: Self, _) in
             self.configureView()
         }
     }

OBAKit/Stops/WalkTimeView.swift

@@ -74,9 +74,9 @@ class WalkTimeView: UIView {
         ])
 
         NotificationCenter.default.addObserver(self, selector: #selector(deviceOrientationDidChange), name: UIDevice.orientationDidChangeNotification, object: nil)
-        
+
         let sizeTraits: [UITrait] = [UITraitVerticalSizeClass.self, UITraitHorizontalSizeClass.self]
-        registerForTraitChanges(sizeTraits) { (self: Self, previousTraitCollection: UITraitCollection) in
+        registerForTraitChanges(sizeTraits) { (self: Self, _) in
             self.setNeedsDisplay()
         }
     }

OBAKit/Trip/TripStopListItem.swift

@@ -178,8 +178,8 @@ final class TripStopCell: OBAListViewCell {
         ])
 
         isAccessibilityElement = true
-        
-        registerForTraitChanges([UITraitPreferredContentSizeCategory.self]) { (self: Self, previousTraitCollection: UITraitCollection) in
+
+        registerForTraitChanges([UITraitPreferredContentSizeCategory.self]) { (self: Self, _) in
             self.layoutAccessibility()
         }
     }

OBAKit/Trip/TripViewController.swift

@@ -30,7 +30,7 @@ class TripViewController: UIViewController,
         self.tripConvertible = tripConvertible
 
         super.init(nibName: nil, bundle: nil)
-        
+
         registerTraitChangeCallback()
     }
 
@@ -39,7 +39,7 @@ class TripViewController: UIViewController,
         self.tripConvertible = TripConvertible(arrivalDeparture: arrivalDeparture)
 
         super.init(nibName: nil, bundle: nil)
-        
+
         registerTraitChangeCallback()
     }
 
@@ -50,10 +50,10 @@ class TripViewController: UIViewController,
     deinit {
         enableIdleTimer()
     }
-    
+
     private func registerTraitChangeCallback() {
         let sizeTraits: [UITrait] = [UITraitVerticalSizeClass.self, UITraitHorizontalSizeClass.self, UITraitPreferredContentSizeCategory.self]
-        registerForTraitChanges(sizeTraits) { (self: Self, previousTraitCollection: UITraitCollection) in
+        registerForTraitChanges(sizeTraits) { (self: Self, _) in
             self.updateTitleView()
         }
     }

OBAKit/project.yml

@@ -13,6 +13,7 @@ targets:
     postBuildScripts:
       - path: "../scripts/swiftlint.sh"
         name: Swiftlint
+        basedOnDependencyAnalysis: false
     scheme:
       gatherCoverageData: true
     info:

OBAKitCore/Extensions/CoreLocationExtensions.swift

@@ -11,7 +11,8 @@ import CoreGraphics
 import CoreLocation
 import MapKit
 
-extension CLAuthorizationStatus: LosslessStringConvertible {
+extension CLAuthorizationStatus: @retroactive CustomStringConvertible {}
+extension CLAuthorizationStatus: @retroactive LosslessStringConvertible {
     public init?(_ description: String) { nil }
 
     public var description: String {

OBAKitCore/Models/Region.swift

@@ -45,7 +45,7 @@ public class Region: NSObject, Identifiable, Codable {
 
     /// The base URL for making OBA REST API requests.
     public let OBABaseURL: URL
-    
+
     /// The base URL for sidecar server (i.e. OneBusAway.co/Obaco) REST API requests
     public let sidecarBaseURL: URL?
 

OBAKitCore/Models/UserData/UserDataStore.swift

@@ -563,10 +563,7 @@ public class UserDefaultsStore: NSObject, UserDataStore, StopPreferencesStore {
     // MARK: - Private Helpers
 
     private func upsert(bookmark: Bookmark) {
-        if
-            let existing = findBookmark(id: bookmark.id),
-            let index = bookmarks.firstIndex(of: existing)
-        {
+        if let existing = findBookmark(id: bookmark.id), let index = bookmarks.firstIndex(of: existing) {
             bookmarks.remove(at: index)
             bookmarks.insert(bookmark, at: index)
         }

OBAKitCore/Network/ObacoAPIService.swift

@@ -17,7 +17,7 @@ public protocol ObacoServiceDelegate: NSObjectProtocol {
 /// API service client for the Obaco (`alerts.onebusaway.org`) service.
 ///
 /// Obaco provides services like weather, trip status, and alarms to the iOS app.
-public actor ObacoAPIService: APIService {
+public actor ObacoAPIService: @preconcurrency APIService {
     public let configuration: APIServiceConfiguration
     public nonisolated let dataLoader: URLDataLoader
 

OBAKitCore/Network/RESTAPIService/RESTAPIService+GetAgencyAlerts.swift

@@ -28,7 +28,7 @@ extension RESTAPIService {
 
         do {
             let (data, _) = try await self.getData(for: url)
-            let message = try TransitRealtime_FeedMessage(serializedData: data)
+            let message = try TransitRealtime_FeedMessage(serializedBytes: data)
             return message.entity
                 .filter(isQualifiedAlert)
                 .compactMap {

OBAKitCore/Network/RESTAPIService/RESTAPIService.swift

@@ -9,7 +9,7 @@ import Foundation
 import os.log
 
 /// Makes API calls to the OBA REST service and converts the server's responses into model objects.
-public actor RESTAPIService: APIService {
+public actor RESTAPIService: @preconcurrency APIService {
     public let configuration: APIServiceConfiguration
     public nonisolated let dataLoader: URLDataLoader