Support Swift 5.0 (#123)

* Update Swish for Swift 5.0.

Using the latest Quick and Nimble was pretty much the only code change
required.

We no longer need a framework for Result (even though this is was a good
one). It's included in the standard library now, so the only thing we
needed was an extension to add value and error to keep the tests happy
(and anyone who was depending on those in their code).

* Adjust from feedback.

Needed to ignore a new file and I was incorrectly creating a new decoder
in my fix (not sure how this worked in my tests like this).

* Removing the need for Result.

Now that Swift 5 provides this, we don't need it.

* Eliminate Result extension.

This caused the compiler to crash initially because there's so much type
inferrence going on in the tests that it couldn't even report errors. I
think I got it worked out to keep the intent behind the test without
having the `value` and `error` fields.

.gitignore

@@ -35,4 +35,3 @@ Carthage/Build
 .idea/
 *.iml
 
-Argo.framework.zip

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "Carthage/Checkouts/Result"]
-	path = Carthage/Checkouts/Result
-	url = https://github.com/antitypical/Result.git
 [submodule "Carthage/Checkouts/Nimble"]
 	path = Carthage/Checkouts/Nimble
 	url = https://github.com/Quick/Nimble.git

Cartfile

@@ -1 +0,0 @@
-github "antitypical/Result" ~> 4.0

Cartfile.private

@@ -1,2 +1,2 @@
-github "Quick/Quick" ~> 1.3
-github "Quick/Nimble" ~> 7.0
+github "Quick/Quick" ~> 2.0
+github "Quick/Nimble" ~> 8.0

Cartfile.resolved

@@ -1,3 +1,2 @@
-github "Quick/Nimble" "v7.3.1"
-github "Quick/Quick" "v1.3.2"
-github "antitypical/Result" "4.0.0"
+github "Quick/Nimble" "v8.0.1"
+github "Quick/Quick" "v2.1.0"

Source/Models/APIClient.swift

@@ -1,5 +1,4 @@
 import Foundation
