Add the missing importing

.swift-version

@@ -1 +1 @@
-3.0
+5.0

Cartfile

@@ -1,2 +1,2 @@
 # Core
-github "antitypical/Result" ~> 3.2
+github "antitypical/Result" ~> 4.1

Cartfile.private

@@ -1,8 +1,8 @@
 github "jspahrsummers/xcconfigs" ~> 0.11
-github "AliSoftware/OHHTTPStubs" ~> 6.0
+github "AliSoftware/OHHTTPStubs" ~> 8.0
 
 # Specifications
-github "Quick/Quick" ~> 1.1.0
+github "Quick/Quick" ~> 2.1.0
 
 # Matchers
-github "Quick/Nimble" ~> 7.0.0
+github "Quick/Nimble" ~> 8.0.0

Cartfile.resolved

@@ -1,5 +1,5 @@
-github "AliSoftware/OHHTTPStubs" "6.0.0"
-github "Quick/Nimble" "v7.0.2"
-github "Quick/Quick" "v1.2.0"
-github "antitypical/Result" "3.2.4"
+github "AliSoftware/OHHTTPStubs" "8.0.0"
+github "Quick/Nimble" "v8.0.2"
+github "Quick/Quick" "v2.1.0"
+github "antitypical/Result" "4.1.0"
 github "jspahrsummers/xcconfigs" "0.11"

Heimdallr.xcodeproj/project.pbxproj

@@ -528,6 +528,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 			);
 			mainGroup = DC545DB81A89F0F10051A575;
@@ -738,7 +739,7 @@
 				DYLIB_CURRENT_VERSION = 1;
 				INFOPLIST_FILE = "Heimdallr/Supporting Files/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -753,7 +754,7 @@
 				DYLIB_CURRENT_VERSION = 1;
 				INFOPLIST_FILE = "Heimdallr/Supporting Files/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -765,7 +766,7 @@
 				INFOPLIST_FILE = "HeimdallrTests/Supporting Files/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_NAME = HeimdallrTests;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -777,7 +778,7 @@
 				INFOPLIST_FILE = "HeimdallrTests/Supporting Files/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_NAME = HeimdallrTests;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -790,7 +791,7 @@
 				FRAMEWORK_VERSION = A;
 				INFOPLIST_FILE = "Heimdallr/Supporting Files/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -803,7 +804,7 @@
 				FRAMEWORK_VERSION = A;
 				INFOPLIST_FILE = "Heimdallr/Supporting Files/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -814,7 +815,7 @@
 				INFOPLIST_FILE = "HeimdallrTests/Supporting Files/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_NAME = HeimdallrTests;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -825,7 +826,7 @@
 				INFOPLIST_FILE = "HeimdallrTests/Supporting Files/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_NAME = HeimdallrTests;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

Heimdallr.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>

Heimdallr/OAuthAccessToken.swift

@@ -1,3 +1,4 @@
+import Foundation
 import Result
 
 /// An access token is used for authorizing requests to the resource endpoint.

Heimdallr/OAuthAccessTokenKeychainStore.swift

@@ -1,3 +1,4 @@
+import Foundation
 import Security
 
 internal struct Keychain {

Heimdallr/OAuthError.swift

@@ -1,6 +1,8 @@
 /// See: The OAuth 2.0 Authorization Framework, 5.2 NSError Response
 ///      <https://tools.ietf.org/html/rfc6749#section-5.2>
 
+import Foundation
+
 public let OAuthErrorDomain = "OAuthErrorDomain"
 public let OAuthErrorInvalidRequest = 1
 public let OAuthErrorInvalidClient = 2
@@ -21,7 +23,7 @@ public enum OAuthErrorCode: String {
 }
 
 public extension OAuthErrorCode {
-    public var intValue: Int {
+    var intValue: Int {
         switch self {
         case .InvalidRequest:
             return OAuthErrorInvalidRequest
@@ -60,7 +62,7 @@ public class OAuthError {
 }
 
 public extension OAuthError {
-    public var nsError: NSError {
+    var nsError: NSError {
         var userInfo = [String: AnyObject]()
 
         if let description = description {
@@ -88,7 +90,7 @@ extension OAuthError {
     }
 
     public class func decode(data: Data) -> OAuthError? {
-        guard let json: AnyObject? = try? JSONSerialization.jsonObject(with: data, options: JSONSerialization.ReadingOptions(rawValue: 0)) as AnyObject?,
+        guard let json: AnyObject = try? JSONSerialization.jsonObject(with: data, options: JSONSerialization.ReadingOptions(rawValue: 0)) as AnyObject?,
             let jsonDictionary = json as? [String: AnyObject] else {
             return nil
         }

Heimdallr/URLRequestExtensions.swift

@@ -48,7 +48,7 @@ private let HTTPRequestHeaderFieldAuthorization = "Authorization"
 
 public extension URLRequest {
     /// Returns the HTTP `Authorization` header value or `nil` if not set.
-    public var HTTPAuthorization: String? {
+    var HTTPAuthorization: String? {
         return value(forHTTPHeaderField: HTTPRequestHeaderFieldAuthorization)
     }
 
@@ -57,15 +57,15 @@ public extension URLRequest {
     /// - parameter value: The value to be set or `nil`.
     ///
     /// TODO: Declarations in extensions cannot override yet.
-    public mutating func setHTTPAuthorization(_ value: String?) {
+    mutating func setHTTPAuthorization(_ value: String?) {
         setValue(value, forHTTPHeaderField: HTTPRequestHeaderFieldAuthorization)
     }
 
     /// Sets the HTTP `Authorization` header value using the given HTTP
     /// authentication.
     ///
     /// - parameter authentication: The HTTP authentication to be set.
-    public mutating func setHTTPAuthorization(_ authentication: HTTPAuthentication) {
+    mutating func setHTTPAuthorization(_ authentication: HTTPAuthentication) {
         setHTTPAuthorization(authentication.value)
     }
 
@@ -74,7 +74,7 @@ public extension URLRequest {
     /// - parameter parameters: The parameters to be encoded or `nil`.
     ///
     /// TODO: Tests crash without named parameter.
-    public mutating func setHTTPBody(parameters: [String: AnyObject]?) {
+    mutating func setHTTPBody(parameters: [String: AnyObject]?) {
         if let parameters = parameters {
             var components: [(String, String)] = []
             for (key, value) in parameters {