Fix build errors with Xcode 15

FlineDev · Jun 6, 2023 · ac22a61 · ac22a61
1 parent c8e6504
commit ac22a61
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/Sources/Microya/Core/ApiError.swift b/Sources/Microya/Core/ApiError.swift
@@ -6,13 +6,13 @@ import FoundationNetworking
 /// Collection of all possible exception that can be thrown when using `JsonApi`.
 public enum ApiError<ClientErrorType: Decodable>: Error, Sendable {
    /// The request was sent, but the server response was not received. Typically an issue with the internet connection.
-   case noResponseReceived(error: Error?)
+   case noResponseReceived(error: (any Error)?)
 
    /// The request was sent and the server responded, but the response did not include any body although a body was requested.
    case noDataInResponse(statusCode: Int)
 
    /// The request was sent and the server responded with a body, but the conversion of the body to the given type failed.
-   case responseDataConversionFailed(type: String, error: Error)
+   case responseDataConversionFailed(type: String, error: any Error)
 
    /// The request was sent and the server responded, but the server reports that something is wrong with the request.
    case clientError(statusCode: Int, clientError: ClientErrorType?)

diff --git a/Sources/Microya/Core/ApiProvider.swift b/Sources/Microya/Core/ApiProvider.swift
@@ -11,7 +11,7 @@ open class ApiProvider<EndpointType: Endpoint> {
    public typealias TypedResult<T: Decodable> = Result<T, ApiError<EndpointType.ClientErrorType>>
 
    /// The lower level Result structure received directly from the native `URLSession` data task calls.
-   public typealias URLSessionResult = (data: Data?, response: URLResponse?, error: Error?)
+   public typealias URLSessionResult = (data: Data?, response: URLResponse?, error: (any Error)?)
 
    /// The plugins to apply per request.
    public let plugins: [Plugin<EndpointType>]
@@ -188,7 +188,7 @@ open class ApiProvider<EndpointType: Endpoint> {
          plugin.willPerformRequest(request, endpoint: endpoint)
       }
 
-      func handleResponse(data: Data?, response: URLResponse?, error: Error?) -> TypedResult<ResultType> {
+      func handleResponse(data: Data?, response: URLResponse?, error: (any Error)?) -> TypedResult<ResultType> {
          let urlSessionResult: URLSessionResult = (data: data, response: response, error: error)
          let typedResult: TypedResult<ResultType> = self.decodeBody(from: urlSessionResult, endpoint: endpoint)
 
@@ -290,7 +290,7 @@ open class ApiProvider<EndpointType: Endpoint> {
          plugin.willPerformRequest(request, endpoint: endpoint)
       }
 
-      func handleDataTaskCompletion(data: Data?, response: URLResponse?, error: Error?) {
+      func handleDataTaskCompletion(data: Data?, response: URLResponse?, error: (any Error)?) {
          let urlSessionResult: URLSessionResult = (data: data, response: response, error: error)
          let typedResult: TypedResult<ResultType> = self.decodeBody(from: urlSessionResult, endpoint: endpoint)
 
@@ -373,7 +373,7 @@ open class ApiProvider<EndpointType: Endpoint> {
       }
    }
 
-   private func mapToClientErrorType(error: Error) -> ApiError<EndpointType.ClientErrorType> {
+   private func mapToClientErrorType(error: any Error) -> ApiError<EndpointType.ClientErrorType> {
       .noResponseReceived(error: error)
    }
 
@@ -518,7 +518,12 @@ extension ApiProvider {
     for plugin in plugins {
        plugin.willPerformRequest(urlRequest, endpoint: endpoint)
     }
-    func handleResponse<ResultType: Decodable>(on endpoint: EndpointType, data: Data?, response: URLResponse?, error: Error?) -> TypedResult<ResultType> {
+     func handleResponse<ResultType: Decodable>(
+        on endpoint: EndpointType,
+        data: Data?,
+        response: URLResponse?,
+        error: (any Error)?
+     ) -> TypedResult<ResultType> {
        let urlSessionResult: URLSessionResult = (data: data, response: response, error: error)
        let typedResult: TypedResult<ResultType> = self.decodeBody(from: urlSessionResult, endpoint: endpoint)
 

diff --git a/Tests/MicroyaTests/Supporting/TestDataStore.swift b/Tests/MicroyaTests/Supporting/TestDataStore.swift
@@ -6,7 +6,7 @@ import FoundationNetworking
 
 enum TestDataStore {
    static var request: URLRequest?
-   static var urlSessionResult: (data: Data?, response: URLResponse?, error: Error?)?
+   static var urlSessionResult: (data: Data?, response: URLResponse?, error: (any Error)?)?
    static var showingProgressIndicator: Bool = false
 
    static func reset() {