Remove AlamofireHTTPClient

Author: kolyasev

Cartfile

@@ -1,2 +1 @@
-github "Alamofire/Alamofire" ~> 5.1
 github "mxcl/PromiseKit" ~> 6.13

Cartfile.resolved

@@ -1,2 +1 @@
-github "Alamofire/Alamofire" "5.4.3"
 github "mxcl/PromiseKit" "6.15.3"

Package.resolved

@@ -1,15 +1,6 @@
 {
   "object": {
     "pins": [
-      {
-        "package": "Alamofire",
-        "repositoryURL": "https://github.com/Alamofire/Alamofire.git",
-        "state": {
-          "branch": null,
-          "revision": "fca036f7aeca07124067cb6e0c12b0ad6359e3d4",
-          "version": "5.1.0"
-        }
-      },
       {
         "package": "PromiseKit",
         "repositoryURL": "https://github.com/mxcl/PromiseKit.git",

Package.swift

@@ -18,13 +18,12 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/Alamofire/Alamofire.git", from: "5.1.0"),
         .package(url: "https://github.com/mxcl/PromiseKit.git", from: "6.13.1")
     ],
     targets: [
         .target(
             name: "SwiftJSONRPC",
-            dependencies: ["Alamofire", "PromiseKit"],
+            dependencies: ["PromiseKit"],
             path: "Sources"
         ),
         .testTarget(

Sources/SwiftJSONRPC/RequestExecutor/HTTP/Client/AlamofireHTTPClient.swift

@@ -8,11 +8,9 @@
 
 import Foundation
 
-// ----------------------------------------------------------------------------
+public struct HTTPRequest {
 
-public struct HTTPRequest
-{
-// MARK: - Properties
+    // MARK: - Properties
 
     public var method: HTTPMethod
 
@@ -24,26 +22,19 @@ public struct HTTPRequest
 
 }
 
-// ----------------------------------------------------------------------------
+extension HTTPRequest: Equatable {
 
-extension HTTPRequest: Equatable
-{
-// MARK: - Functions
+    // MARK: - Functions
 
-    public static func ==(lhs: HTTPRequest, rhs: HTTPRequest) -> Bool
-    {
+    public static func ==(lhs: HTTPRequest, rhs: HTTPRequest) -> Bool {
         return lhs.method == rhs.method &&
                lhs.url == rhs.url &&
                lhs.headers == rhs.headers &&
                lhs.body == rhs.body
     }
-
 }
 
-// ----------------------------------------------------------------------------
-
-public enum HTTPMethod: String
-{
+public enum HTTPMethod: String {
     case options = "OPTIONS"
     case get     = "GET"
     case head    = "HEAD"
@@ -54,5 +45,3 @@ public enum HTTPMethod: String
     case trace   = "TRACE"
     case connect = "CONNECT"
 }
-
-// ----------------------------------------------------------------------------

Sources/SwiftJSONRPC/RequestExecutor/HTTP/Client/HTTPRequest.swift

@@ -64,3 +64,18 @@ struct URLSessionHTTPClient: HTTPClient {
     class NoResponseDataError: HTTPClientError { }
 
 }
+
+extension HTTPRequest  {
+
+    // MARK: - Functions
+
+    func asURLRequest() -> URLRequest {
+        var request = URLRequest(url: self.url)
+
+        request.httpMethod = method.rawValue
+        request.allHTTPHeaderFields = headers
+        request.httpBody = body
+
+        return request
+    }
+}

Sources/SwiftJSONRPC/RequestExecutor/HTTP/Client/URLSessionHTTPClient.swift

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name             = "SwiftJSONRPC"
   s.version          = "0.8.0"
-  s.summary          = "Swift JSON-RPC client based on Alamofire"
+  s.summary          = "Swift JSON-RPC 2.0 client"
   s.homepage         = "https://github.com/kolyasev/SwiftJSONRPC"
   s.license          = 'MIT'
   s.author           = { "Denis Kolyasev" => "[email protected]" }
@@ -14,7 +14,6 @@ Pod::Spec.new do |s|
   s.source_files = 'Sources/**/*.swift'
 
   s.frameworks = 'Foundation'
-  s.dependency 'Alamofire', '~> 5.1'
   s.dependency 'PromiseKit', '~> 6.13'
 
   # TODO: Convert to Swift 3.x

SwiftJSONRPC.podspec

@@ -25,7 +25,7 @@ final class HTTPRequestTests: XCTestCase {
         let request = HTTPRequest(method: method, url: url, headers: headers, body: body)
 
         // When
-        let urlRequest: URLRequest! = try? request.asURLRequest()
+        let urlRequest: URLRequest! = request.asURLRequest()
 
         // Then
         XCTAssertNotNil(urlRequest)