chore: use official swift-format

.github/workflows/lint.yml

@@ -9,35 +9,28 @@ on:
   pull_request:
     branches:
       - main
-  push:
-    branches:
-      - main
 
 jobs:
-  swiftlint:
-    runs-on: ubuntu-latest
-    container:
-      image: swift:5.10-noble
+  lint:
+    runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Set Up swiftlint
-        run: |
-          sudo apt-get update && sudo apt-get install -y unzip curl
-          unzip ci/swiftlint.zip -d /usr/local/bin/
-          chmod +x /usr/local/bin/swiftlint
-      - name: Lint Using swiftlint
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Set Up SwiftLint
+        run: brew install swiftlint
+
+      - name: Lint Using SwiftLint
         run: swiftlint lint --strict .
 
-  swiftformat:
-    runs-on: ubuntu-latest
-    container:
-      image: swift:5.10-noble
+  format:
+    runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Set Up swiftformat
-        run: |
-          sudo apt-get update && sudo apt-get install -y unzip curl
-          unzip ci/swiftformat.zip -d /usr/local/bin/
-          chmod +x /usr/local/bin/swiftformat
-      - name: Lint Using swiftformat
-        run: swiftformat --lint .
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Set Up swift-format
+        run: brew install swift-format
+
+      - name: Lint Using swift-format
+        run: swift format lint -r .

.swift-format

@@ -0,0 +1,7 @@
+{
+  "version": 1,
+  "lineLength": 120,
+  "indentation": {
+    "spaces": 4
+  }
+}

Package.swift

@@ -6,7 +6,7 @@ let package = Package(
     name: "VoltaserveCore",
     platforms: [
         .iOS(.v13),
-        .macOS(.v12)
+        .macOS(.v12),
     ],
     products: [
         .library(
@@ -24,6 +24,6 @@ let package = Package(
             dependencies: ["VoltaserveCore"],
             path: "Tests",
             resources: [.process("Resources")]
-        )
+        ),
     ]
 )

Sources/Account.swift

@@ -4,6 +4,7 @@
 // included in the file LICENSE in the root of this repository.
 
 import Foundation
+
 #if canImport(FoundationNetworking)
     import FoundationNetworking
 #endif
