upd SwiftFormat rules and github actions and Threading with new AtomicValue

Author: NikSativa

.github/workflows/swift_macos.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - "main"
+      - $default-branch
     paths:
       - ".github/workflows/**"
       - "Package.swift"
@@ -30,7 +31,11 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - xcode: "Xcode_16"
+          - xcode: "Xcode_16.3"
+            runsOn: macOS-15
+            swift: "6.1"
+            outputFilter: xcbeautify --renderer github-actions
+          - xcode: "Xcode_16.0"
             runsOn: macOS-15
             swift: "6.0"
             outputFilter: xcbeautify --renderer github-actions
@@ -43,7 +48,7 @@ jobs:
             swift: "5.9"
             outputFilter: xcbeautify --renderer github-actions
     steps:
-      - uses: NeedleInAJayStack/setup-swift@feat/swift-6 # swift-actions/setup-swift@main
+      - uses: swift-actions/setup-swift@v2
         with:
           swift-version: ${{ matrix.swift }}
       - uses: actions/checkout@v4

Package.swift

@@ -16,8 +16,8 @@ let package = Package(
         .library(name: "SmartNetwork", targets: ["SmartNetwork"])
     ],
     dependencies: [
-        .package(url: "https://github.com/NikSativa/SpryKit.git", .upToNextMinor(from: "3.0.2")),
-        .package(url: "https://github.com/NikSativa/Threading.git", .upToNextMinor(from: "2.1.1"))
+        .package(url: "https://github.com/NikSativa/SpryKit.git", from: "3.0.4"),
+        .package(url: "https://github.com/NikSativa/Threading.git", from: "2.2.0")
     ],
     targets: [
         .target(name: "SmartNetwork",

Package@swift-5.9.swift

@@ -16,8 +16,8 @@ let package = Package(
         .library(name: "SmartNetwork", targets: ["SmartNetwork"])
     ],
     dependencies: [
-        .package(url: "https://github.com/NikSativa/SpryKit.git", .upToNextMinor(from: "3.0.2")),
-        .package(url: "https://github.com/NikSativa/Threading.git", .upToNextMinor(from: "2.1.1"))
+        .package(url: "https://github.com/NikSativa/SpryKit.git", from: "3.0.4"),
+        .package(url: "https://github.com/NikSativa/Threading.git", from: "2.2.0")
     ],
     targets: [
         .target(name: "SmartNetwork",

Source/Address/AddressDetails+URL.swift

@@ -38,7 +38,7 @@ internal extension AddressDetails {
             components.queryItems = result
         }
 
-        if let fragment = fragment {
+        if let fragment {
             components.fragment = fragment
         }
 

Source/Address/AddressDetails.swift

@@ -100,12 +100,14 @@ private extension AddressDetails {
             path.isEmpty ? nil : "/",
             path.joined(separator: "/"),
             queryItems.isEmpty ? nil : "?",
-            queryItems.mapToDescription().map {
-                if let value = $0.value {
-                    return "\($0.key)=\(value)"
+            queryItems.mapToDescription()
+                .map {
+                    if let value = $0.value {
+                        return "\($0.key)=\(value)"
+                    }
+                    return $0.key
                 }
-                return $0.key
-            }.joined(separator: "&"),
+                .joined(separator: "&"),
             fragment.map { "#\($0)" }
         ]
 

Source/CURLConvertible.swift

@@ -72,6 +72,7 @@ public extension CURLConvertible {
                     guard let user = credential.user, let password = credential.password else {
                         continue
                     }
+
                     components.append("-u \(user):\(password)")
                 }
             }
@@ -114,14 +115,14 @@ public extension CURLConvertible {
         }
 
         if let httpBodyData = request.httpBody {
-            let httpBody: String
-            if prettyPrinted,
-               let json = try? JSONSerialization.jsonObject(with: httpBodyData),
-               let prettyData = try? JSONSerialization.data(withJSONObject: json, options: [.prettyPrinted, .sortedKeys, .withoutEscapingSlashes]) {
-                httpBody = .init(decoding: prettyData, as: UTF8.self)
-            } else {
-                httpBody = .init(decoding: httpBodyData, as: UTF8.self)
-            }
+            let httpBody: String =
+                if prettyPrinted,
+                let json = try? JSONSerialization.jsonObject(with: httpBodyData),
+                let prettyData = try? JSONSerialization.data(withJSONObject: json, options: [.prettyPrinted, .sortedKeys, .withoutEscapingSlashes]) {
+                    .init(decoding: prettyData, as: UTF8.self)
+                } else {
+                    .init(decoding: httpBodyData, as: UTF8.self)
+                }
 
             components.append("-d '\(httpBody)'")
         }

Source/Content/DecodableContent.swift

@@ -29,12 +29,12 @@ struct DecodableContent<Response: Decodable>: Deserializable {
 
             do {
                 let decoder = decoder?() ?? .init()
-                let result: Response
-                if keyPath.path.isEmpty {
-                    result = try decoder.decode(Response.self, from: data)
-                } else {
-                    result = try data.decode(Response.self, keyPath: keyPath.path, decoder: decoder)
-                }
+                let result: Response =
+                    if keyPath.path.isEmpty {
+                        try decoder.decode(Response.self, from: data)
+                    } else {
+                        try data.decode(Response.self, keyPath: keyPath.path, decoder: decoder)
+                    }
                 return .success(result)
             } catch {
                 switch keyPath.fallback {

Source/Error/RequestDecodingError.swift

@@ -30,14 +30,19 @@ extension RequestDecodingError: RequestErrorDescription {
         case .other(let encodingError):
             let description = (encodingError as NSError).description
             return ".other(\(description))"
+
         case .brokenImage:
             return "brokenImage"
+
         case .brokenResponse:
             return "brokenResponse"
+
         case .nilResponse:
             return "nilResponse"
+
         case .emptyResponse:
             return "emptyResponse"
+
         case .brokenKeyPath(let key):
             return "brokenKeyPath(\(key))"
         }

Source/Error/RequestEncodingError.swift

@@ -31,14 +31,19 @@ extension RequestEncodingError: RequestErrorDescription {
         case .other(let encodingError):
             let description = (encodingError as NSError).description
             return ".other(\(description))"
+
         case .brokenURL:
             return "brokenURL"
+
         case .brokenAddress:
             return "brokenAddress"
+
         case .brokenHost:
             return "brokenHost"
+
         case .cantEncodeImage:
             return "cantEncodeImage"
+
         case .invalidJSON:
             return "invalidJSON"
         }

Source/Error/RequestError.swift

@@ -65,20 +65,25 @@ extension RequestError: RequestErrorDescription {
         switch self {
         case .generic:
             return "generic"
+
         case .other(let error):
-            let description: String
-            if let subname = (error as? RequestErrorDescription)?.subname {
-                description = subname
-            } else {
-                description = (error as NSError).description
-            }
+            let description: String =
+                if let subname = (error as? RequestErrorDescription)?.subname {
+                    subname
+                } else {
+                    (error as NSError).description
+                }
             return "other(\(description))"
+
         case .connection(let error):
             return "connection(URLError \(error.code.rawValue))"
+
         case .encoding(let error):
             return "encoding(.\(error.subname))"
+
         case .decoding(let error):
             return "decoding(.\(error.subname))"
+
         case .statusCode(let error):
             return "statusCode(.\(error.subname))"
         }