Migrate to swift-tools-version:6.2 (#531)

Author: mltbnz

.editorconfig

@@ -1,7 +1,8 @@
 root = true
 
 [*.swift]
-indent_style = space
+charset = utf-8
+indent_style = tab
 indent_size = 2
 tab_width = 2
 end_of_line = crlf

CriticalMapsKit/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.9
+// swift-tools-version:6.2
 
 import PackageDescription
 
@@ -209,7 +209,8 @@ let package = Package(
         .swiftUIHelpers
       ],
       exclude: ["README.md"],
-      resources: [.process("Resources")]
+      resources: [.process("Resources")],
+      swiftSettings: [.swiftLanguageMode(.v5)]
     ),
     .target(
       name: "SwiftUIHelpers",
@@ -334,8 +335,7 @@ package.targets.append(contentsOf: [
       .testHelper,
       .tca,
       .product(name: "MastodonKit", package: "MastodonKit")
-    ],
-    resources: [.process("_Resources/")]
+    ]
   )
 ])
 

CriticalMapsKit/Sources/ApiClient/APIClient.swift

@@ -3,7 +3,7 @@ import Foundation
 
 /// A Client to dispatch network calls
 @DependencyClient
-public struct APIClient {
+public struct APIClient: Sendable {
   /// Dispatches a Request and returns its data
   /// - Parameter request: Request to Dispatch
   /// - Returns: The response data of the request
@@ -25,7 +25,7 @@ extension APIClient: DependencyKey {
 }
 
 extension APIClient: TestDependencyKey {
-  public static var testValue: APIClient = Self()
+  public static let testValue: APIClient = Self()
   public static let previewValue: APIClient = Self(
     send: { _ in (Data(), HTTPURLResponse()) }
   )

CriticalMapsKit/Sources/ApiClient/APIService.swift

@@ -6,7 +6,7 @@ import SharedModels
 
 /// A Service to send and fetch locations and chat messages from the Critical Maps API
 @DependencyClient
-public struct APIService {
+public struct APIService: Sendable {
   public var getRiders: @Sendable () async throws -> [Rider]
   public var postRiderLocation: @Sendable (SendLocationPostBody) async throws -> ApiResponse
   public var getChatMessages: @Sendable () async throws -> [ChatMessage]

CriticalMapsKit/Sources/ApiClient/NetworkDispatcher.swift

@@ -3,7 +3,7 @@ import Foundation
 
 /// A client to dispatch network request to URLSession
 @DependencyClient
-public struct NetworkDispatcher {
+public struct NetworkDispatcher: Sendable {
   var dispatch: @Sendable (URLRequest) async throws -> (Data, URLResponse)
 }
 

CriticalMapsKit/Sources/ApiClient/Requests/SendLocationPostBody.swift

@@ -1,7 +1,7 @@
 import Foundation
 import SharedModels
 
-public struct SendLocationPostBody: Encodable {
+public struct SendLocationPostBody: Encodable, Sendable {
   public init(
     device: String,
     location: Location? = nil

CriticalMapsKit/Sources/AppFeature/AppFeature.swift

@@ -18,11 +18,11 @@ import UIApplicationClient
 import UserDefaultsClient
 
 @Reducer
-public struct AppFeature { // swiftlint:disable:this type_body_length
+public struct AppFeature: Sendable { // swiftlint:disable:this type_body_length
   public init() {}
 
   @Reducer
-  public enum Destination {
+  public enum Destination: Sendable {
     case social(SocialFeature)
     case settings(SettingsFeature)
     case alert(AlertState<Alert>)
@@ -481,7 +481,7 @@ public struct AppFeature { // swiftlint:disable:this type_body_length
 
 // MARK: - Helper
 
-extension AppFeature.Destination.State: Equatable {}
+extension AppFeature.Destination.State: Equatable, Sendable {}
 
 extension SharedModels.Location {
   /// Creates a Location object from an optional ComposableCoreLocation.Location
@@ -514,7 +514,7 @@ extension SharedModels.Coordinate {
 
 private extension Logger {
   /// Using your bundle identifier is a great way to ensure a unique identifier.
-  private static var subsystem = "AppFeature"
+  private static let subsystem = "AppFeature"
 
   /// Logs the view cycles like a view that appeared.
   static let reducer = Logger(

CriticalMapsKit/Sources/AppFeature/RequestTimerFeature.swift

@@ -2,12 +2,8 @@ import ComposableArchitecture
 import Foundation
 
 @Reducer
-public struct RequestTimer {
-  public init(timerInterval: Int = 60) {
-    self.timerInterval = .seconds(timerInterval)
-  }
-
-  let timerInterval: RunLoop.SchedulerTimeType.Stride
+public struct RequestTimer: Sendable {
+  public init() {}
 
   // MARK: State
 

CriticalMapsKit/Sources/AppIntentFeature/ObservationModeIntent.swift

@@ -4,12 +4,12 @@ import SharedModels
 import Sharing
 
 public struct ObservationModeIntent: AppIntent {
-  public static var title = LocalizedStringResource(
+  public static let title = LocalizedStringResource(
     "appIntent.observationMode.title",
     defaultValue: "Toggle Observation Mode",
     bundle: .module
   )
-  public static var description = IntentDescription(
+  public static let description = IntentDescription(
     LocalizedStringResource(
       "appIntent.observationMode.description",
       defaultValue: "Enable or disable observation mode in CriticalMaps",

CriticalMapsKit/Sources/ChatFeature/ChatFeature.swift

@@ -10,7 +10,7 @@ import SharedModels
 import UserDefaultsClient
 
 @Reducer
-public struct ChatFeature {
+public struct ChatFeature: Sendable {
   public init() {}
 
   var md5Uuid: String {
@@ -22,7 +22,7 @@ public struct ChatFeature {
   // MARK: State
 
   @ObservableState
-  public struct State: Equatable {
+  public struct State: Equatable, Sendable {
     public var chatMessages: ContentState<[ChatMessage]>
     public var chatInputState: ChatInput.State
     @Presents public var alert: AlertState<Action.Alert>?
@@ -53,7 +53,7 @@ public struct ChatFeature {
     case chatInput(ChatInput.Action)
     case alert(PresentationAction<Alert>)
 
-    public enum Alert {
+    public enum Alert: Sendable {
       case chat
     }
   }
@@ -159,7 +159,7 @@ public struct ChatFeature {
 
 private extension Logger {
   /// Using your bundle identifier is a great way to ensure a unique identifier.
-  private static var subsystem = "ChatFeature"
+  private static let subsystem = "ChatFeature"
 
   /// Logs the view cycles like a view that appeared.
   static let reducer = Logger(