Swift 6

.swiftpm/Networking.xctestplan

@@ -0,0 +1,25 @@
+{
+  "configurations" : [
+    {
+      "id" : "1F7E75BB-2848-40A3-B102-03A60E30171E",
+      "name" : "Test Scheme Action",
+      "options" : {
+
+      }
+    }
+  ],
+  "defaultOptions" : {
+
+  },
+  "testTargets" : [
+    {
+      "parallelizable" : false,
+      "target" : {
+        "containerPath" : "container:",
+        "identifier" : "NetworkingTests",
+        "name" : "NetworkingTests"
+      }
+    }
+  ],
+  "version" : 1
+}

.swiftpm/xcode/xcshareddata/xcschemes/Networking.xcscheme

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1600"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "Networking"
+               BuildableName = "Networking"
+               BlueprintName = "Networking"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:.swiftpm/Networking.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "NetworkingTests"
+               BuildableName = "NetworkingTests"
+               BlueprintName = "NetworkingTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "Networking"
+            BuildableName = "Networking"
+            BlueprintName = "Networking"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.9
+// swift-tools-version:6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -12,3 +12,10 @@ let package = Package(
         .testTarget(name: "NetworkingTests", dependencies: ["Networking"])
     ]
 )
+
+
+// TODO handle retries
+// Amy -> Use plain Sendable for json over JSON
+// Put back Combine tests
+// try out in real app (Swift 6)
+

Sources/Networking/Calls/JSON.swift

@@ -0,0 +1,41 @@
+//
+//  JSON.swift
+//  Networking
+//
+//  Created by Sacha Durand Saint Omer on 26/09/2024.
+//
+
+import Foundation
+
+public struct JSON: Sendable, CustomStringConvertible {
+
+    let array: [any Sendable]?
+    let dictionary: [String: any Sendable]?
+
+    init(jsonObject: Any) {
+        if let arr = jsonObject as? [Sendable] {
+            array = arr
+            dictionary = nil
+        } else if let dic = jsonObject as? [String: any Sendable] {
+            dictionary = dic
+            array = nil
+        } else {
+            array = nil
+            dictionary = nil
+        }
+    }
+
+    public var value: Any {
+        return array ?? dictionary ?? ""
+    }
+
+    public var description: String {
+        if let array = array {
+            return String(describing: array)
+        } else if let dictionary = dictionary {
+            return String(describing: dictionary)
+        }
+        return "empty"
+    }
+
+}

Sources/Networking/Calls/NetworkingClient+Data.swift

@@ -6,62 +6,40 @@
 //
 
 import Foundation
-import Combine
-
-public extension NetworkingClient {
-
-    func get(_ route: String, params: Params = Params()) -> AnyPublisher<Data, Error> {
-        request(.get, route, params: params).publisher()
-    }
-
-    func post(_ route: String, params: Params = Params()) -> AnyPublisher<Data, Error> {
-        request(.post, route, params: params).publisher()
-    }
-
-    func post(_ route: String, body: Encodable) -> AnyPublisher<Data, Error> {
-        request(.post, route, encodableBody: body).publisher()
-    }
-
-    func put(_ route: String, params: Params = Params()) -> AnyPublisher<Data, Error> {
-        request(.put, route, params: params).publisher()
-    }
-
-    func patch(_ route: String, params: Params = Params()) -> AnyPublisher<Data, Error> {
-        request(.patch, route, params: params).publisher()
-    }
-
-    func patch(_ route: String, body: Encodable) -> AnyPublisher<Data, Error> {
-        request(.patch, route, encodableBody: body).publisher()
-    }
-
-    func delete(_ route: String, params: Params = Params()) -> AnyPublisher<Data, Error> {
-        request(.delete, route, params: params).publisher()
-    }
-}
 
 public extension NetworkingClient {
 
     func get(_ route: String, params: Params = Params()) async throws -> Data {
-        try await request(.get, route, params: params).execute()
+        try await request(.get, route: route, params: params)
     }
 
     func post(_ route: String, params: Params = Params()) async throws -> Data {
-        try await request(.post, route, params: params).execute()
+        try await request(.post, route: route, params: params)
     }
 
-    func post(_ route: String, body: Encodable) async throws -> Data {
-        try await request(.post, route, encodableBody: body).execute()
+    func post(_ route: String, body: Encodable & Sendable) async throws -> Data {
+        try await request(.post, route: route, body: body)
     }
 
     func put(_ route: String, params: Params = Params()) async throws -> Data {
-        try await request(.put, route, params: params).execute()
+        try await request(.put, route: route, params: params)
     }
 
     func patch(_ route: String, params: Params = Params()) async throws -> Data {
-        try await request(.patch, route, params: params).execute()
+        try await request(.patch, route: route, params: params)
     }
 
     func delete(_ route: String, params: Params = Params()) async throws -> Data {
-        try await request(.delete, route, params: params).execute()
+        try await request(.delete, route: route, params: params)
+    }
+
+    func request(_ httpMethod: HTTPMethod, route: String, params: Params = Params(), body: (Encodable & Sendable)? = nil) async throws -> Data {
+        try await beforeRequest(self)
+        let request = createRequest(httpMethod, route, params: params, body: body)
+        do {
+            return try await execute(request: request)
+        } catch {
+            throw mapError(error)
+        }
     }
 }