-import Result
 
 public struct APIClient {
   fileprivate let requestPerformer: RequestPerformer

Source/Models/NetworkRequestPerformer.swift

@@ -1,5 +1,4 @@
 import Foundation
-import Result
 
 public struct NetworkRequestPerformer: RequestPerformer {
   fileprivate let session: URLSession

Source/Protocols/Client.swift

@@ -1,5 +1,4 @@
 import Foundation
-import Result
 
 public protocol Client {
   @discardableResult

Source/Protocols/Request.swift

@@ -1,5 +1,4 @@
 import Foundation
-import Result
 
 public typealias EmptyResponse = Void
 

Source/Protocols/RequestPerformer.swift

@@ -1,5 +1,4 @@
 import Foundation
-import Result
 
 public protocol RequestPerformer {
   @discardableResult

Swish.xcodeproj/xcshareddata/xcschemes/Swish-Mac.xcscheme

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

Swish.xcodeproj/xcshareddata/xcschemes/Swish-iOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      codeCoverageEnabled = "YES"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference

Swish.xcodeproj/xcshareddata/xcschemes/Swish-tvOS.xcscheme

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

Swish.xcodeproj/xcshareddata/xcschemes/Swish-watchOS.xcscheme

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

Swish.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

SwishExamples.playground/Contents.swift

@@ -1,6 +1,5 @@
 import PlaygroundSupport
 import Swish
-import Result
 
 PlaygroundPage.current.needsIndefiniteExecution = true
 

SwishExamples.playground/playground.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

Tests/Fakes/FakeRequest.swift

@@ -1,6 +1,5 @@
 import Foundation
 import Swish
-import Result
 
 struct FakeRequest: Request {
   typealias ResponseObject = String

Tests/Fakes/FakeRequestPerformer.swift

@@ -1,6 +1,5 @@
 import Foundation
 import Swish
-import Result
 
 enum ResponseData {
   case data(Data)

Tests/Helpers/NimbleMatchers.swift

@@ -1,5 +1,4 @@
 import Nimble
-import Result
 
 public func beVoid() -> MatcherFunc<Void> {
   return MatcherFunc { actualExpression, failureMessage in

Tests/Tests/APIClientSpec.swift

@@ -1,7 +1,6 @@
 import Swish
 import Quick
 import Nimble
-import Result
 
 class APIClientSpec: QuickSpec {
   override func spec() {
@@ -32,8 +31,8 @@ class APIClientSpec: QuickSpec {
                 var result: Result<String, SwishError>?
 
                 client.perform(request) { result = $0 }
-
-                expect(result?.value).toEventually(equal("hello world"))
+                
+                expect { try result?.get() }.toEventually(equal("hello world"))
               }
             }
 
@@ -45,10 +44,12 @@ class APIClientSpec: QuickSpec {
                 )
 
                 let client = APIClient(requestPerformer: performer)
-                var error: Error?
+                var error: SwishError?
 
-                client.perform(request) {
-                  error = $0.error
+                client.perform(request) { result in
+                  if case let .failure(resultError) = result {
+                    error = resultError
+                  }
                 }
 
                 expect(error).toEventually(matchError(SwishError.self))
@@ -66,8 +67,8 @@ class APIClientSpec: QuickSpec {
                 var result: Result<EmptyResponse, SwishError>?
 
                 client.perform(request) { result = $0 }
-
-                expect(result?.value).toEventually(beVoid())
+                
+                expect { try result?.get() }.toEventually(beVoid())
               }
             }
 
@@ -82,8 +83,8 @@ class APIClientSpec: QuickSpec {
                 var result: Result<EmptyResponse, SwishError>?
 
                 client.perform(request) { result = $0 }
-
-                expect(result?.value).toEventually(beVoid())
+                
+                expect { try result?.get() }.toEventually(beVoid())
               }
             }
           }
@@ -119,13 +120,13 @@ class APIClientSpec: QuickSpec {
           )
 
           let client = APIClient(requestPerformer: performer)
-          var error: SwishError?
-
+          var result: Result<String, SwishError>?
+          
           client.perform(request) {
-            error = $0.error
+            result = $0
           }
-
-          expect(error).toEventually(matchError(SwishError.serverError(code: expectedCode, data: performer.data)))
+          
+          expect { try result?.get() }.toEventually(throwError(SwishError.serverError(code: expectedCode, data: performer.data)))
         }
       }
 
@@ -140,13 +141,13 @@ class APIClientSpec: QuickSpec {
           )
 
           let client = APIClient(requestPerformer: performer)
-          var error: SwishError?
+          var result: Result<String, SwishError>?
 
           client.perform(request) {
-            error = $0.error
+            result = $0
           }
 
-          expect(error).toEventually(matchError(SwishError.serverError(code: expectedCode, data: performer.data)))
+          expect { try result?.get() }.toEventually(throwError(SwishError.serverError(code: expectedCode, data: performer.data)))
         }
       }
 
@@ -161,13 +162,13 @@ class APIClientSpec: QuickSpec {
           )
 
           let client = APIClient(requestPerformer: performer)
-          var error: SwishError?
+          var result: Result<String, SwishError>?
 
           client.perform(request) {
-            error = $0.error
+            result = $0
           }
-
-          expect(error).toEventually(matchError(SwishError.serverError(code: expectedCode, data: performer.data)))
+          
+          expect { try result?.get() }.toEventually(throwError(SwishError.serverError(code: expectedCode, data: performer.data)))
         }
       }
 
@@ -182,13 +183,13 @@ class APIClientSpec: QuickSpec {
           )
 
           let client = APIClient(requestPerformer: performer)
-          var error: SwishError?
-
+          var result: Result<String, SwishError>?
+          
           client.perform(request) {
-            error = $0.error
+            result = $0
           }
-
-          expect(error).toEventually(matchError(SwishError.serverError(code: expectedCode, data: performer.data)))
+          
+          expect { try result?.get() }.toEventually(throwError(SwishError.serverError(code: expectedCode, data: performer.data)))
         }
       }
 

Tests/Tests/NetworkRequestPerformerSpec.swift

@@ -1,7 +1,6 @@
 import Swish
 import Quick
 import Nimble
-import Result
 
 func exampleRequest() -> URLRequest {
   return URLRequest(url: URL(string: "https://example.com")!)
@@ -33,13 +32,14 @@ class RequestPerformerSpec: QuickSpec {
         context("when the request didn't produce an error") {
           it("returns a Result with the HTTPResponse") {
             let fakeSession = FakeSession(data: fakeData(), response: fakeResponse(200))
-            var returnedCode: Int = 0
+            var returnedCode: Int?
             var returnedData: Data?
 
             let performer = NetworkRequestPerformer(session: fakeSession)
             performer.perform(exampleRequest()) { result in
-              returnedCode = result.value!.code
-              returnedData = result.value!.data
+              let value = try? result.get()
+              returnedCode = value?.code
+              returnedData = value?.data
             }
 
             expect(returnedCode).to(equal(200))
@@ -55,7 +55,9 @@ class RequestPerformerSpec: QuickSpec {
 
             let performer = NetworkRequestPerformer(session: fakeSession)
             performer.perform(exampleRequest()) { result in
-              returnedError = result.error
+              if case .failure(let error) = result {
+                returnedError = error
+              }
             }
 
             expect(returnedError).to(matchError(SwishError.urlSessionError(error, response: nil)))

Tests/Tests/RequestSpec.swift

@@ -1,7 +1,6 @@
 import Swish
 import Quick
 import Nimble
-import Result
 
 struct User: Decodable {
   let name: String