Update to swift tools 5.0 and Alamofire 5.0.0-rc.1

Author: konstk1

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:4.0
+// swift-tools-version:5.0
 // Package.swift
 /*
  The MIT License (MIT)
@@ -24,15 +24,20 @@ import PackageDescription
 
 let package = Package(
     name: "OAuthSwiftAlamofire",
+    platforms: [.macOS(.v10_12),
+                .iOS(.v10),
+                .tvOS(.v10),
+                .watchOS(.v3)],
     products: [
         .library(name: "OAuthSwiftAlamofire", targets: ["OAuthSwiftAlamofire"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/OAuthSwift/OAuthSwift.git", from: "2.1.0"),
-        .package(url: "https://github.com/Alamofire/Alamofire.git", from:  "5.0.0-rc.1"),
+        .package(url: "https://github.com/OAuthSwift/OAuthSwift.git", .branch("2.1.0")),
+        .package(url: "https://github.com/Alamofire/Alamofire.git", .branch("5.0.0-rc.1")),
     ],
     targets: [
         .target(name: "OAuthSwiftAlamofire", dependencies: ["OAuthSwift", "Alamofire"], path: "Sources"),
         .testTarget(name: "OAuthSwiftAlamofireTests", dependencies: ["OAuthSwiftAlamofire"], path: "Tests"),
-    ]
+    ],
+    swiftLanguageVersions: [.v5]
 )

Sources/HTTPMethod.swift

@@ -21,7 +21,7 @@ public extension Alamofire.HTTPMethod {
 public extension OAuthSwiftHTTPRequest.Method {
 
     var alamofire: Alamofire.HTTPMethod {
-        return Alamofire.HTTPMethod(rawValue: self.rawValue)!
+        return Alamofire.HTTPMethod(rawValue: self.rawValue)
     }
 
 }

Sources/OAuthSwiftRequestInterceptor.swift

@@ -24,7 +24,7 @@ open class OAuthSwiftRequestInterceptor: RequestInterceptor {
         self.oauthSwift = oauthSwift
     }
 
-    open func adapt(_ urlRequest: URLRequest, for session: Session, completion: @escaping (AFResult<URLRequest>) -> Void) {
+    open func adapt(_ urlRequest: URLRequest, for session: Session, completion: @escaping (Result<URLRequest, Error>) -> Void) {
         var config = OAuthSwiftHTTPRequest.Config(
             urlRequest: urlRequest,
             paramsLocation: paramsLocation,
@@ -104,7 +104,7 @@ open class OAuthSwift2RequestInterceptor: OAuthSwiftRequestInterceptor {
             guard let strongSelf = self else { return }
 
             // map success result from TokenSuccess to Void, and failure from OAuthSwiftError to Error
-            let refreshResult = result.map { _ in () }.mapError { .$0 as Error }
+            let refreshResult = result.map { _ in () }.mapError { $0 as Error }
             completion(refreshResult)
 
             strongSelf.isRefreshing = false
@@ -114,7 +114,6 @@ open class OAuthSwift2RequestInterceptor: OAuthSwiftRequestInterceptor {
 }
 
 extension OAuth1Swift {
-
     open var requestInterceptor: OAuthSwiftRequestInterceptor {
         return OAuthSwiftRequestInterceptor(self)
     }