Gitlab v4

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode8.3
+osx_image: xcode10
 sudo: false
 env:
   global:
@@ -8,13 +8,13 @@ env:
   - FASTLANE_LANE=ci_commit
 matrix:
   include:
-    - osx_image: xcode8.3
+    - osx_image: xcode10
       env: FASTLANE_LANE=code_coverage FASTLANE_ENV=default
-    - osx_image: xcode8.3
+    - osx_image: xcode10
       env: FASTLANE_ENV=ios93
-    - osx_image: xcode8.3
+    - osx_image: xcode10
       env: FASTLANE_ENV=tvos92
-    - osx_image: xcode8.3
+    - osx_image: xcode10
       env: FASTLANE_ENV=osx
 before_install:
   - make install

Cartfile

@@ -1 +1 @@
-github "nerdishbynature/RequestKit" ~>2.0
+github "nerdishbynature/RequestKit" "xcode-10"

Cartfile.resolved

@@ -1 +1 @@
-github "nerdishbynature/RequestKit" "2.0.2"
+github "nerdishbynature/RequestKit" "2822fe0126d80377375b9cfde1c29198e0d3e7af"

TanukiKit.xcodeproj/project.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>

TanukiKit/Configuration.swift

@@ -1,15 +1,15 @@
 import Foundation
 import RequestKit
 
-let gitlabBaseURL = "https://gitlab.com/api/v3/"
-let gitlabWebURL = "https://gitlab.com/"
+public let GitlabBaseURL = "https://gitlab.com/api/v4/"
+public let GitlabWebURL = "https://gitlab.com/"
 
 public struct TokenConfiguration: Configuration {
     public var apiEndpoint: String
     public var accessToken: String?
     public let errorDomain = TanukiKitErrorDomain
 
-    public init(_ token: String? = nil, url: String = gitlabBaseURL) {
+    public init(_ token: String? = nil, url: String = GitlabBaseURL) {
         apiEndpoint = url
         accessToken = token
     }
@@ -20,7 +20,7 @@ public struct PrivateTokenConfiguration: Configuration {
     public var accessToken: String?
     public let errorDomain = TanukiKitErrorDomain
 
-    public init(_ token: String? = nil, url: String = gitlabBaseURL) {
+    public init(_ token: String? = nil, url: String = GitlabBaseURL) {
         apiEndpoint = url
         accessToken = token
     }
@@ -39,7 +39,7 @@ public struct OAuthConfiguration: Configuration {
     public let webEndpoint: String
     public let errorDomain = TanukiKitErrorDomain
 
-    public init(_ url: String = gitlabBaseURL, webURL: String = gitlabWebURL,
+    public init(_ url: String = GitlabBaseURL, webURL: String = GitlabWebURL,
         token: String, secret: String, redirectURI: String) {
             apiEndpoint = url
             webEndpoint = webURL

TanukiKit/Keys.swift

@@ -1,18 +1,24 @@
 import Foundation
 import RequestKit
 
+// MARK: Model
+
+@objc open class PublicKeyResponse: NSObject, Codable {
+    open var key: String = ""
+    open var title: String = ""
+    open var id: Int = 0
+}
+
 // MARK: request
 
 public extension TanukiKit {
-    public func postPublicKey(_ session: RequestKitURLSession = URLSession.shared, publicKey: String, title: String, completion: @escaping (_ response:Response<String>) -> Void) -> URLSessionDataTaskProtocol? {
+    public func postPublicKey(_ session: RequestKitURLSession = URLSession.shared, publicKey: String, title: String, completion: @escaping (_ response:Response<PublicKeyResponse>) -> Void) -> URLSessionDataTaskProtocol? {
         let router = PublicKeyRouter.postPublicKey(publicKey, title, configuration)
-        return router.loadJSON(session, expectedResultType: [String: AnyObject].self) { json, error in
+        return router.load(session, expectedResultType: PublicKeyResponse.self) { publicKey, error in
             if let error = error {
                 completion(Response.failure(error))
-            } else {
-                if let _ = json {
-                    completion(Response.success(publicKey))
-                }
+            } else if let publicKey = publicKey {
+                completion(Response.success(publicKey))
             }
         }
     }