@@ -53,7 +54,8 @@ public struct VOAccount {
     }
 
     public func sendResetPasswordEmail(_ options: SendResetPasswordEmailOptions) async throws {
-        try await withCheckedThrowingContinuation { (continuation: CheckedContinuation<Void, any Error>) in
+        try await withCheckedThrowingContinuation {
+            (continuation: CheckedContinuation<Void, any Error>) in
             var request = URLRequest(url: urlForSendPasswordEmail())
             request.httpMethod = "POST"
             request.setJSONBody(options, continuation: continuation)
@@ -70,7 +72,8 @@ public struct VOAccount {
     }
 
     public func resetPassword(_ options: ResetPasswordOptions) async throws {
-        try await withCheckedThrowingContinuation { (continuation: CheckedContinuation<Void, any Error>) in
+        try await withCheckedThrowingContinuation {
+            (continuation: CheckedContinuation<Void, any Error>) in
             var request = URLRequest(url: urlForResetPassword())
             request.httpMethod = "POST"
             request.setJSONBody(options, continuation: continuation)
@@ -87,7 +90,8 @@ public struct VOAccount {
     }
 
     public func confirmEmail(_ options: ConfirmEmailOptions) async throws {
-        try await withCheckedThrowingContinuation { (continuation: CheckedContinuation<Void, any Error>) in
+        try await withCheckedThrowingContinuation {
+            (continuation: CheckedContinuation<Void, any Error>) in
             var request = URLRequest(url: urlForConfirmEmail())
             request.httpMethod = "POST"
             request.setJSONBody(options, continuation: continuation)
@@ -174,7 +178,9 @@ public struct VOAccount {
         public let minNumbers: Int
         public let minSymbols: Int
 
-        public init(minLength: Int, minLowercase: Int, minUppercase: Int, minNumbers: Int, minSymbols: Int) {
+        public init(
+            minLength: Int, minLowercase: Int, minUppercase: Int, minNumbers: Int, minSymbols: Int
+        ) {
             self.minLength = minLength
             self.minLowercase = minLowercase
             self.minUppercase = minUppercase

Sources/Common/Error.swift

@@ -69,7 +69,8 @@ public struct VOErrorResponse: Decodable, Error {
         case userNotAllowedToDeleteInvitation = "user_not_allowed_to_delete_invitation"
         case userAlreadyMemberOfOrganization = "user_already_member_of_organization"
         case invalidApiKey = "invalid_api_key"
-        case pathVariablesAndBodyParametersNotConsistent = "path_variables_and_body_parameters_not_consistent"
+        case pathVariablesAndBodyParametersNotConsistent =
+            "path_variables_and_body_parameters_not_consistent"
 
         /* IdP */
         case usernameUnavailable = "username_unavailable"

Sources/Common/Request.swift

@@ -4,6 +4,7 @@
 // included in the file LICENSE in the root of this repository.
 
 import Foundation
+
 #if canImport(FoundationNetworking)
     import FoundationNetworking
 #endif
@@ -30,13 +31,15 @@ func handleJSONResponse<T: Decodable>(
             return
         }
         let stringData = String(data: data, encoding: .utf8)
-        if (200 ... 299).contains(httpResponse.statusCode) {
+        if (200...299).contains(httpResponse.statusCode) {
             do {
                 let result = try JSONDecoder().decode(T.self, from: data)
                 continuation.resume(returning: result)
             } catch {
                 if let stringData {
-                    print("Failed to decode JSON: \(stringData), error: \(error.localizedDescription)")
+                    print(
+                        "Failed to decode JSON: \(stringData), error: \(error.localizedDescription)"
+                    )
                 } else {
                     print("Failed to decode JSON with error: \(error.localizedDescription)")
                 }
@@ -45,9 +48,13 @@ func handleJSONResponse<T: Decodable>(
         } else {
             if let stringData {
                 // swiftlint:disable:next line_length
-                print("Request to URL: \(httpResponse.url!), failed with status code: \(httpResponse.statusCode), data: \(stringData)")
+                print(
+                    "Request to URL: \(httpResponse.url!), failed with status code: \(httpResponse.statusCode), data: \(stringData)"
+                )
             } else {
-                print("Request to URL: \(httpResponse.url!), failed with status code: \(httpResponse.statusCode)")
+                print(
+                    "Request to URL: \(httpResponse.url!), failed with status code: \(httpResponse.statusCode)"
+                )
             }
             handleErrorResponse(continuation: continuation, data: data)
         }
@@ -71,7 +78,7 @@ func handleDataResponse(
             continuation.resume(throwing: VONoDataError())
             return
         }
-        if (200 ... 299).contains(httpResponse.statusCode) {
+        if (200...299).contains(httpResponse.statusCode) {
             continuation.resume(returning: data)
         } else {
             handleErrorResponse(continuation: continuation, data: data)
@@ -96,7 +103,7 @@ func handleEmptyResponse(
             continuation.resume(throwing: VONoDataError())
             return
         }
-        if (200 ... 299).contains(httpResponse.statusCode) {
+        if (200...299).contains(httpResponse.statusCode) {
             continuation.resume()
         } else {
             handleErrorResponse(continuation: continuation, data: data)

Sources/Common/URLRequest+AuthHeader.swift

@@ -4,6 +4,7 @@
 // included in the file LICENSE in the root of this repository.
 
 import Foundation
+
 #if canImport(FoundationNetworking)
     import FoundationNetworking
 #endif

Sources/Common/URLRequest+JSON.swift

@@ -4,12 +4,15 @@
 // included in the file LICENSE in the root of this repository.
 
 import Foundation
+
 #if canImport(FoundationNetworking)
     import FoundationNetworking
 #endif
 
 extension URLRequest {
-    mutating func setJSONBody(_ body: Encodable, continuation: CheckedContinuation<some Any, any Error>) {
+    mutating func setJSONBody(
+        _ body: Encodable, continuation: CheckedContinuation<some Any, any Error>
+    ) {
         setValue("application/json", forHTTPHeaderField: "Content-Type")
         do {
             httpBody = try JSONEncoder().encode(body)

Sources/File+Wait.swift

@@ -5,8 +5,8 @@
 
 import Foundation
 
-public extension VOFile {
-    func wait(_ id: String, sleepSeconds: UInt32 = 1) async throws -> Entity {
+extension VOFile {
+    public func wait(_ id: String, sleepSeconds: UInt32 = 1) async throws -> Entity {
         var file: Entity
         repeat {
             file = try await fetch(id)