Removing dependency on AlamoFire.

Author: Ruben Nine

CHANGELOG.md

@@ -1,6 +1,10 @@
 Change Log
 ==========
 
+Version 2.6.0 *TBD*
+----------------------------
+- Removed dependency on `AlamoFire`.
+
 Version 2.5.2 *(2020-11-12)*
 ----------------------------
 - Changed transformable store request to use GET instead of POST.

FilestackSDK.podspec

@@ -14,5 +14,4 @@ Pod::Spec.new do |spec|
   spec.public_header_files = 'Sources/**/*.h'
 
   spec.swift_versions = [4.2, 5.2]
-  spec.dependency 'Alamofire', '~> 4.9'
 end

FilestackSDK.xcodeproj/project.pbxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1240"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

FilestackSDK.xcodeproj/xcshareddata/xcschemes/FilestackSDK.xcscheme

@@ -14,13 +14,12 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/Alamofire/Alamofire.git", .upToNextMajor(from: Version(4, 9, 0))),
         .package(url: "https://github.com/AliSoftware/OHHTTPStubs.git", .upToNextMajor(from: Version(9, 0, 0)))
     ],
     targets: [
         .target(
             name: "FilestackSDK",
-            dependencies: ["Alamofire", "ObjcDefs"],
+            dependencies: ["ObjcDefs"],
             resources: [
                 .copy("VERSION")
             ]

Package.resolved

@@ -34,7 +34,7 @@ platform :ios, '11.0'
 use_frameworks!
 
 target '<Your Target Name>' do
-    pod 'FilestackSDK', '~> 2.5.2'
+    pod 'FilestackSDK', '~> 2.6.0'
 end
 ```
 
@@ -57,9 +57,9 @@ $ brew install carthage
 
 To integrate FilestackSDK into your Xcode project using Carthage, specify it in your `Cartfile`:
 
-`github "filestack/filestack-swift" ~> 2.5.2`
+`github "filestack/filestack-swift" ~> 2.6.0`
 
-Run `carthage update` to build the framework and drag the built `FilestackSDK.framework` into your Xcode project. Additionally, add  `Alamofire.framework`  to the embedded frameworks build phase of your app's target.
+Run `carthage update` to build the framework and drag the built `FilestackSDK.framework` into your Xcode project.
 
 ### Swift Package Manager
 
@@ -69,7 +69,7 @@ Alternatively, if you are adding `FilestackSDK` to your own Swift Package, decla
 
 ```swift
 dependencies: [
-    .package(url: "https://github.com/filestack/filestack-swift.git", .upToNextMajor(from: "2.5.2"))
+    .package(url: "https://github.com/filestack/filestack-swift.git", .upToNextMajor(from: "2.6.0"))
 ]
 ```
 
@@ -87,7 +87,6 @@ Add FilestackSDK and its dependencies as git submodules by running the following
 
 ```shell
 $ git submodule add https://github.com/filestack/filestack-swift.git
-$ git submodule add https://github.com/Alamofire/Alamofire.git
 ```
 
 Open the new `filestack-swift` folder, and drag the `FilestackSDK.xcodeproj` into the Project Navigator of your application's Xcode project.
@@ -101,8 +100,6 @@ In the tab bar at the top of that window, open the "General" panel.
 
 Click on the + button under the "Embedded Binaries" section and choose the `FilestackSDK.framework` for iOS.
 
-Repeat the same process for adding `Alamofire`.
-
 ## Usage
 
 <details>

Package.swift

@@ -6,7 +6,6 @@
 //  Copyright © 2019 Filestack. All rights reserved.
 //
 
-import Alamofire
 import Foundation
 
 extension NetworkingServiceWithBaseURL {
@@ -23,7 +22,9 @@ extension NetworkingServiceWithBaseURL {
 
         guard var urlComponents = URLComponents(url: url, resolvingAgainstBaseURL: false) else { return nil }
 
-        urlComponents.queryItems = queryItems
+        if let queryItems = queryItems {
+            urlComponents.queryItems = queryItems
+        }
 
         if let security = security {
             if urlComponents.queryItems == nil {
@@ -34,10 +35,10 @@ extension NetworkingServiceWithBaseURL {
             urlComponents.queryItems?.append(URLQueryItem(name: "signature", value: security.signature))
         }
 
-        return try? urlComponents.asURL()
+        return urlComponents.url
     }
 
-    func request(url: URL, method: HTTPMethod, parameters: [String: Any]? = nil, headers: HTTPHeaders? = nil) -> DataRequest? {
-        return sessionManager.request(url, method: method, parameters: parameters, headers: headers)
+    func parametersToQueryItems(parameters: [String: Any]) -> [URLQueryItem] {
+        return parameters.compactMap { URLQueryItem(name: $0.key, value: $0.value as? String) }
     }
 }

README.md

@@ -1,21 +1,20 @@
 //
-//  SessionManager+filestackDefault.swift
+//  URLSession+filestackDefault.swift
 //  FilestackSDK
 //
 //  Created by Ruben Nine on 7/5/17.
 //  Copyright © 2017 Filestack. All rights reserved.
 //
 
-import Alamofire
 import Foundation
 
 #if SWIFT_PACKAGE
 #else
 private class BundleFinder {}
 #endif
 
-extension SessionManager {
-    static func filestack(background: Bool = false) -> SessionManager {
+extension URLSession {
+    static func filestack(background: Bool = false, delegate: URLSessionDelegate? = nil) -> URLSession {
         let configuration: URLSessionConfiguration
 
         if background {
@@ -30,15 +29,15 @@ extension SessionManager {
         configuration.httpShouldUsePipelining = true
         configuration.httpAdditionalHeaders = customHTTPHeaders
 
-        return SessionManager(configuration: configuration)
+        return URLSession(configuration: configuration, delegate: delegate, delegateQueue: nil)
     }
 }
 
 // MARK: - Private Functions
 
-private extension SessionManager {
-    static var customHTTPHeaders: HTTPHeaders {
-        var defaultHeaders = SessionManager.defaultHTTPHeaders
+private extension URLSession {
+    static var customHTTPHeaders: [String: String] {
+        var defaultHeaders: [String: String] = [:]
 
         defaultHeaders["User-Agent"] = "filestack-swift \(shortVersionString)"
         defaultHeaders["Filestack-Source"] = "Swift-\(shortVersionString)"

Sources/FilestackSDK/Internal/Extensions/NetworkingServiceWithBaseURL+buildURL.swift

@@ -6,7 +6,6 @@
 //  Copyright © 2017 Filestack. All rights reserved.
 //
 
-import Alamofire
 import Foundation
 
 class CommitPartUploadOperation: BaseOperation<HTTPURLResponse> {
@@ -56,17 +55,12 @@ private extension CommitPartUploadOperation {
 
         retrier = .init(attempts: Defaults.maxRetries, label: uploadURL.relativePath) { (semaphore) -> HTTPURLResponse? in
             var httpURLResponse: HTTPURLResponse?
-            let headers: HTTPHeaders = ["Content-Type": "application/json"]
+            let headers = ["Content-Type": "application/json"]
 
-            guard
-                let payload = self.payload(),
-                let request = UploadService.shared.upload(data: payload, to: uploadURL, method: .post, headers: headers)
-            else {
-                return nil
-            }
+            guard let payload = self.payload() else { return nil }
 
-            request.responseJSON { (response) in
-                httpURLResponse = response.response
+            UploadService.shared.upload(data: payload, to: uploadURL, method: "POST", headers: headers) { (data, response, error) in
+                httpURLResponse = response as? HTTPURLResponse
                 semaphore.signal()
             }