Switch to Swift 5.9

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Changelog
 
 ## [Unreleased]
+* [#61](https://github.com/blackjacx/assist/pull/61): Switch to Swift 5.9 - [@Blackjacx](https://github.com/blackjacx).
 
 ## [0.4.1] - 2023-08-24Z
 * Add log to show which tester is processed - [@Blackjacx](https://github.com/blackjacx).

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.8
+// swift-tools-version:5.9
 import PackageDescription
 
 let package = Package(

Sources/Core/Logger.swift

@@ -63,17 +63,17 @@ public extension Logger {
 
         var name: String {
             switch self {
-            case .warn: return "Warn"
-            case .info: return "Info"
-            case .error: return "Error"
+            case .warn: "Warn"
+            case .info: "Info"
+            case .error: "Error"
             }
         }
 
         var emoji: String {
             switch self {
-            case .warn: return "🟡"
-            case .info: return "🟢"
-            case .error: return "🔴"
+            case .warn: "🟡"
+            case .info: "🟢"
+            case .error: "🔴"
             }
         }
     }

Sources/Core/Networking/JSONWebToken.swift

@@ -32,10 +32,9 @@ public struct JSONWebToken {
     }
 
     public static func token(for service: Service) async throws -> String {
-
         switch service {
-        case .apns(let credentials): return try token(credentials: credentials)
-        case .fcm(let credentials): return try await token(credentials: credentials)
+        case .apns(let credentials): try token(credentials: credentials)
+        case .fcm(let credentials): try await token(credentials: credentials)
         }
     }
 

Sources/Core/Shell/Xcodebuild.swift

@@ -46,8 +46,8 @@ public struct Xcodebuild {
 
         var name: String {
             switch self {
-            case .buildForTesting: return "build-for-testing"
-            case .testWithoutBuilding: return "test-without-building"
+            case .buildForTesting: "build-for-testing"
+            case .testWithoutBuilding: "test-without-building"
             }
         }
     }

Sources/Push/PushEndpoint.swift

@@ -22,36 +22,35 @@ extension PushEndpoint: Endpoint {
 
     var host: String {
         switch self {
-        case .pushViaApns(_, let endpoint, _, _, _): return endpoint.host
-        case .pushViaFcm: return "fcm.googleapis.com"
+        case .pushViaApns(_, let endpoint, _, _, _): endpoint.host
+        case .pushViaFcm: "fcm.googleapis.com"
         }
     }
 
     var port: Int? {
         switch self {
-        case .pushViaApns: return 443
-        case .pushViaFcm: return nil
+        case .pushViaApns: 443
+        case .pushViaFcm: nil
         }
     }
 
     var path: String {
         switch self {
-        case let .pushViaApns(_, _, deviceToken, _, _): return "/3/device/\(deviceToken)"
-        case let .pushViaFcm(_, _, credentials): return "/v1/projects/\(credentials.projectId)/messages:send"
+        case let .pushViaApns(_, _, deviceToken, _, _): "/3/device/\(deviceToken)"
+        case let .pushViaFcm(_, _, credentials):  "/v1/projects/\(credentials.projectId)/messages:send"
         }
     }
 
     var queryItems: [URLQueryItem] {
         switch self {
-        case .pushViaApns: return []
-        case .pushViaFcm: return []
+        case .pushViaApns: []
+        case .pushViaFcm: []
         }
     }
 
     var method: HTTPMethod {
         switch self {
-        case .pushViaApns, .pushViaFcm:
-            return .post
+        case .pushViaApns, .pushViaFcm: .post
         }
     }
 
@@ -100,16 +99,20 @@ extension PushEndpoint: Endpoint {
     var parameters: [String : Any]? {
         switch self {
         case let .pushViaApns(_, _, _, _, message):
-            return ["aps": ["alert": message]]
+            [
+                "aps": [
+                        "alert": message
+                ]
+            ]
         case let .pushViaFcm(deviceToken, message, _):
-            return [
+            [
                 "message": [
                     "notification": [
                         "title": "Hello FCM",
                         "body": message
                     ],
                     "token": deviceToken
-                ] as [String: Any]
+                ]
             ]
         }
     }

Sources/Push/commands/sub/Apns.swift

@@ -19,8 +19,8 @@ extension Push {
 
             var host: String {
                 switch self {
-                case .sandbox: return "api.sandbox.push.apple.com"
-                case .production: return "api.push.apple.com"
+                case .sandbox: "api.sandbox.push.apple.com"
+                case .production: "api.push.apple.com"
                 }
             }
         }