diff --git a/.travis.yml b/.travis.yml index 2ba811ce..98f5ccbe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,15 @@ reference: http://www.objc.io/issue-6/travis-ci.html language: objective-c -osx_image: xcode6.4 +osx_image: xcode7 env: global: - LC_CTYPE=en_US.UTF-8 - LANG=en_US.UTF-8 matrix: - - DESTINATION="OS=8.3,name=iPhone 6" SCHEME="Auth0-iOS" SDK=iphonesimulator8.4 - - DESTINATION="OS=8.4,name=iPhone 6 Plus" SCHEME="Auth0-iOS" SDK=iphonesimulator8.4 - - DESTINATION="arch=x86_64" SCHEME="Auth0-OSX" SDK=macosx10.10 + - DESTINATION="OS=9.0,name=iPhone 6" SCHEME="Auth0-iOS" SDK=iphonesimulator + - DESTINATION="OS=8.3,name=iPhone 6" SCHEME="Auth0-iOS" SDK=iphonesimulator + - DESTINATION="OS=8.4,name=iPhone 6 Plus" SCHEME="Auth0-iOS" SDK=iphonesimulator + - DESTINATION="arch=x86_64" SCHEME="Auth0-OSX" SDK=macosx cache: - bundler before_install: diff --git a/Auth0.xcodeproj/project.pbxproj b/Auth0.xcodeproj/project.pbxproj index 95331371..40866990 100644 --- a/Auth0.xcodeproj/project.pbxproj +++ b/Auth0.xcodeproj/project.pbxproj @@ -400,7 +400,9 @@ 5F0068B31B3B3EFF0048928E /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0640; + LastSwiftMigration = 0700; + LastSwiftUpdateCheck = 0700; + LastUpgradeCheck = 0700; ORGANIZATIONNAME = Auth0; TargetAttributes = { 5F0068BB1B3B3EFF0048928E = { @@ -551,6 +553,7 @@ CURRENT_PROJECT_VERSION = 3; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -634,6 +637,7 @@ INFOPLIST_FILE = Auth0/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = com.auth0.Auth0; PRODUCT_NAME = Auth0; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -656,6 +660,7 @@ INFOPLIST_FILE = Auth0/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = com.auth0.Auth0; PRODUCT_NAME = Auth0; SKIP_INSTALL = YES; }; @@ -676,6 +681,7 @@ ); INFOPLIST_FILE = Auth0Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.auth0.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Auth0Tests/Auth0-iOSTests-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -693,6 +699,7 @@ ); INFOPLIST_FILE = Auth0Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.auth0.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Auth0Tests/Auth0-iOSTests-Bridging-Header.h"; }; @@ -721,6 +728,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.10; + PRODUCT_BUNDLE_IDENTIFIER = com.auth0.Auth0; PRODUCT_NAME = Auth0; SDKROOT = macosx; SKIP_INSTALL = YES; @@ -746,6 +754,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.10; + PRODUCT_BUNDLE_IDENTIFIER = com.auth0.Auth0; PRODUCT_NAME = Auth0; SDKROOT = macosx; SKIP_INSTALL = YES; @@ -770,6 +779,7 @@ INFOPLIST_FILE = Auth0Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.10; + PRODUCT_BUNDLE_IDENTIFIER = "com.auth0.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; SWIFT_OBJC_BRIDGING_HEADER = "Auth0Tests/Auth0-OSXTests-Bridging-Header.h"; @@ -790,6 +800,7 @@ INFOPLIST_FILE = Auth0Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.10; + PRODUCT_BUNDLE_IDENTIFIER = "com.auth0.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; SWIFT_OBJC_BRIDGING_HEADER = "Auth0Tests/Auth0-OSXTests-Bridging-Header.h"; diff --git a/Auth0.xcodeproj/xcshareddata/xcschemes/Auth0-OSX.xcscheme b/Auth0.xcodeproj/xcshareddata/xcschemes/Auth0-OSX.xcscheme index bdcade31..cbaced4e 100644 --- a/Auth0.xcodeproj/xcshareddata/xcschemes/Auth0-OSX.xcscheme +++ b/Auth0.xcodeproj/xcshareddata/xcschemes/Auth0-OSX.xcscheme @@ -1,6 +1,6 @@ + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -62,15 +62,18 @@ ReferencedContainer = "container:Auth0.xcodeproj"> + + + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -62,15 +62,18 @@ ReferencedContainer = "container:Auth0.xcodeproj"> + + Users { return Users(api: self, token: token) diff --git a/Auth0/APIRequest.swift b/Auth0/APIRequest.swift index 1eadc101..0b9b6dff 100644 --- a/Auth0/APIRequest.swift +++ b/Auth0/APIRequest.swift @@ -65,32 +65,38 @@ public struct APIRequest { /** Register a new callback for the request's JSON response - :param: callback to be called when a response is received or an error occurs. It can yield the error that caused the request to fail or server's JSON response if it's successful + - parameter callback: to be called when a response is received or an error occurs. It can yield the error that caused the request to fail or server's JSON response if it's successful */ public func responseJSON(callback: (error: NSError?, payload:T?) -> ()) { switch(request, error) { case let (.None, .Some(error)): callback(error: error, payload: nil) case let (.Some(request), .None): - request.responseJSON { _, resp, payload, err in - switch (resp, payload, err) { - case (_, nil, let error): + request + .validate(statusCode: 200..<300) + .responseJSON { request, response, result in + switch (response, result) { + case (_, .Failure(nil, let error as NSError)): callback(error: error, payload: nil) - case (let response, _, nil) where response != nil && 200...299 ~= response!.statusCode: + case (_, .Success(let payload)): if let responseObject = self.builder?(payload: payload) { callback(error: nil, payload: responseObject) } else { callback(error: errorWithCode(.InvalidPayload, userInfo: [NSLocalizedDescriptionKey: "Failed to obtain JSON from \(payload)"]), payload: nil) } - case (let response, _, nil) where response != nil && 400...599 ~= response!.statusCode && payload != nil: - let info = [ - NSLocalizedDescriptionKey: "Request to \(request.request.URL) failed with status code \(response?.statusCode)", - APIRequestErrorErrorKey: payload!, - APIRequestErrorStatusCodeKey: response!.statusCode + case (let response, .Failure(let payload, _)) where payload != nil && response != nil: + let statusCode = response!.statusCode + let message = "Request to \(request?.URL) failed with status code \(statusCode)" + var info: [String: AnyObject] = [ + NSLocalizedDescriptionKey: message, + APIRequestErrorStatusCodeKey: statusCode ] + if let error = try? NSJSONSerialization.JSONObjectWithData(payload!, options: NSJSONReadingOptions()) { + info[APIRequestErrorErrorKey] = error + } callback(error: errorWithCode(.Failed, userInfo: info), payload: nil) default: - callback(error: errorWithCode(.Failed, userInfo: [NSLocalizedDescriptionKey: "Request to \(request.request.URL) failed"]), payload: nil) + callback(error: errorWithCode(.Failed, userInfo: [NSLocalizedDescriptionKey: "Request to \(request?.URL) failed"]), payload: nil) } } default: diff --git a/Auth0/Auth0.swift b/Auth0/Auth0.swift index 38a1d515..7d6d3253 100644 --- a/Auth0/Auth0.swift +++ b/Auth0/Auth0.swift @@ -37,7 +37,7 @@ public struct Auth0 { Creates a new Auth0 object. It retrieves your Auth0 account domain from `Info.plist` file entry with key `Auth0Domain` - :returns: a new instance + - returns: a new instance */ public init() { let info = NSBundle.mainBundle().infoDictionary @@ -49,9 +49,9 @@ public struct Auth0 { Creates a new Auth0 object with an account Auth0 domain. The domain can be a full web url, e.g.: `https://samples.auth0.com`, or just the domain name, e.g. `samples.auth0.com` - :param: domain of your Auth0 account + - parameter domain: of your Auth0 account - :returns: a new instance + - returns: a new instance */ public init(domain: String) { self.api = API(domain: domain) @@ -60,9 +60,9 @@ public struct Auth0 { /** Initialize API v2 /users endpoint with a valid JWT - :param: token a valid jwt of API v2 or an `id_token` of a user + - parameter token: a valid jwt of API v2 or an `id_token` of a user - :returns: users api helper + - returns: users api helper */ public func users(token: String) -> Users { return api.users(token) @@ -71,9 +71,9 @@ public struct Auth0 { /** Initialize API v2 /users endpoint with a valid JWT from shared Auth0 configuration - :param: token a valid jwt of API v2 or an `id_token` of a user + - parameter token: a valid jwt of API v2 or an `id_token` of a user - :returns: users api helper + - returns: users api helper */ public static func users(token: String) -> Users { return Auth0.sharedInstance.api.users(token) diff --git a/Auth0/Auth0API.swift b/Auth0/Auth0API.swift index ec5db2cb..539af22c 100644 --- a/Auth0/Auth0API.swift +++ b/Auth0/Auth0API.swift @@ -23,7 +23,7 @@ import Foundation /** -* Auth0 API helper class for *Objective-C*. If you using *Swift* just use *Auth0* struct or global functions +* Auth0 API helper class for *Objective-C*. If you are using *Swift* just use *Auth0* struct or global functions */ public class Auth0API: NSObject { @@ -34,9 +34,9 @@ public class Auth0API: NSObject { Creates a new helper with a jwt for Auth0 API. The Auth0 account domain will be obtained from `Info.plist` file entry with key `Auth0Domain` - :param: token for Auth0 API v2 + - parameter token: for Auth0 API v2 - :returns: new helper instance + - returns: new helper instance */ public init(token: String) { self.token = token @@ -46,10 +46,10 @@ public class Auth0API: NSObject { /** Creates a new helper with a jwt for Auth0 API and an account domain - :param: domain of the Auth0 account - :param: token for Auth0 API v2 + - parameter domain: of the Auth0 account + - parameter token: for Auth0 API v2 - :returns: new helper instance + - returns: new helper instance */ public init(domain: String, token: String) { self.token = token @@ -59,29 +59,29 @@ public class Auth0API: NSObject { /** Updates a user calling `PATCH /users/:id` - :param: id of the user to update - :param: parameters that hold the attributes of the user to update - :param: callback that will be called with the result of the request + - parameter id: of the user to update + - parameter parameters: that hold the attributes of the user to update + - parameter callback: that will be called with the result of the request */ @objc public func updateUser(id: String, parameters: [String: AnyObject], callback: (NSError?, [String: AnyObject]?) -> ()) { api .users(token) - .update(id: id, parameters: parameters) + .update(id, parameters: parameters) .responseJSON(callback) } /** Finds a user calling `GET /users/:id` - :param: id of the user to find - :param: fields to be included/excluded from the response - :param: includeFields that tells if the fields listed should be included or not in the response - :param: callback that will be called with the result of the request + - parameter id: of the user to find + - parameter fields: to be included/excluded from the response + - parameter includeFields: that tells if the fields listed should be included or not in the response + - parameter callback: that will be called with the result of the request */ @objc public func findUser(id: String, fields: [String]? = nil, includeFields: Bool = true, callback: (NSError?, [String: AnyObject]?) -> ()) { api .users(token) - .find(id: id, fields: fields, includeFields: includeFields) + .find(id, fields: fields, includeFields: includeFields) .responseJSON(callback) } } diff --git a/Auth0/Info.plist b/Auth0/Info.plist index d1b4873e..99c2305f 100644 --- a/Auth0/Info.plist +++ b/Auth0/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - com.auth0.Auth0 + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/Auth0/Users.swift b/Auth0/Users.swift index b7f88c7f..dbd350bb 100644 --- a/Auth0/Users.swift +++ b/Auth0/Users.swift @@ -40,12 +40,12 @@ public struct Users { /** Update a user performing a `PATCH` to `/users/:id` - :param: id of the auth0 user to update. If nil it will be obtained from the `id_token`. - :param: userMetadata of the user to update. - :param: appMetadata of the user to update. - :param: parameters of the user, can include `user_metadata` and `app_metadata`. + - parameter id: of the auth0 user to update. If nil it will be obtained from the `id_token`. + - parameter userMetadata: of the user to update. + - parameter appMetadata: of the user to update. + - parameter parameters: of the user, can include `user_metadata` and `app_metadata`. - :returns: API request sent to Auth0 + - returns: API request sent to Auth0 */ public func update(id: String? = nil, userMetadata: [String: AnyObject]? = nil, appMetadata: [String: AnyObject]? = nil, parameters: [String: AnyObject]? = [:]) -> APIRequest<[String: AnyObject]> { switch(normalizedUserId(id)) { @@ -68,11 +68,11 @@ public struct Users { /** Find a user by id performing a `GET` to `/users/:id` - :param: id of the auth0 user to update. If nil it will be obtained from the `id_token` - :param: fields to be included or excluded from the response - :param: includeFields that will determine if the list of fields are to be included or excluded from the response + - parameter id: of the auth0 user to update. If nil it will be obtained from the `id_token` + - parameter fields: to be included or excluded from the response + - parameter includeFields: that will determine if the list of fields are to be included or excluded from the response - :returns: API request sent to Auth0 + - returns: API request sent to Auth0 */ public func find(id: String? = nil, fields: [String]? = nil, includeFields: Bool = true) -> APIRequest<[String: AnyObject]> { switch(normalizedUserId(id)) { @@ -80,11 +80,10 @@ public struct Users { let components = NSURLComponents(URL: self.api.domainUrl, resolvingAgainstBaseURL: true)! components.path = "/api/v2/users/\(userId)" if fields != nil && !fields!.isEmpty { - let items:[AnyObject] = [ - NSURLQueryItem(name: "fields", value: join(",", fields!)), + components.queryItems = [ + NSURLQueryItem(name: "fields", value: (fields!).joinWithSeparator(",")), NSURLQueryItem(name: "include_fields", value: "\(includeFields)"), ] - components.queryItems = items } let request = self.api.manager.request(jsonRequest(.GET, url: components.URL!)) return APIRequest<[String: AnyObject]>(request: request) { return $0 as? [String: AnyObject] } @@ -105,8 +104,8 @@ public struct Users { } private func subjectFromToken(token: String) -> String? { - let payload = JWTDecode.payload(jwt: token)! - return payload["sub"] as? String + let jwt = try? JWTDecode.decode(token) + return jwt?.subject } private func jsonRequest(method: Alamofire.Method, url: NSURL, parameters: [String: AnyObject]? = nil) -> NSURLRequest { diff --git a/Auth0Tests/FilteredRequest.swift b/Auth0Tests/FilteredRequest.swift index bfd799be..51ecf18b 100644 --- a/Auth0Tests/FilteredRequest.swift +++ b/Auth0Tests/FilteredRequest.swift @@ -35,14 +35,14 @@ func filter(filter: (NSURLRequest -> Bool)) -> FilteredRequest { return FilteredRequest(filter: filter) } -func hasJSON(expected: [String: AnyObject], request: NSURLRequest) -> Bool { +func hasJSON(expected: [String: AnyObject], _ request: NSURLRequest) -> Bool { var filter: Bool = false if let stream = request.HTTPBodyStream { stream.open() - if let json = NSJSONSerialization.JSONObjectWithStream(stream, options: .allZeros, error: nil) as? [String: AnyObject] { + if let json = (try? NSJSONSerialization.JSONObjectWithStream(stream, options: [])) as? [String: AnyObject] { filter = true for key in expected.keys { - filter = contains(json.keys, key) + filter = json.keys.contains(key) if !filter { break } diff --git a/Auth0Tests/Info.plist b/Auth0Tests/Info.plist index 1ebd3978..1de4b915 100644 --- a/Auth0Tests/Info.plist +++ b/Auth0Tests/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - com.auth0.$(PRODUCT_NAME:rfc1034identifier) + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/Auth0Tests/UsersSpec.swift b/Auth0Tests/UsersSpec.swift index c0349446..557e78f8 100644 --- a/Auth0Tests/UsersSpec.swift +++ b/Auth0Tests/UsersSpec.swift @@ -115,8 +115,8 @@ class UsersSpec: QuickSpec { waitUntil { done in users.update(userMetadata: ["key": "value"], appMetadata: ["role": "admin"]).responseJSON { error, payload in expect(error).toNot(beNil()) - expect(error?.userInfo?[APIRequestErrorStatusCodeKey as NSObject] as? Int).to(equal(400)) - expect(error?.userInfo?[APIRequestErrorErrorKey as NSObject] as? [String: String]).to(equal(invalidRequestJson)) + expect(error?.userInfo[APIRequestErrorStatusCodeKey] as? Int).to(equal(400)) + expect(error?.userInfo[APIRequestErrorErrorKey] as? [String: String]).to(equal(invalidRequestJson)) done() } } @@ -162,10 +162,10 @@ class UsersSpec: QuickSpec { it("should yield error with response") { waitUntil { done in - users.update(id: userId, userMetadata: ["key": "value"], appMetadata: ["role": "admin"]).responseJSON { error, payload in + users.update(userId, userMetadata: ["key": "value"], appMetadata: ["role": "admin"]).responseJSON { error, payload in expect(error).toNot(beNil()) - expect(error?.userInfo?[APIRequestErrorStatusCodeKey as NSObject] as? Int).to(equal(400)) - expect(error?.userInfo?[APIRequestErrorErrorKey as NSObject] as? [String: String]).to(equal(invalidRequestJson)) + expect(error?.userInfo[APIRequestErrorStatusCodeKey] as? Int).to(equal(400)) + expect(error?.userInfo[APIRequestErrorErrorKey] as? [String: String]).to(equal(invalidRequestJson)) done() } } @@ -180,7 +180,7 @@ class UsersSpec: QuickSpec { waitUntil { done in users.update(userMetadata: ["key": "value"]).responseJSON { error, payload in expect(error).toNot(beNil()) - expect(error?.userInfo?[NSLocalizedDescriptionKey] as? String).to(equal("No id of a user supplied to perform the update")) + expect(error?.userInfo[NSLocalizedDescriptionKey] as? String).to(equal("No id of a user supplied to perform the update")) done() } } @@ -231,8 +231,8 @@ class UsersSpec: QuickSpec { waitUntil { done in users.find().responseJSON { error, payload in expect(error).toNot(beNil()) - expect(error?.userInfo?[APIRequestErrorStatusCodeKey as NSObject] as? Int).to(equal(400)) - expect(error?.userInfo?[APIRequestErrorErrorKey as NSObject] as? [String: String]).to(equal(invalidRequestJson)) + expect(error?.userInfo[APIRequestErrorStatusCodeKey] as? Int).to(equal(400)) + expect(error?.userInfo[APIRequestErrorErrorKey] as? [String: String]).to(equal(invalidRequestJson)) done() } } @@ -278,10 +278,10 @@ class UsersSpec: QuickSpec { it("should yield error with response") { waitUntil { done in - users.find(id: userId).responseJSON { error, payload in + users.find(userId).responseJSON { error, payload in expect(error).toNot(beNil()) - expect(error?.userInfo?[APIRequestErrorStatusCodeKey as NSObject] as? Int).to(equal(400)) - expect(error?.userInfo?[APIRequestErrorErrorKey as NSObject] as? [String: String]).to(equal(invalidRequestJson)) + expect(error?.userInfo[APIRequestErrorStatusCodeKey] as? Int).to(equal(400)) + expect(error?.userInfo[APIRequestErrorErrorKey] as? [String: String]).to(equal(invalidRequestJson)) done() } } @@ -304,7 +304,7 @@ class UpdateMetadataSharedExamplesConfiguration: QuickConfiguration { it("should not yield error") { waitUntil { done in - users.update(id: id, userMetadata: userMetadata, appMetadata: appMetadata, parameters: parameters).responseJSON { error, payload in + users.update(id, userMetadata: userMetadata, appMetadata: appMetadata, parameters: parameters).responseJSON { error, payload in expect(error).to(beNil()) done() } @@ -313,7 +313,7 @@ class UpdateMetadataSharedExamplesConfiguration: QuickConfiguration { it("should yield JSON payload") { waitUntil { done in - users.update(id: id, userMetadata: userMetadata, appMetadata: appMetadata, parameters: parameters).responseJSON { error, payload in + users.update(id, userMetadata: userMetadata, appMetadata: appMetadata, parameters: parameters).responseJSON { error, payload in expect(payload).toNot(beNil()) expect(payload?["user_id"] as? String).toNot(beNil()) done() @@ -331,7 +331,7 @@ class UpdateMetadataSharedExamplesConfiguration: QuickConfiguration { it("should not yield payload") { waitUntil { done in - users.update(id: id, userMetadata: userMetadata, appMetadata: appMetadata, parameters: parameters).responseJSON { error, payload in + users.update(id, userMetadata: userMetadata, appMetadata: appMetadata, parameters: parameters).responseJSON { error, payload in expect(payload).to(beNil()) done() } @@ -340,7 +340,7 @@ class UpdateMetadataSharedExamplesConfiguration: QuickConfiguration { it("should yield error") { waitUntil { done in - users.update(id: id, userMetadata: userMetadata, appMetadata: appMetadata, parameters: parameters).responseJSON { err, payload in + users.update(id, userMetadata: userMetadata, appMetadata: appMetadata, parameters: parameters).responseJSON { err, payload in expect(err).toNot(beNil()) expect(err?.domain).to(equal("com.auth0.api")) done() @@ -356,7 +356,7 @@ class UpdateMetadataSharedExamplesConfiguration: QuickConfiguration { it("should yield user") { waitUntil { done in - users.find(id: id, fields: fieldList).responseJSON { error, payload in + users.find(id, fields: fieldList).responseJSON { error, payload in expect(payload).toNot(beNil()) expect(payload?["user_id"] as? String).to(equal(id)) done() @@ -366,7 +366,7 @@ class UpdateMetadataSharedExamplesConfiguration: QuickConfiguration { it("should not yield error") { waitUntil { done in - users.find(id: id, fields: fieldList).responseJSON { error, payload in + users.find(id, fields: fieldList).responseJSON { error, payload in expect(error).to(beNil()) done() } @@ -381,7 +381,7 @@ class UpdateMetadataSharedExamplesConfiguration: QuickConfiguration { it("should not yield payload") { waitUntil { done in - users.find(id: id, fields: fields).responseJSON { error, payload in + users.find(id, fields: fields).responseJSON { error, payload in expect(payload).to(beNil()) done() } @@ -390,7 +390,7 @@ class UpdateMetadataSharedExamplesConfiguration: QuickConfiguration { it("should yield error") { waitUntil { done in - users.find(id: id, fields: fields).responseJSON { err, payload in + users.find(id, fields: fields).responseJSON { err, payload in expect(err).toNot(beNil()) expect(err?.domain).to(equal("com.auth0.api")) done() diff --git a/Cartfile b/Cartfile index ea835107..559afcb6 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ -github "auth0/JWTDecode.swift" ~> 0.3 -github "Alamofire/Alamofire" ~> 1.2 +github "auth0/JWTDecode.swift" ~> 1.0 +github "Alamofire/Alamofire" ~> 2.0 diff --git a/Cartfile.private b/Cartfile.private index 4b10728a..5ed2ac5d 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1,3 +1,3 @@ -github "Quick/Quick" ~> 0.3 -github "Quick/Nimble" ~> 0.4 +github "Quick/Quick" ~> 0.6 +github "Quick/Nimble" "v2.0.0-rc.3" github "AliSoftware/OHHTTPStubs" ~> 4.0 \ No newline at end of file diff --git a/Cartfile.resolved b/Cartfile.resolved index 4a99f6ea..79e5bcb8 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,5 +1,5 @@ -github "Alamofire/Alamofire" "1.2.3" -github "auth0/JWTDecode.swift" "0.3.0" -github "Quick/Nimble" "v0.4.2" -github "AliSoftware/OHHTTPStubs" "4.0.2" -github "Quick/Quick" "v0.3.1" +github "Alamofire/Alamofire" "2.0.0" +github "auth0/JWTDecode.swift" "1.0.0" +github "Quick/Nimble" "811003c1e556d6fedd12a6e8b81da235a7479aca" +github "AliSoftware/OHHTTPStubs" "4.2.0" +github "Quick/Quick" "v0.6.0" diff --git a/Carthage/Build/Mac/Alamofire.framework/Versions/A/Alamofire b/Carthage/Build/Mac/Alamofire.framework/Versions/A/Alamofire index 78f30450..b75a0a32 100755 Binary files a/Carthage/Build/Mac/Alamofire.framework/Versions/A/Alamofire and b/Carthage/Build/Mac/Alamofire.framework/Versions/A/Alamofire differ diff --git a/Carthage/Build/Mac/Alamofire.framework/Versions/A/Headers/Alamofire-Swift.h b/Carthage/Build/Mac/Alamofire.framework/Versions/A/Headers/Alamofire-Swift.h index f2ec68fa..fcd261f3 100644 --- a/Carthage/Build/Mac/Alamofire.framework/Versions/A/Headers/Alamofire-Swift.h +++ b/Carthage/Build/Mac/Alamofire.framework/Versions/A/Headers/Alamofire-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 1.2 (swiftlang-602.0.53.1 clang-602.0.53) +// Generated by Apple Swift version 2.0 (swiftlang-700.0.59 clang-700.0.72) #pragma clang diagnostic push #if defined(__has_include) && __has_include() @@ -33,6 +33,11 @@ typedef struct _NSZone NSZone; #else # define SWIFT_RUNTIME_NAME(X) #endif +#if defined(__has_attribute) && __has_attribute(swift_name) +# define SWIFT_COMPILE_NAME(X) __attribute__((swift_name(X))) +#else +# define SWIFT_COMPILE_NAME(X) +#endif #if !defined(SWIFT_CLASS_EXTRA) # define SWIFT_CLASS_EXTRA #endif @@ -45,13 +50,16 @@ typedef struct _NSZone NSZone; #if !defined(SWIFT_CLASS) # if defined(__has_attribute) && __has_attribute(objc_subclassing_restricted) # define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_CLASS_EXTRA +# define SWIFT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA # else # define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA +# define SWIFT_CLASS_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA # endif #endif #if !defined(SWIFT_PROTOCOL) # define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA +# define SWIFT_PROTOCOL_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA #endif #if !defined(SWIFT_EXTENSION) @@ -68,22 +76,19 @@ typedef struct _NSZone NSZone; #if !defined(SWIFT_ENUM) # define SWIFT_ENUM(_type, _name) enum _name : _type _name; enum SWIFT_ENUM_EXTRA _name : _type #endif -#if __has_feature(nullability) -# define SWIFT_NULLABILITY(X) X -#else -# if !defined(__nonnull) -# define __nonnull -# endif -# if !defined(__nullable) -# define __nullable -# endif -# if !defined(__null_unspecified) -# define __null_unspecified -# endif -# define SWIFT_NULLABILITY(X) -#endif +typedef float swift_float2 __attribute__((__ext_vector_type__(2))); +typedef float swift_float3 __attribute__((__ext_vector_type__(3))); +typedef float swift_float4 __attribute__((__ext_vector_type__(4))); +typedef double swift_double2 __attribute__((__ext_vector_type__(2))); +typedef double swift_double3 __attribute__((__ext_vector_type__(3))); +typedef double swift_double4 __attribute__((__ext_vector_type__(4))); +typedef int swift_int2 __attribute__((__ext_vector_type__(2))); +typedef int swift_int3 __attribute__((__ext_vector_type__(3))); +typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #if defined(__has_feature) && __has_feature(modules) @import Foundation; +@import Foundation.NSURLSession; +@import ObjectiveC; #endif #pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" @@ -98,9 +103,10 @@ typedef struct _NSZone NSZone; @property (nonatomic, readonly, copy) NSString * __nonnull URLString; @end +@class NSMutableURLRequest; @interface NSURLRequest (SWIFT_EXTENSION(Alamofire)) -@property (nonatomic, readonly) NSURLRequest * __nonnull URLRequest; +@property (nonatomic, readonly) NSMutableURLRequest * __nonnull URLRequest; @end @@ -108,4 +114,287 @@ typedef struct _NSZone NSZone; @property (nonatomic, readonly, copy) NSString * __nonnull URLString; @end + +@interface NSURLSession (SWIFT_EXTENSION(Alamofire)) +@end + +@class NSURLSessionTask; +@class TaskDelegate; +@class NSError; +@class NSURLAuthenticationChallenge; +@class NSURLCredential; +@class NSHTTPURLResponse; +@class NSInputStream; +@class NSURLSessionDataTask; +@class NSURLResponse; +@class NSURLSessionDownloadTask; +@class NSData; +@class NSCachedURLResponse; + + +/// Responsible for handling all delegate callbacks for the underlying session. +SWIFT_CLASS("_TtCC9Alamofire7Manager15SessionDelegate") +@interface SessionDelegate : NSObject +- (TaskDelegate * __nullable)objectForKeyedSubscript:(NSURLSessionTask * __nonnull)task; +- (void)setObject:(TaskDelegate * __nullable)newValue forKeyedSubscript:(NSURLSessionTask * __nonnull)task; + +/// Overrides default behavior for NSURLSessionDelegate method URLSession:didBecomeInvalidWithError:. +@property (nonatomic, copy) void (^ __nullable sessionDidBecomeInvalidWithError)(NSURLSession * __nonnull, NSError * __nullable); + +/// Overrides default behavior for NSURLSessionDelegate method URLSessionDidFinishEventsForBackgroundURLSession:. +@property (nonatomic, copy) void (^ __nullable sessionDidFinishEventsForBackgroundURLSession)(NSURLSession * __nonnull); + +/// Tells the delegate that the session has been invalidated. +/// +/// \param session The session object that was invalidated. +/// +/// \param error The error that caused invalidation, or nil if the invalidation was explicit. +- (void)URLSession:(NSURLSession * __nonnull)session didBecomeInvalidWithError:(NSError * __nullable)error; + +/// Requests credentials from the delegate in response to a session-level authentication request from the remote server. +/// +/// \param session The session containing the task that requested authentication. +/// +/// \param challenge An object that contains the request for authentication. +/// +/// \param completionHandler A handler that your delegate method must call providing the disposition and credential. +- (void)URLSession:(NSURLSession * __nonnull)session didReceiveChallenge:(NSURLAuthenticationChallenge * __nonnull)challenge completionHandler:(void (^ __nonnull)(NSURLSessionAuthChallengeDisposition, NSURLCredential * __nullable))completionHandler; + +/// Tells the delegate that all messages enqueued for a session have been delivered. +/// +/// \param session The session that no longer has any outstanding requests. +- (void)URLSessionDidFinishEventsForBackgroundURLSession:(NSURLSession * __nonnull)session; + +/// Overrides default behavior for NSURLSessionTaskDelegate method URLSession:task:willPerformHTTPRedirection:newRequest:completionHandler:. +@property (nonatomic, copy) NSURLRequest * __nullable (^ __nullable taskWillPerformHTTPRedirection)(NSURLSession * __nonnull, NSURLSessionTask * __nonnull, NSHTTPURLResponse * __nonnull, NSURLRequest * __nonnull); + +/// Overrides default behavior for NSURLSessionTaskDelegate method URLSession:session:task:needNewBodyStream:. +@property (nonatomic, copy) NSInputStream * __null_unspecified (^ __nullable taskNeedNewBodyStream)(NSURLSession * __nonnull, NSURLSessionTask * __nonnull); + +/// Overrides default behavior for NSURLSessionTaskDelegate method URLSession:task:didSendBodyData:totalBytesSent:totalBytesExpectedToSend:. +@property (nonatomic, copy) void (^ __nullable taskDidSendBodyData)(NSURLSession * __nonnull, NSURLSessionTask * __nonnull, int64_t, int64_t, int64_t); + +/// Overrides default behavior for NSURLSessionTaskDelegate method URLSession:task:didCompleteWithError:. +@property (nonatomic, copy) void (^ __nullable taskDidComplete)(NSURLSession * __nonnull, NSURLSessionTask * __nonnull, NSError * __nullable); + +/// Tells the delegate that the remote server requested an HTTP redirect. +/// +/// \param session The session containing the task whose request resulted in a redirect. +/// +/// \param task The task whose request resulted in a redirect. +/// +/// \param response An object containing the server’s response to the original request. +/// +/// \param request A URL request object filled out with the new location. +/// +/// \param completionHandler A closure that your handler should call with either the value of the request +/// parameter, a modified URL request object, or NULL to refuse the redirect and +/// return the body of the redirect response. +- (void)URLSession:(NSURLSession * __nonnull)session task:(NSURLSessionTask * __nonnull)task willPerformHTTPRedirection:(NSHTTPURLResponse * __nonnull)response newRequest:(NSURLRequest * __nonnull)request completionHandler:(void (^ __nonnull)(NSURLRequest * __nullable))completionHandler; + +/// Requests credentials from the delegate in response to an authentication request from the remote server. +/// +/// \param session The session containing the task whose request requires authentication. +/// +/// \param task The task whose request requires authentication. +/// +/// \param challenge An object that contains the request for authentication. +/// +/// \param completionHandler A handler that your delegate method must call providing the disposition and credential. +- (void)URLSession:(NSURLSession * __nonnull)session task:(NSURLSessionTask * __nonnull)task didReceiveChallenge:(NSURLAuthenticationChallenge * __nonnull)challenge completionHandler:(void (^ __nonnull)(NSURLSessionAuthChallengeDisposition, NSURLCredential * __nullable))completionHandler; + +/// Tells the delegate when a task requires a new request body stream to send to the remote server. +/// +/// \param session The session containing the task that needs a new body stream. +/// +/// \param task The task that needs a new body stream. +/// +/// \param completionHandler A completion handler that your delegate method should call with the new body stream. +- (void)URLSession:(NSURLSession * __nonnull)session task:(NSURLSessionTask * __nonnull)task needNewBodyStream:(void (^ __nonnull)(NSInputStream * __nullable))completionHandler; + +/// Periodically informs the delegate of the progress of sending body content to the server. +/// +/// \param session The session containing the data task. +/// +/// \param task The data task. +/// +/// \param bytesSent The number of bytes sent since the last time this delegate method was called. +/// +/// \param totalBytesSent The total number of bytes sent so far. +/// +/// \param totalBytesExpectedToSend The expected length of the body data. +- (void)URLSession:(NSURLSession * __nonnull)session task:(NSURLSessionTask * __nonnull)task didSendBodyData:(int64_t)bytesSent totalBytesSent:(int64_t)totalBytesSent totalBytesExpectedToSend:(int64_t)totalBytesExpectedToSend; + +/// Tells the delegate that the task finished transferring data. +/// +/// \param session The session containing the task whose request finished transferring data. +/// +/// \param task The task whose request finished transferring data. +/// +/// \param error If an error occurred, an error object indicating how the transfer failed, otherwise nil. +- (void)URLSession:(NSURLSession * __nonnull)session task:(NSURLSessionTask * __nonnull)task didCompleteWithError:(NSError * __nullable)error; + +/// Overrides default behavior for NSURLSessionDataDelegate method URLSession:dataTask:didReceiveResponse:completionHandler:. +@property (nonatomic, copy) NSURLSessionResponseDisposition (^ __nullable dataTaskDidReceiveResponse)(NSURLSession * __nonnull, NSURLSessionDataTask * __nonnull, NSURLResponse * __nonnull); + +/// Overrides default behavior for NSURLSessionDataDelegate method URLSession:dataTask:didBecomeDownloadTask:. +@property (nonatomic, copy) void (^ __nullable dataTaskDidBecomeDownloadTask)(NSURLSession * __nonnull, NSURLSessionDataTask * __nonnull, NSURLSessionDownloadTask * __nonnull); + +/// Overrides default behavior for NSURLSessionDataDelegate method URLSession:dataTask:didReceiveData:. +@property (nonatomic, copy) void (^ __nullable dataTaskDidReceiveData)(NSURLSession * __nonnull, NSURLSessionDataTask * __nonnull, NSData * __nonnull); + +/// Overrides default behavior for NSURLSessionDataDelegate method URLSession:dataTask:willCacheResponse:completionHandler:. +@property (nonatomic, copy) NSCachedURLResponse * __null_unspecified (^ __nullable dataTaskWillCacheResponse)(NSURLSession * __nonnull, NSURLSessionDataTask * __nonnull, NSCachedURLResponse * __nonnull); + +/// Tells the delegate that the data task received the initial reply (headers) from the server. +/// +/// \param session The session containing the data task that received an initial reply. +/// +/// \param dataTask The data task that received an initial reply. +/// +/// \param response A URL response object populated with headers. +/// +/// \param completionHandler A completion handler that your code calls to continue the transfer, passing a +/// constant to indicate whether the transfer should continue as a data task or +/// should become a download task. +- (void)URLSession:(NSURLSession * __nonnull)session dataTask:(NSURLSessionDataTask * __nonnull)dataTask didReceiveResponse:(NSURLResponse * __nonnull)response completionHandler:(void (^ __nonnull)(NSURLSessionResponseDisposition))completionHandler; + +/// Tells the delegate that the data task was changed to a download task. +/// +/// \param session The session containing the task that was replaced by a download task. +/// +/// \param dataTask The data task that was replaced by a download task. +/// +/// \param downloadTask The new download task that replaced the data task. +- (void)URLSession:(NSURLSession * __nonnull)session dataTask:(NSURLSessionDataTask * __nonnull)dataTask didBecomeDownloadTask:(NSURLSessionDownloadTask * __nonnull)downloadTask; + +/// Tells the delegate that the data task has received some of the expected data. +/// +/// \param session The session containing the data task that provided data. +/// +/// \param dataTask The data task that provided data. +/// +/// \param data A data object containing the transferred data. +- (void)URLSession:(NSURLSession * __nonnull)session dataTask:(NSURLSessionDataTask * __nonnull)dataTask didReceiveData:(NSData * __nonnull)data; + +/// Asks the delegate whether the data (or upload) task should store the response in the cache. +/// +/// \param session The session containing the data (or upload) task. +/// +/// \param dataTask The data (or upload) task. +/// +/// \param proposedResponse The default caching behavior. This behavior is determined based on the current +/// caching policy and the values of certain received headers, such as the Pragma +/// and Cache-Control headers. +/// +/// \param completionHandler A block that your handler must call, providing either the original proposed +/// response, a modified version of that response, or NULL to prevent caching the +/// response. If your delegate implements this method, it must call this completion +/// handler; otherwise, your app leaks memory. +- (void)URLSession:(NSURLSession * __nonnull)session dataTask:(NSURLSessionDataTask * __nonnull)dataTask willCacheResponse:(NSCachedURLResponse * __nonnull)proposedResponse completionHandler:(void (^ __nonnull)(NSCachedURLResponse * __nullable))completionHandler; + +/// Overrides default behavior for NSURLSessionDownloadDelegate method URLSession:downloadTask:didFinishDownloadingToURL:. +@property (nonatomic, copy) void (^ __nullable downloadTaskDidFinishDownloadingToURL)(NSURLSession * __nonnull, NSURLSessionDownloadTask * __nonnull, NSURL * __nonnull); + +/// Overrides default behavior for NSURLSessionDownloadDelegate method URLSession:downloadTask:didWriteData:totalBytesWritten:totalBytesExpectedToWrite:. +@property (nonatomic, copy) void (^ __nullable downloadTaskDidWriteData)(NSURLSession * __nonnull, NSURLSessionDownloadTask * __nonnull, int64_t, int64_t, int64_t); + +/// Overrides default behavior for NSURLSessionDownloadDelegate method URLSession:downloadTask:didResumeAtOffset:expectedTotalBytes:. +@property (nonatomic, copy) void (^ __nullable downloadTaskDidResumeAtOffset)(NSURLSession * __nonnull, NSURLSessionDownloadTask * __nonnull, int64_t, int64_t); + +/// Tells the delegate that a download task has finished downloading. +/// +/// \param session The session containing the download task that finished. +/// +/// \param downloadTask The download task that finished. +/// +/// \param location A file URL for the temporary file. Because the file is temporary, you must either +/// open the file for reading or move it to a permanent location in your app’s sandbox +/// container directory before returning from this delegate method. +- (void)URLSession:(NSURLSession * __nonnull)session downloadTask:(NSURLSessionDownloadTask * __nonnull)downloadTask didFinishDownloadingToURL:(NSURL * __nonnull)location; + +/// Periodically informs the delegate about the download’s progress. +/// +/// \param session The session containing the download task. +/// +/// \param downloadTask The download task. +/// +/// \param bytesWritten The number of bytes transferred since the last time this delegate +/// method was called. +/// +/// \param totalBytesWritten The total number of bytes transferred so far. +/// +/// \param totalBytesExpectedToWrite The expected length of the file, as provided by the Content-Length +/// header. If this header was not provided, the value is +/// NSURLSessionTransferSizeUnknown +/// . +- (void)URLSession:(NSURLSession * __nonnull)session downloadTask:(NSURLSessionDownloadTask * __nonnull)downloadTask didWriteData:(int64_t)bytesWritten totalBytesWritten:(int64_t)totalBytesWritten totalBytesExpectedToWrite:(int64_t)totalBytesExpectedToWrite; + +/// Tells the delegate that the download task has resumed downloading. +/// +/// \param session The session containing the download task that finished. +/// +/// \param downloadTask The download task that resumed. See explanation in the discussion. +/// +/// \param fileOffset If the file's cache policy or last modified date prevents reuse of the +/// existing content, then this value is zero. Otherwise, this value is an +/// integer representing the number of bytes on disk that do not need to be +/// retrieved again. +/// +/// \param expectedTotalBytes The expected length of the file, as provided by the Content-Length header. +/// If this header was not provided, the value is NSURLSessionTransferSizeUnknown. +- (void)URLSession:(NSURLSession * __nonnull)session downloadTask:(NSURLSessionDownloadTask * __nonnull)downloadTask didResumeAtOffset:(int64_t)fileOffset expectedTotalBytes:(int64_t)expectedTotalBytes; +- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; +@end + +@class NSURLSessionStreamTask; +@class NSOutputStream; + +@interface SessionDelegate (SWIFT_EXTENSION(Alamofire)) + +/// Overrides default behavior for NSURLSessionStreamDelegate method URLSession:readClosedForStreamTask:. +@property (nonatomic, copy) void (^ __nullable streamTaskReadClosed)(NSURLSession * __nonnull, NSURLSessionStreamTask * __nonnull); + +/// Overrides default behavior for NSURLSessionStreamDelegate method URLSession:writeClosedForStreamTask:. +@property (nonatomic, copy) void (^ __nullable streamTaskWriteClosed)(NSURLSession * __nonnull, NSURLSessionStreamTask * __nonnull); + +/// Overrides default behavior for NSURLSessionStreamDelegate method URLSession:betterRouteDiscoveredForStreamTask:. +@property (nonatomic, copy) void (^ __nullable streamTaskBetterRouteDiscovered)(NSURLSession * __nonnull, NSURLSessionStreamTask * __nonnull); + +/// Overrides default behavior for NSURLSessionStreamDelegate method URLSession:streamTask:didBecomeInputStream:outputStream:. +@property (nonatomic, copy) void (^ __nullable streamTaskDidBecomeInputStream)(NSURLSession * __nonnull, NSURLSessionStreamTask * __nonnull, NSInputStream * __nonnull, NSOutputStream * __nonnull); + +/// Tells the delegate that the read side of the connection has been closed. +/// +/// \param session The session. +/// +/// \param streamTask The stream task. +- (void)URLSession:(NSURLSession * __nonnull)session readClosedForStreamTask:(NSURLSessionStreamTask * __nonnull)streamTask; + +/// Tells the delegate that the write side of the connection has been closed. +/// +/// \param session The session. +/// +/// \param streamTask The stream task. +- (void)URLSession:(NSURLSession * __nonnull)session writeClosedForStreamTask:(NSURLSessionStreamTask * __nonnull)streamTask; + +/// Tells the delegate that the system has determined that a better route to the host is available. +/// +/// \param session The session. +/// +/// \param streamTask The stream task. +- (void)URLSession:(NSURLSession * __nonnull)session betterRouteDiscoveredForStreamTask:(NSURLSessionStreamTask * __nonnull)streamTask; + +/// Tells the delegate that the stream task has been completed and provides the unopened stream objects. +/// +/// \param session The session. +/// +/// \param streamTask The stream task. +/// +/// \param inputStream The new input stream. +/// +/// \param outputStream The new output stream. +- (void)URLSession:(NSURLSession * __nonnull)session streamTask:(NSURLSessionStreamTask * __nonnull)streamTask didBecomeInputStream:(NSInputStream * __nonnull)inputStream outputStream:(NSOutputStream * __nonnull)outputStream; +@end + #pragma clang diagnostic pop diff --git a/Carthage/Build/Mac/Alamofire.framework/Versions/A/Modules/Alamofire.swiftmodule/x86_64.swiftdoc b/Carthage/Build/Mac/Alamofire.framework/Versions/A/Modules/Alamofire.swiftmodule/x86_64.swiftdoc index 95865edb..fcfbddd1 100644 Binary files a/Carthage/Build/Mac/Alamofire.framework/Versions/A/Modules/Alamofire.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/Mac/Alamofire.framework/Versions/A/Modules/Alamofire.swiftmodule/x86_64.swiftdoc differ diff --git a/Carthage/Build/Mac/Alamofire.framework/Versions/A/Modules/Alamofire.swiftmodule/x86_64.swiftmodule b/Carthage/Build/Mac/Alamofire.framework/Versions/A/Modules/Alamofire.swiftmodule/x86_64.swiftmodule index 674c73ac..8659ca70 100644 Binary files a/Carthage/Build/Mac/Alamofire.framework/Versions/A/Modules/Alamofire.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/Mac/Alamofire.framework/Versions/A/Modules/Alamofire.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/Mac/Alamofire.framework/Versions/A/Resources/Info.plist b/Carthage/Build/Mac/Alamofire.framework/Versions/A/Resources/Info.plist index fe1f9bc3..95139244 100644 --- a/Carthage/Build/Mac/Alamofire.framework/Versions/A/Resources/Info.plist +++ b/Carthage/Build/Mac/Alamofire.framework/Versions/A/Resources/Info.plist @@ -3,7 +3,7 @@ BuildMachineOSBuild - 14E46 + 14F27 CFBundleDevelopmentRegion en CFBundleExecutable @@ -17,25 +17,29 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.2.3 + 2.0.0 CFBundleSignature ???? + CFBundleSupportedPlatforms + + MacOSX + CFBundleVersion 1 DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 6E35b + 7A218 DTPlatformVersion GM DTSDKBuild - 14D125 + 15A278 DTSDKName - macosx10.10 + macosx10.11 DTXcode - 0640 + 0700 DTXcodeBuild - 6E35b + 7A218 UIDeviceFamily 1 diff --git a/Carthage/Build/Mac/JWTDecode.framework/Versions/A/Headers/JWTDecode-Swift.h b/Carthage/Build/Mac/JWTDecode.framework/Versions/A/Headers/JWTDecode-Swift.h index 443a4a15..b95125c9 100644 --- a/Carthage/Build/Mac/JWTDecode.framework/Versions/A/Headers/JWTDecode-Swift.h +++ b/Carthage/Build/Mac/JWTDecode.framework/Versions/A/Headers/JWTDecode-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 1.2 (swiftlang-602.0.53.1 clang-602.0.53) +// Generated by Apple Swift version 2.0 (swiftlang-700.0.59 clang-700.0.72) #pragma clang diagnostic push #if defined(__has_include) && __has_include() @@ -33,6 +33,11 @@ typedef struct _NSZone NSZone; #else # define SWIFT_RUNTIME_NAME(X) #endif +#if defined(__has_attribute) && __has_attribute(swift_name) +# define SWIFT_COMPILE_NAME(X) __attribute__((swift_name(X))) +#else +# define SWIFT_COMPILE_NAME(X) +#endif #if !defined(SWIFT_CLASS_EXTRA) # define SWIFT_CLASS_EXTRA #endif @@ -45,13 +50,16 @@ typedef struct _NSZone NSZone; #if !defined(SWIFT_CLASS) # if defined(__has_attribute) && __has_attribute(objc_subclassing_restricted) # define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_CLASS_EXTRA +# define SWIFT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA # else # define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA +# define SWIFT_CLASS_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA # endif #endif #if !defined(SWIFT_PROTOCOL) # define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA +# define SWIFT_PROTOCOL_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA #endif #if !defined(SWIFT_EXTENSION) @@ -68,35 +76,47 @@ typedef struct _NSZone NSZone; #if !defined(SWIFT_ENUM) # define SWIFT_ENUM(_type, _name) enum _name : _type _name; enum SWIFT_ENUM_EXTRA _name : _type #endif -#if __has_feature(nullability) -# define SWIFT_NULLABILITY(X) X -#else -# if !defined(__nonnull) -# define __nonnull -# endif -# if !defined(__nullable) -# define __nullable -# endif -# if !defined(__null_unspecified) -# define __null_unspecified -# endif -# define SWIFT_NULLABILITY(X) -#endif +typedef float swift_float2 __attribute__((__ext_vector_type__(2))); +typedef float swift_float3 __attribute__((__ext_vector_type__(3))); +typedef float swift_float4 __attribute__((__ext_vector_type__(4))); +typedef double swift_double2 __attribute__((__ext_vector_type__(2))); +typedef double swift_double3 __attribute__((__ext_vector_type__(3))); +typedef double swift_double4 __attribute__((__ext_vector_type__(4))); +typedef int swift_int2 __attribute__((__ext_vector_type__(2))); +typedef int swift_int3 __attribute__((__ext_vector_type__(3))); +typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #if defined(__has_feature) && __has_feature(modules) @import ObjectiveC; -@import Foundation; #endif #pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" #pragma clang diagnostic ignored "-Wduplicate-method-arg" @class NSDate; -SWIFT_CLASS("A0JWTDecoder") -@interface JWTDecoder : NSObject -- (SWIFT_NULLABILITY(nonnull) instancetype)initWithJwt:(NSString * __nonnull)jwt OBJC_DESIGNATED_INITIALIZER; -- (NSDictionary * __nullable)payloadWithError:(NSError * __nullable * __null_unspecified)error; -@property (nonatomic, readonly) BOOL expired; -@property (nonatomic, readonly) NSDate * __nullable expireDate; + +/// Class to allow Objective-C code to decode a JWT +SWIFT_CLASS("_TtC9JWTDecode5A0JWT") +@interface A0JWT : NSObject + +/// token header part +@property (nonatomic, readonly, copy) NSDictionary * __nonnull header; + +/// token body part or claims +@property (nonatomic, readonly, copy) NSDictionary * __nonnull body; + +/// token signature part +@property (nonatomic, readonly, copy) NSString * __nullable signature; + +/// value of the exp claim +@property (nonatomic, readonly) NSDate * __nullable expiresAt; + +/// Creates a new instance of A0JWT and decodes the given jwt token. +/// +/// :param: jwtValue of the token to decode +/// +/// :returns: a new instance of A0JWT +/// that holds the decode token ++ (A0JWT * __nullable)decode:(NSString * __nonnull)jwtValue error:(NSError * __nullable * __null_unspecified)error; @end #pragma clang diagnostic pop diff --git a/Carthage/Build/Mac/JWTDecode.framework/Versions/A/JWTDecode b/Carthage/Build/Mac/JWTDecode.framework/Versions/A/JWTDecode index 68080b77..2dc5ce2f 100755 Binary files a/Carthage/Build/Mac/JWTDecode.framework/Versions/A/JWTDecode and b/Carthage/Build/Mac/JWTDecode.framework/Versions/A/JWTDecode differ diff --git a/Carthage/Build/Mac/JWTDecode.framework/Versions/A/Modules/JWTDecode.swiftmodule/x86_64.swiftdoc b/Carthage/Build/Mac/JWTDecode.framework/Versions/A/Modules/JWTDecode.swiftmodule/x86_64.swiftdoc index 029a4362..3589b837 100644 Binary files a/Carthage/Build/Mac/JWTDecode.framework/Versions/A/Modules/JWTDecode.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/Mac/JWTDecode.framework/Versions/A/Modules/JWTDecode.swiftmodule/x86_64.swiftdoc differ diff --git a/Carthage/Build/Mac/JWTDecode.framework/Versions/A/Modules/JWTDecode.swiftmodule/x86_64.swiftmodule b/Carthage/Build/Mac/JWTDecode.framework/Versions/A/Modules/JWTDecode.swiftmodule/x86_64.swiftmodule index b03a37ca..bea1374f 100644 Binary files a/Carthage/Build/Mac/JWTDecode.framework/Versions/A/Modules/JWTDecode.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/Mac/JWTDecode.framework/Versions/A/Modules/JWTDecode.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/Mac/JWTDecode.framework/Versions/A/Resources/Info.plist b/Carthage/Build/Mac/JWTDecode.framework/Versions/A/Resources/Info.plist index aa035366..ef05f88a 100644 --- a/Carthage/Build/Mac/JWTDecode.framework/Versions/A/Resources/Info.plist +++ b/Carthage/Build/Mac/JWTDecode.framework/Versions/A/Resources/Info.plist @@ -3,7 +3,7 @@ BuildMachineOSBuild - 14E46 + 14F27 CFBundleDevelopmentRegion en CFBundleExecutable @@ -17,25 +17,29 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.3.0 + 1.0.0 CFBundleSignature ???? + CFBundleSupportedPlatforms + + MacOSX + CFBundleVersion 1 DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 6E35b + 7A218 DTPlatformVersion GM DTSDKBuild - 14D125 + 15A278 DTSDKName - macosx10.10 + macosx10.11 DTXcode - 0640 + 0700 DTXcodeBuild - 6E35b + 7A218 UIDeviceFamily 1 diff --git a/Carthage/Build/Mac/Nimble.framework/Versions/A/Headers/DSL.h b/Carthage/Build/Mac/Nimble.framework/Versions/A/Headers/DSL.h index 8186e1f1..551af885 100644 --- a/Carthage/Build/Mac/Nimble.framework/Versions/A/Headers/DSL.h +++ b/Carthage/Build/Mac/Nimble.framework/Versions/A/Headers/DSL.h @@ -14,7 +14,8 @@ #define NIMBLE_SHORT(PROTO, ORIGINAL) FOUNDATION_STATIC_INLINE PROTO { return (ORIGINAL); } #endif -NIMBLE_EXPORT NMBExpectation *NMB_expect(id(^actualBlock)(), const char *file, unsigned int line); +NIMBLE_EXPORT NMBExpectation *NMB_expect(id(^actualBlock)(), NSString *file, NSUInteger line); +NIMBLE_EXPORT NMBExpectation *NMB_expectAction(void(^actualBlock)(), NSString *file, NSUInteger line); NIMBLE_EXPORT id NMB_equal(id expectedValue); NIMBLE_SHORT(id equal(id expectedValue), @@ -80,9 +81,11 @@ NIMBLE_EXPORT id NMB_beEmpty(void); NIMBLE_SHORT(id beEmpty(void), NMB_beEmpty()); -NIMBLE_EXPORT id NMB_contain(id itemOrSubstring); -NIMBLE_SHORT(id contain(id itemOrSubstring), - NMB_contain(itemOrSubstring)); +NIMBLE_EXPORT id NMB_containWithNilTermination(id itemOrSubstring, ...) NS_REQUIRES_NIL_TERMINATION; +#define NMB_contain(...) NMB_containWithNilTermination(__VA_ARGS__, nil) +#ifndef NIMBLE_DISABLE_SHORT_SYNTAX +#define contain(...) NMB_contain(__VA_ARGS__) +#endif NIMBLE_EXPORT id NMB_endWith(id itemElementOrSubstring); NIMBLE_SHORT(id endWith(id itemElementOrSubstring), @@ -106,15 +109,21 @@ NIMBLE_SHORT(id allPass(id matcher), typedef void (^NMBWaitUntilTimeoutBlock)(NSTimeInterval timeout, void (^action)(void (^)(void))); typedef void (^NMBWaitUntilBlock)(void (^action)(void (^)(void))); -NIMBLE_EXPORT NMBWaitUntilTimeoutBlock nmb_wait_until_timeout_builder(NSString *file, NSUInteger line); -NIMBLE_EXPORT NMBWaitUntilBlock nmb_wait_until_builder(NSString *file, NSUInteger line); +NIMBLE_EXPORT NMBWaitUntilTimeoutBlock NMB_waitUntilTimeoutBuilder(NSString *file, NSUInteger line); +NIMBLE_EXPORT NMBWaitUntilBlock NMB_waitUntilBuilder(NSString *file, NSUInteger line); + +NIMBLE_EXPORT void NMB_failWithMessage(NSString *msg, NSString *file, NSUInteger line); -#define NMB_waitUntilTimeout nmb_wait_until_timeout_builder(@(__FILE__), __LINE__) -#define NMB_waitUntil nmb_wait_until_builder(@(__FILE__), __LINE__) +#define NMB_waitUntilTimeout NMB_waitUntilTimeoutBuilder(@(__FILE__), __LINE__) +#define NMB_waitUntil NMB_waitUntilBuilder(@(__FILE__), __LINE__) #ifndef NIMBLE_DISABLE_SHORT_SYNTAX -#define expect(...) NMB_expect(^id{ return (__VA_ARGS__); }, __FILE__, __LINE__) -#define expectAction(...) NMB_expect(^id{ (__VA_ARGS__); return nil; }, __FILE__, __LINE__) +#define expect(...) NMB_expect(^id{ return (__VA_ARGS__); }, @(__FILE__), __LINE__) +#define expectAction(BLOCK) NMB_expectAction((BLOCK), @(__FILE__), __LINE__) +#define failWithMessage(msg) NMB_failWithMessage(msg, @(__FILE__), __LINE__) +#define fail() failWithMessage(@"fail() always fails") + + #define waitUntilTimeout NMB_waitUntilTimeout #define waitUntil NMB_waitUntil #endif diff --git a/Carthage/Build/Mac/Nimble.framework/Versions/A/Headers/Nimble-Swift.h b/Carthage/Build/Mac/Nimble.framework/Versions/A/Headers/Nimble-Swift.h index b339c90c..6b083459 100644 --- a/Carthage/Build/Mac/Nimble.framework/Versions/A/Headers/Nimble-Swift.h +++ b/Carthage/Build/Mac/Nimble.framework/Versions/A/Headers/Nimble-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 1.2 (swiftlang-602.0.53.1 clang-602.0.53) +// Generated by Apple Swift version 2.0 (swiftlang-700.0.59 clang-700.0.72) #pragma clang diagnostic push #if defined(__has_include) && __has_include() @@ -33,6 +33,11 @@ typedef struct _NSZone NSZone; #else # define SWIFT_RUNTIME_NAME(X) #endif +#if defined(__has_attribute) && __has_attribute(swift_name) +# define SWIFT_COMPILE_NAME(X) __attribute__((swift_name(X))) +#else +# define SWIFT_COMPILE_NAME(X) +#endif #if !defined(SWIFT_CLASS_EXTRA) # define SWIFT_CLASS_EXTRA #endif @@ -45,13 +50,16 @@ typedef struct _NSZone NSZone; #if !defined(SWIFT_CLASS) # if defined(__has_attribute) && __has_attribute(objc_subclassing_restricted) # define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_CLASS_EXTRA +# define SWIFT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA # else # define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA +# define SWIFT_CLASS_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA # endif #endif #if !defined(SWIFT_PROTOCOL) # define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA +# define SWIFT_PROTOCOL_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA #endif #if !defined(SWIFT_EXTENSION) @@ -68,37 +76,38 @@ typedef struct _NSZone NSZone; #if !defined(SWIFT_ENUM) # define SWIFT_ENUM(_type, _name) enum _name : _type _name; enum SWIFT_ENUM_EXTRA _name : _type #endif -#if __has_feature(nullability) -# define SWIFT_NULLABILITY(X) X -#else -# if !defined(__nonnull) -# define __nonnull -# endif -# if !defined(__nullable) -# define __nullable -# endif -# if !defined(__null_unspecified) -# define __null_unspecified -# endif -# define SWIFT_NULLABILITY(X) -#endif +typedef float swift_float2 __attribute__((__ext_vector_type__(2))); +typedef float swift_float3 __attribute__((__ext_vector_type__(3))); +typedef float swift_float4 __attribute__((__ext_vector_type__(4))); +typedef double swift_double2 __attribute__((__ext_vector_type__(2))); +typedef double swift_double3 __attribute__((__ext_vector_type__(3))); +typedef double swift_double4 __attribute__((__ext_vector_type__(4))); +typedef int swift_int2 __attribute__((__ext_vector_type__(2))); +typedef int swift_int3 __attribute__((__ext_vector_type__(3))); +typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #if defined(__has_feature) && __has_feature(modules) -@import Foundation; @import ObjectiveC; +@import Foundation; #endif #pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" #pragma clang diagnostic ignored "-Wduplicate-method-arg" + +/// Encapsulates the failure message that matchers can report to the end user. +/// +/// This is shared state between Nimble and matchers that mutate this value. SWIFT_CLASS("_TtC6Nimble14FailureMessage") -@interface FailureMessage +@interface FailureMessage : NSObject @property (nonatomic, copy) NSString * __nonnull expected; @property (nonatomic, copy) NSString * __nullable actualValue; @property (nonatomic, copy) NSString * __nonnull to; @property (nonatomic, copy) NSString * __nonnull postfixMessage; @property (nonatomic, copy) NSString * __nonnull postfixActual; -- (SWIFT_NULLABILITY(nonnull) instancetype)init OBJC_DESIGNATED_INITIALIZER; -- (NSString * __nonnull)stringValue; +@property (nonatomic, copy) NSString * __nullable userDescription; +@property (nonatomic, copy) NSString * __nonnull stringValue; +- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; +- (nonnull instancetype)initWithStringValue:(NSString * __nonnull)stringValue OBJC_DESIGNATED_INITIALIZER; @end @@ -111,7 +120,8 @@ SWIFT_PROTOCOL("_TtP6Nimble13NMBCollection_") -///
Protocol for types to support beLessThan(), beLessThanOrEqualTo(),

beGreaterThan(), beGreaterThanOrEqualTo(), and equal() matchers.

+/// Protocol for types to support beLessThan(), beLessThanOrEqualTo(), beGreaterThan(), beGreaterThanOrEqualTo(), and equal() matchers. +/// /// Types that conform to Swift's Comparable protocol will work implicitly too SWIFT_PROTOCOL("_TtP6Nimble13NMBComparable_") @protocol NMBComparable @@ -138,20 +148,27 @@ SWIFT_PROTOCOL("_TtP6Nimble20NMBDoubleConvertible_") SWIFT_CLASS("_TtC6Nimble14NMBExpectation") @interface NMBExpectation : NSObject -- (SWIFT_NULLABILITY(nonnull) instancetype)initWithActualBlock:(NSObject * __null_unspecified (^ __nonnull)(void))actualBlock negative:(BOOL)negative file:(NSString * __nonnull)file line:(NSUInteger)line OBJC_DESIGNATED_INITIALIZER; +- (nonnull instancetype)initWithActualBlock:(NSObject * __null_unspecified (^ __nonnull)(void))actualBlock negative:(BOOL)negative file:(NSString * __nonnull)file line:(NSUInteger)line OBJC_DESIGNATED_INITIALIZER; @property (nonatomic, readonly, copy) NMBExpectation * __nonnull (^ __nonnull withTimeout)(NSTimeInterval); @property (nonatomic, readonly, copy) void (^ __nonnull to)(id __nonnull); +@property (nonatomic, readonly, copy) void (^ __nonnull toWithDescription)(id __nonnull, NSString * __nonnull); @property (nonatomic, readonly, copy) void (^ __nonnull toNot)(id __nonnull); +@property (nonatomic, readonly, copy) void (^ __nonnull toNotWithDescription)(id __nonnull, NSString * __nonnull); @property (nonatomic, readonly, copy) void (^ __nonnull notTo)(id __nonnull); +@property (nonatomic, readonly, copy) void (^ __nonnull notToWithDescription)(id __nonnull, NSString * __nonnull); @property (nonatomic, readonly, copy) void (^ __nonnull toEventually)(id __nonnull); +@property (nonatomic, readonly, copy) void (^ __nonnull toEventuallyWithDescription)(id __nonnull, NSString * __nonnull); @property (nonatomic, readonly, copy) void (^ __nonnull toEventuallyNot)(id __nonnull); +@property (nonatomic, readonly, copy) void (^ __nonnull toEventuallyNotWithDescription)(id __nonnull, NSString * __nonnull); +@property (nonatomic, readonly, copy) void (^ __nonnull toNotEventually)(id __nonnull); +@property (nonatomic, readonly, copy) void (^ __nonnull toNotEventuallyWithDescription)(id __nonnull, NSString * __nonnull); ++ (void)failWithMessage:(NSString * __nonnull)message file:(NSString * __nonnull)file line:(NSUInteger)line; @end @class SourceLocation; -/// Objective-C interface to the Swift variant of Matcher. This gives you full control over -/// to() and toNot() behaviors when matching a value. +/// Objective-C interface to the Swift variant of Matcher. SWIFT_PROTOCOL("_TtP6Nimble10NMBMatcher_") @protocol NMBMatcher - (BOOL)matches:(NSObject * __null_unspecified (^ __nonnull)(void))actualBlock failureMessage:(FailureMessage * __nonnull)failureMessage location:(SourceLocation * __nonnull)location; @@ -160,7 +177,7 @@ SWIFT_PROTOCOL("_TtP6Nimble10NMBMatcher_") SWIFT_CLASS("_TtC6Nimble23NMBObjCBeCloseToMatcher") -@interface NMBObjCBeCloseToMatcher +@interface NMBObjCBeCloseToMatcher : NSObject - (BOOL)matches:(NSObject * __null_unspecified (^ __nonnull)(void))actualExpression failureMessage:(FailureMessage * __nonnull)failureMessage location:(SourceLocation * __nonnull)location; - (BOOL)doesNotMatch:(NSObject * __null_unspecified (^ __nonnull)(void))actualExpression failureMessage:(FailureMessage * __nonnull)failureMessage location:(SourceLocation * __nonnull)location; @property (nonatomic, readonly, copy) NMBObjCBeCloseToMatcher * __nonnull (^ __nonnull within)(double); @@ -168,17 +185,12 @@ SWIFT_CLASS("_TtC6Nimble23NMBObjCBeCloseToMatcher") SWIFT_CLASS("_TtC6Nimble14NMBObjCMatcher") -@interface NMBObjCMatcher +@interface NMBObjCMatcher : NSObject - (BOOL)matches:(NSObject * __null_unspecified (^ __nonnull)(void))actualBlock failureMessage:(FailureMessage * __nonnull)failureMessage location:(SourceLocation * __nonnull)location; - (BOOL)doesNotMatch:(NSObject * __null_unspecified (^ __nonnull)(void))actualBlock failureMessage:(FailureMessage * __nonnull)failureMessage location:(SourceLocation * __nonnull)location; @end -@interface NMBObjCMatcher (SWIFT_EXTENSION(Nimble)) -+ (NMBObjCMatcher * __nonnull)endWithMatcher:(id __nonnull)expected; -@end - - @interface NMBObjCMatcher (SWIFT_EXTENSION(Nimble)) + (NMBObjCMatcher * __nonnull)beNilMatcher; @end @@ -258,7 +270,12 @@ SWIFT_CLASS("_TtC6Nimble14NMBObjCMatcher") @interface NMBObjCMatcher (SWIFT_EXTENSION(Nimble)) -+ (NMBObjCMatcher * __nonnull)containMatcher:(NSObject * __nullable)expected; ++ (NMBObjCMatcher * __nonnull)containMatcher:(NSArray * __nonnull)expected; +@end + + +@interface NMBObjCMatcher (SWIFT_EXTENSION(Nimble)) ++ (NMBObjCMatcher * __nonnull)endWithMatcher:(id __nonnull)expected; @end @@ -270,17 +287,16 @@ SWIFT_CLASS("_TtC6Nimble14NMBObjCMatcher") @end @class NSDictionary; +@class NSException; SWIFT_CLASS("_TtC6Nimble28NMBObjCRaiseExceptionMatcher") -@interface NMBObjCRaiseExceptionMatcher +@interface NMBObjCRaiseExceptionMatcher : NSObject - (BOOL)matches:(NSObject * __null_unspecified (^ __nonnull)(void))actualBlock failureMessage:(FailureMessage * __nonnull)failureMessage location:(SourceLocation * __nonnull)location; - (BOOL)doesNotMatch:(NSObject * __null_unspecified (^ __nonnull)(void))actualBlock failureMessage:(FailureMessage * __nonnull)failureMessage location:(SourceLocation * __nonnull)location; @property (nonatomic, readonly, copy) NMBObjCRaiseExceptionMatcher * __nonnull (^ __nonnull named)(NSString * __nonnull); @property (nonatomic, readonly, copy) NMBObjCRaiseExceptionMatcher * __nonnull (^ __nonnull reason)(NSString * __nullable); @property (nonatomic, readonly, copy) NMBObjCRaiseExceptionMatcher * __nonnull (^ __nonnull userInfo)(NSDictionary * __nullable); -@property (nonatomic, readonly, copy) NMBObjCRaiseExceptionMatcher * __nonnull (^ __nonnull withName)(id __nonnull); -@property (nonatomic, readonly, copy) NMBObjCRaiseExceptionMatcher * __nonnull (^ __nonnull withReason)(id __nonnull); -@property (nonatomic, readonly, copy) NMBObjCRaiseExceptionMatcher * __nonnull (^ __nonnull withUserInfo)(id __nonnull); +@property (nonatomic, readonly, copy) NMBObjCRaiseExceptionMatcher * __nonnull (^ __nonnull satisfyingBlock)(void (^ __nullable)(NSException * __nonnull)); @end @@ -292,22 +308,11 @@ SWIFT_PROTOCOL("_TtP6Nimble20NMBOrderedCollection_") @end - -/// Only classes, protocols, methods, properties, and subscript declarations can be -/// bridges to Objective-C via the @objc keyword. This class encapsulates callback-style -/// asynchronous waiting logic so that it may be called from Objective-C and Swift. -SWIFT_CLASS("_TtC6Nimble7NMBWait") -@interface NMBWait -+ (void)untilTimeout:(NSTimeInterval)timeout file:(NSString * __nonnull)file line:(NSUInteger)line action:(void (^ __nonnull)(void (^ __nonnull)(void)))action; -+ (void)untilFile:(NSString * __nonnull)file line:(NSUInteger)line action:(void (^ __nonnull)(void (^ __nonnull)(void)))action; -@end - - -@interface NSArray (SWIFT_EXTENSION(Nimble)) +@interface NSArray (SWIFT_EXTENSION(Nimble)) @end -@interface NSArray (SWIFT_EXTENSION(Nimble)) +@interface NSArray (SWIFT_EXTENSION(Nimble)) @end @@ -315,7 +320,8 @@ SWIFT_CLASS("_TtC6Nimble7NMBWait") @end -@interface NSDecimalNumber (SWIFT_EXTENSION(Nimble)) +@interface NSDate (SWIFT_EXTENSION(Nimble)) +@property (nonatomic, readonly) double doubleValue; @end @@ -354,7 +360,7 @@ SWIFT_CLASS("_TtC6Nimble7NMBWait") SWIFT_CLASS("_TtC6Nimble14SourceLocation") -@interface SourceLocation +@interface SourceLocation : NSObject @property (nonatomic, readonly, copy) NSString * __nonnull file; @property (nonatomic, readonly) NSUInteger line; @property (nonatomic, readonly, copy) NSString * __nonnull description; diff --git a/Carthage/Build/Mac/Nimble.framework/Versions/A/Modules/Nimble.swiftmodule/x86_64.swiftdoc b/Carthage/Build/Mac/Nimble.framework/Versions/A/Modules/Nimble.swiftmodule/x86_64.swiftdoc index 213bd3a7..36a1c16d 100644 Binary files a/Carthage/Build/Mac/Nimble.framework/Versions/A/Modules/Nimble.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/Mac/Nimble.framework/Versions/A/Modules/Nimble.swiftmodule/x86_64.swiftdoc differ diff --git a/Carthage/Build/Mac/Nimble.framework/Versions/A/Modules/Nimble.swiftmodule/x86_64.swiftmodule b/Carthage/Build/Mac/Nimble.framework/Versions/A/Modules/Nimble.swiftmodule/x86_64.swiftmodule index df4b9863..db007bc2 100644 Binary files a/Carthage/Build/Mac/Nimble.framework/Versions/A/Modules/Nimble.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/Mac/Nimble.framework/Versions/A/Modules/Nimble.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/Mac/Nimble.framework/Versions/A/Nimble b/Carthage/Build/Mac/Nimble.framework/Versions/A/Nimble index f64df7d1..6d148666 100755 Binary files a/Carthage/Build/Mac/Nimble.framework/Versions/A/Nimble and b/Carthage/Build/Mac/Nimble.framework/Versions/A/Nimble differ diff --git a/Carthage/Build/Mac/Nimble.framework/Versions/A/Resources/Info.plist b/Carthage/Build/Mac/Nimble.framework/Versions/A/Resources/Info.plist index 35b0ae8a..ff30eaa3 100644 --- a/Carthage/Build/Mac/Nimble.framework/Versions/A/Resources/Info.plist +++ b/Carthage/Build/Mac/Nimble.framework/Versions/A/Resources/Info.plist @@ -3,7 +3,7 @@ BuildMachineOSBuild - 14E46 + 14F27 CFBundleDevelopmentRegion en CFBundleExecutable @@ -20,22 +20,26 @@ 1.0 CFBundleSignature ???? + CFBundleSupportedPlatforms + + MacOSX + CFBundleVersion 1 DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 6E35b + 7A218 DTPlatformVersion GM DTSDKBuild - 14D125 + 15A278 DTSDKName - macosx10.10 + macosx10.11 DTXcode - 0640 + 0700 DTXcodeBuild - 6E35b + 7A218 NSHumanReadableCopyright Copyright © 2014 Jeff Hui. All rights reserved. UIDeviceFamily diff --git a/Carthage/Build/Mac/OHHTTPStubs.framework/Versions/A/Headers/Compatibility.h b/Carthage/Build/Mac/OHHTTPStubs.framework/Versions/A/Headers/Compatibility.h new file mode 100644 index 00000000..b41ddda6 --- /dev/null +++ b/Carthage/Build/Mac/OHHTTPStubs.framework/Versions/A/Headers/Compatibility.h @@ -0,0 +1,47 @@ +/*********************************************************************************** + * + * Copyright (c) 2012 Olivier Halligon + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + ***********************************************************************************/ + + +/* + * This file allows to keep compatibility with older SDKs which didn't have + * the latest features and associated macros yet. + */ + + +#ifndef NS_DESIGNATED_INITIALIZER + #if __has_attribute(objc_designated_initializer) + #define NS_DESIGNATED_INITIALIZER __attribute__((objc_designated_initializer)) + #else + #define NS_DESIGNATED_INITIALIZER + #endif +#endif + +// Allow to use nullability macros and keywords even if not supported yet +#if ! __has_feature(nullability) + #define NS_ASSUME_NONNULL_BEGIN + #define NS_ASSUME_NONNULL_END + #define nullable + #define __nullable + #define __nonnull +#endif diff --git a/Carthage/Build/Mac/OHHTTPStubs.framework/Versions/A/Headers/OHHTTPStubs+Mocktail.h b/Carthage/Build/Mac/OHHTTPStubs.framework/Versions/A/Headers/OHHTTPStubs+Mocktail.h new file mode 100644 index 00000000..09f218cf --- /dev/null +++ b/Carthage/Build/Mac/OHHTTPStubs.framework/Versions/A/Headers/OHHTTPStubs+Mocktail.h @@ -0,0 +1,80 @@ +// +// OHHTTPStubs+Mocktail.h +// CardCompanion +// +// Created by Wang, Sunny on 7/30/15. +// + +#import +#import + +NS_ASSUME_NONNULL_BEGIN + +/** + * Error codes for the OHHTTPStubs Mocktail category + */ +typedef NS_ENUM(NSInteger, OHHTTPStubsMocktailError) { + /** The specified path does not exist */ + OHHTTPStubsMocktailErrorPathDoesNotExist = 1, + /** The specified path was not readable */ + OHHTTPStubsMocktailErrorPathFailedToRead, + /** The specified path is not a directory */ + OHHTTPStubsMocktailErrorPathIsNotFolder, + /** The specified file is not a valid Mocktail file */ + OHHTTPStubsMocktailErrorInvalidFileFormat, + /** The specified Mocktail file has invalid headers */ + OHHTTPStubsMocktailErrorInvalidFileHeader, + /** An unexpected internal error occured */ + OHHTTPStubsMocktailErrorInternalError +}; + +extern NSString* const MocktailErrorDomain; + +@interface OHHTTPStubs (Mocktail) + +/** + * Add a stub given a file in the format of Mocktail as defined at https://github.com/square/objc-mocktail. + * + * This method will split the HTTP method Regex, the absolute URL Regex, the headers, the HTTP status code and + * response body, and use them to add a stub. + * + * @param fileName The name of the mocktail file (without extension of '.tail') in the Mocktail format. + * @param bundleOrNil The bundle in which the mocktail file is located. If `nil`, the `[NSBundle bundleForClass:self.class]` will be used. + * @param error An out value that returns any error encountered during stubbing. Returns an NSError object if any error; otherwise returns nil. + * + * @return a stub descriptor that uniquely identifies the stub and can be later used to remove it with + * `removeStub:`. + */ ++(id)stubRequestsUsingMocktailNamed:(NSString *)fileName inBundle:(nullable NSBundle*)bundleOrNil error:(NSError **)error; + +/** + * Add a stub given a file URL in the format of Mocktail as defined at https://github.com/square/objc-mocktail. + * + * This method will split the HTTP method Regex, the absolute URL Regex, the headers, the HTTP status code and + * response body, and use them to add a stub. + * + * @param fileURL The URL pointing to the file in the Mocktail format. + * @param error An out value that returns any error encountered during stubbing. Returns an NSError object if any error; otherwise returns nil. + * + * @return a stub descriptor that uniquely identifies the stub and can be later used to remove it with + * `removeStub:`. + */ ++(id)stubRequestsUsingMocktail:(NSURL *)fileURL error:(NSError **)error; + +/** + * Add stubs using files under a folder in the format of Mocktail as defined at https://github.com/square/objc-mocktail. + * + * This method will retrieve all the files under the folder; for each file with surfix of ".tail", it will split the HTTP method Regex, the absolute URL Regex, the headers, the HTTP status code and response body, and use them to add a stub. + * + * @param path The name of the folder containing files in the Mocktail format. + * @param bundleOrNil The bundle in which the path is located. If `nil`, the `[NSBundle bundleForClass:self.class]` will be used. + * @param error An out value that returns any error encountered during stubbing. Returns an NSError object if any error; otherwise returns nil. + * + * @return an array of stub descriptor that uniquely identifies the stub and can be later used to remove it with + * `removeStub:`. + */ ++(NSArray *)stubRequestsUsingMocktailsAtPath:(NSString *)path inBundle:(nullable NSBundle*)bundleOrNil error:(NSError **)error; + +@end + +NS_ASSUME_NONNULL_END diff --git a/Carthage/Build/Mac/OHHTTPStubs.framework/Versions/A/Headers/OHHTTPStubs.h b/Carthage/Build/Mac/OHHTTPStubs.framework/Versions/A/Headers/OHHTTPStubs.h index d4b85dc1..54636a0a 100644 --- a/Carthage/Build/Mac/OHHTTPStubs.framework/Versions/A/Headers/OHHTTPStubs.h +++ b/Carthage/Build/Mac/OHHTTPStubs.framework/Versions/A/Headers/OHHTTPStubs.h @@ -22,39 +22,23 @@ * ***********************************************************************************/ -// For SDK 7.1 Compatibility (as this macro was only included starting SDK 8.0) -#ifndef NS_DESIGNATED_INITIALIZER - #if __has_attribute(objc_designated_initializer) - #define NS_DESIGNATED_INITIALIZER __attribute__((objc_designated_initializer)) - #else - #define NS_DESIGNATED_INITIALIZER - #endif -#endif //////////////////////////////////////////////////////////////////////////////// #pragma mark - Imports #import -#import "OHHTTPStubsResponse.h" -// Because this is supposed to be an umbrella header, we should import every public headers here -#import "OHHTTPStubsResponse+HTTPMessage.h" -#import "OHHTTPStubsResponse+JSON.h" -#import "OHPathHelpers.h" - -#ifdef NS_ASSUME_NONNULL_BEGIN - NS_ASSUME_NONNULL_BEGIN - #define _nullable_ __nullable - #define _nonnull_ __nonnull -#else - #define _nullable_ - #define _nonnull_ -#endif + +#import +#import + + +NS_ASSUME_NONNULL_BEGIN //////////////////////////////////////////////////////////////////////////////// #pragma mark - Types typedef BOOL(^OHHTTPStubsTestBlock)(NSURLRequest* request); -typedef OHHTTPStubsResponse* _nonnull_ (^OHHTTPStubsResponseBlock)( NSURLRequest* request); +typedef OHHTTPStubsResponse* __nonnull (^OHHTTPStubsResponseBlock)( NSURLRequest* request); /** * This opaque type represents an installed stub and is used to uniquely @@ -74,7 +58,7 @@ typedef OHHTTPStubsResponse* _nonnull_ (^OHHTTPStubsResponseBlock)( NSURLRequest * This is especially useful if you dump all installed stubs using `allStubs` * or if you want to log which stubs are being triggered using `onStubActivation:`. */ -@property(nonatomic, strong) NSString* _nullable_ name; +@property(nonatomic, strong, nullable) NSString* name; @end //////////////////////////////////////////////////////////////////////////////// @@ -190,6 +174,22 @@ typedef OHHTTPStubsResponse* _nonnull_ (^OHHTTPStubsResponseBlock)( NSURLRequest @end -#ifdef NS_ASSUME_NONNULL_END - NS_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END + + +//////////////////////////////////////////////////////////////////////////////// +#pragma mark - Umbrella Header Imports + +// Because this is supposed to be an umbrella header, we should also import every public headers here +#if __has_include() + #import +#endif +#if __has_include() + #import +#endif +#if __has_include() + #import +#endif +#if __has_include() +#import #endif diff --git a/Carthage/Build/Mac/OHHTTPStubs.framework/Versions/A/Headers/OHHTTPStubsResponse+HTTPMessage.h b/Carthage/Build/Mac/OHHTTPStubs.framework/Versions/A/Headers/OHHTTPStubsResponse+HTTPMessage.h index 0ac0f6e1..2776a4f3 100644 --- a/Carthage/Build/Mac/OHHTTPStubs.framework/Versions/A/Headers/OHHTTPStubsResponse+HTTPMessage.h +++ b/Carthage/Build/Mac/OHHTTPStubs.framework/Versions/A/Headers/OHHTTPStubsResponse+HTTPMessage.h @@ -1,24 +1,41 @@ -// -// OHHTTPStubsResponse+HTTPMessage.h -// OHHTTPStubs -// -// Created by Olivier Halligon on 01/09/13. -// Copyright (c) 2013 AliSoftware. All rights reserved. -// - -#import "OHHTTPStubsResponse.h" - -#ifdef NS_ASSUME_NONNULL_BEGIN - NS_ASSUME_NONNULL_BEGIN - #define _nullable_ __nullable -#else - #define _nullable_ -#endif +/*********************************************************************************** + * + * Copyright (c) 2012 Olivier Halligon + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + ***********************************************************************************/ +/* This category is not available on watchOS because CFNetwork is needed for its implementation but isn't available on Nano */ +#if __has_include() + +#import +#import + +NS_ASSUME_NONNULL_BEGIN + /** * Adds support for building stubs from "HTTP Messages" conforming to * the format output by `curl -is` + * + * @note This category is not available on watchOS */ @interface OHHTTPStubsResponse (HTTPMessage) @@ -52,11 +69,11 @@ */ +(instancetype)responseNamed:(NSString*)responseName - inBundle:(NSBundle* _nullable_)bundleOrNil; + inBundle:(nullable NSBundle*)bundleOrNil; @end -#ifdef NS_ASSUME_NONNULL_END - NS_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END + #endif diff --git a/Carthage/Build/Mac/OHHTTPStubs.framework/Versions/A/Headers/OHHTTPStubsResponse+JSON.h b/Carthage/Build/Mac/OHHTTPStubs.framework/Versions/A/Headers/OHHTTPStubsResponse+JSON.h index fc8719df..3069ff32 100644 --- a/Carthage/Build/Mac/OHHTTPStubs.framework/Versions/A/Headers/OHHTTPStubsResponse+JSON.h +++ b/Carthage/Build/Mac/OHHTTPStubs.framework/Versions/A/Headers/OHHTTPStubsResponse+JSON.h @@ -1,20 +1,32 @@ -// -// OHHTTPStubsResponse+JSON.h -// OHHTTPStubs -// -// Created by Olivier Halligon on 01/09/13. -// Copyright (c) 2013 AliSoftware. All rights reserved. -// +/*********************************************************************************** + * + * Copyright (c) 2012 Olivier Halligon + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + ***********************************************************************************/ -#import "OHHTTPStubsResponse.h" -#ifdef NS_ASSUME_NONNULL_BEGIN - NS_ASSUME_NONNULL_BEGIN - #define _nullable_ __nullable -#else - #define _nullable_ -#endif +#import +#import +NS_ASSUME_NONNULL_BEGIN /** * Adds convenience methods to manipulate JSON objects directly. @@ -38,10 +50,8 @@ */ + (instancetype)responseWithJSONObject:(id)jsonObject statusCode:(int)statusCode - headers:(NSDictionary * _nullable_)httpHeaders; + headers:(nullable NSDictionary *)httpHeaders; @end -#ifdef NS_ASSUME_NONNULL_END - NS_ASSUME_NONNULL_END -#endif +NS_ASSUME_NONNULL_END diff --git a/Carthage/Build/Mac/OHHTTPStubs.framework/Versions/A/Headers/OHHTTPStubsResponse.h b/Carthage/Build/Mac/OHHTTPStubs.framework/Versions/A/Headers/OHHTTPStubsResponse.h index a80abd13..f96dfbf9 100644 --- a/Carthage/Build/Mac/OHHTTPStubs.framework/Versions/A/Headers/OHHTTPStubsResponse.h +++ b/Carthage/Build/Mac/OHHTTPStubs.framework/Versions/A/Headers/OHHTTPStubsResponse.h @@ -22,19 +22,12 @@ * ***********************************************************************************/ -// For SDK 7.1 Compatibility (as this macro was only included starting SDK 8.0) -#ifndef NS_DESIGNATED_INITIALIZER - #if __has_attribute(objc_designated_initializer) - #define NS_DESIGNATED_INITIALIZER __attribute__((objc_designated_initializer)) - #else - #define NS_DESIGNATED_INITIALIZER - #endif -#endif //////////////////////////////////////////////////////////////////////////////// #pragma mark - Imports #import +#import //////////////////////////////////////////////////////////////////////////////// #pragma mark - Defines & Constants @@ -47,13 +40,8 @@ OHHTTPStubsDownloadSpeed3G, OHHTTPStubsDownloadSpeed3GPlus, OHHTTPStubsDownloadSpeedWifi; -#ifdef NS_ASSUME_NONNULL_BEGIN - NS_ASSUME_NONNULL_BEGIN - #define _nullable_ __nullable -#else - #define _nullable_ -#endif +NS_ASSUME_NONNULL_BEGIN //////////////////////////////////////////////////////////////////////////////// #pragma mark - Interface @@ -70,7 +58,7 @@ OHHTTPStubsDownloadSpeedWifi; /** * The headers to use for the fake response */ -@property(nonatomic, strong) NSDictionary* _nullable_ httpHeaders; +@property(nonatomic, strong, nullable) NSDictionary* httpHeaders; /** * The HTTP status code to use for the fake response */ @@ -79,7 +67,7 @@ OHHTTPStubsDownloadSpeedWifi; * The inputStream used when sending the response. * @note You generally don't manipulate this directly. */ -@property(nonatomic, strong) NSInputStream* _nullable_ inputStream; +@property(nonatomic, strong, nullable) NSInputStream* inputStream; /** * The size of the fake response body, in bytes. */ @@ -101,9 +89,7 @@ OHHTTPStubsDownloadSpeedWifi; * * If `error` is non-`nil`, the request will result in a failure and no response will be sent. */ -@property(nonatomic, strong) NSError* _nullable_ error; - - +@property(nonatomic, strong, nullable) NSError* error; //////////////////////////////////////////////////////////////////////////////// @@ -125,7 +111,7 @@ OHHTTPStubsDownloadSpeedWifi; */ +(instancetype)responseWithData:(NSData*)data statusCode:(int)statusCode - headers:(NSDictionary* _nullable_)httpHeaders; + headers:(nullable NSDictionary*)httpHeaders; /* -------------------------------------------------------------------------- */ @@ -145,7 +131,7 @@ OHHTTPStubsDownloadSpeedWifi; */ +(instancetype)responseWithFileAtPath:(NSString *)filePath statusCode:(int)statusCode - headers:(NSDictionary* _nullable_)httpHeaders; + headers:(nullable NSDictionary*)httpHeaders; /* -------------------------------------------------------------------------- */ #pragma mark > Building an error response @@ -204,6 +190,15 @@ OHHTTPStubsDownloadSpeedWifi; #pragma mark - Initializers /*! @name Initializers */ +/** + * Designated empty initializer + * + * @return An empty `OHHTTPStubsResponse` on which you need to set either an error or a statusCode, httpHeaders, inputStream and dataSize. + * + * @note This is not recommended to use this method directly. You should use `initWithInputStream:dataSize:statusCode:headers:` instead. + */ +-(instancetype)init NS_DESIGNATED_INITIALIZER; + /** * Designed initializer. Initialize a response with the given input stream, dataSize, * statusCode and headers. @@ -220,7 +215,7 @@ OHHTTPStubsDownloadSpeedWifi; -(instancetype)initWithInputStream:(NSInputStream*)inputStream dataSize:(unsigned long long)dataSize statusCode:(int)statusCode - headers:(NSDictionary* _nullable_)httpHeaders NS_DESIGNATED_INITIALIZER; + headers:(nullable NSDictionary*)httpHeaders NS_DESIGNATED_INITIALIZER; /** @@ -236,7 +231,7 @@ OHHTTPStubsDownloadSpeedWifi; */ -(instancetype)initWithFileAtPath:(NSString*)filePath statusCode:(int)statusCode - headers:(NSDictionary* _nullable_)httpHeaders; + headers:(nullable NSDictionary*)httpHeaders; /** @@ -250,7 +245,7 @@ OHHTTPStubsDownloadSpeedWifi; */ -(instancetype)initWithData:(NSData*)data statusCode:(int)statusCode - headers:(NSDictionary* _nullable_)httpHeaders; + headers:(nullable NSDictionary*)httpHeaders; /** @@ -266,6 +261,4 @@ OHHTTPStubsDownloadSpeedWifi; @end -#ifdef NS_ASSUME_NONNULL_END - NS_ASSUME_NONNULL_END -#endif +NS_ASSUME_NONNULL_END diff --git a/Carthage/Build/Mac/OHHTTPStubs.framework/Versions/A/Headers/OHPathHelpers.h b/Carthage/Build/Mac/OHHTTPStubs.framework/Versions/A/Headers/OHPathHelpers.h index aa250547..b3c301ac 100644 --- a/Carthage/Build/Mac/OHHTTPStubs.framework/Versions/A/Headers/OHPathHelpers.h +++ b/Carthage/Build/Mac/OHHTTPStubs.framework/Versions/A/Headers/OHPathHelpers.h @@ -1,20 +1,32 @@ -// -// OHPathHelpers.h -// Pods -// -// Created by Olivier Halligon on 18/04/2015. -// -// +/*********************************************************************************** + * + * Copyright (c) 2012 Olivier Halligon + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + ***********************************************************************************/ -#import -#ifdef NS_ASSUME_NONNULL_BEGIN - NS_ASSUME_NONNULL_BEGIN - #define _nullable_ __nullable -#else - #define _nullable_ -#endif +#import +#import +NS_ASSUME_NONNULL_BEGIN /** * Useful function to build a path given a file name and a class. @@ -27,7 +39,7 @@ * * @return The path of the given file in the same bundle as the inBundleForClass class */ -NSString* _nullable_ OHPathForFile(NSString* fileName, Class inBundleForClass); +NSString* __nullable OHPathForFile(NSString* fileName, Class inBundleForClass); /** * Useful function to build a path given a file name and a bundle. @@ -44,7 +56,7 @@ NSString* _nullable_ OHPathForFile(NSString* fileName, Class inBundleForClass); * value (so you won't expect it to default to the `mainBundle`). * You should use `[NSBundle bundleForClass:]` instead. */ -NSString* _nullable_ OHPathForFileInBundle(NSString* fileName, NSBundle* bundle); +NSString* __nullable OHPathForFileInBundle(NSString* fileName, NSBundle* bundle); /** * Useful function to build a path to a file in the Documents's directory in the @@ -54,7 +66,7 @@ NSString* _nullable_ OHPathForFileInBundle(NSString* fileName, NSBundle* bundle) * * @return The path of the file in the Documents directory in your App Sandbox */ -NSString* _nullable_ OHPathForFileInDocumentsDir(NSString* fileName); +NSString* __nullable OHPathForFileInDocumentsDir(NSString* fileName); @@ -69,9 +81,6 @@ NSString* _nullable_ OHPathForFileInDocumentsDir(NSString* fileName); * * @return The NSBundle object representing the bundle with the given basename located in your application's resources. */ -NSBundle* _nullable_ OHResourceBundle(NSString* bundleBasename, Class inBundleForClass); - +NSBundle* __nullable OHResourceBundle(NSString* bundleBasename, Class inBundleForClass); -#ifdef NS_ASSUME_NONNULL_END - NS_ASSUME_NONNULL_END -#endif +NS_ASSUME_NONNULL_END diff --git a/Carthage/Build/Mac/OHHTTPStubs.framework/Versions/A/OHHTTPStubs b/Carthage/Build/Mac/OHHTTPStubs.framework/Versions/A/OHHTTPStubs index 28e54586..5ce3b0b5 100755 Binary files a/Carthage/Build/Mac/OHHTTPStubs.framework/Versions/A/OHHTTPStubs and b/Carthage/Build/Mac/OHHTTPStubs.framework/Versions/A/OHHTTPStubs differ diff --git a/Carthage/Build/Mac/OHHTTPStubs.framework/Versions/A/Resources/Info.plist b/Carthage/Build/Mac/OHHTTPStubs.framework/Versions/A/Resources/Info.plist index a7ff7b7b..7ac7590a 100644 --- a/Carthage/Build/Mac/OHHTTPStubs.framework/Versions/A/Resources/Info.plist +++ b/Carthage/Build/Mac/OHHTTPStubs.framework/Versions/A/Resources/Info.plist @@ -3,7 +3,7 @@ BuildMachineOSBuild - 14D136 + 14F27 CFBundleDevelopmentRegion English CFBundleExecutable @@ -20,22 +20,26 @@ 1.0 CFBundleSignature ???? + CFBundleSupportedPlatforms + + MacOSX + CFBundleVersion 1 DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 6D1002 + 7A218 DTPlatformVersion GM DTSDKBuild - 14D125 + 15A278 DTSDKName - macosx10.10 + macosx10.11 DTXcode - 0631 + 0700 DTXcodeBuild - 6D1002 + 7A218 NSHumanReadableCopyright Copyright © 2014 AliSoftware. All rights reserved. diff --git a/Carthage/Build/Mac/Quick.framework/Versions/A/Headers/QCKDSL.h b/Carthage/Build/Mac/Quick.framework/Versions/A/Headers/QCKDSL.h index 7e63cbde..c5f3152a 100644 --- a/Carthage/Build/Mac/Quick.framework/Versions/A/Headers/QCKDSL.h +++ b/Carthage/Build/Mac/Quick.framework/Versions/A/Headers/QCKDSL.h @@ -1,5 +1,7 @@ #import +@class ExampleMetadata; + /** Provides a hook for Quick to be configured before any examples are run. Within this scope, override the +[QuickConfiguration configure:] method @@ -46,19 +48,24 @@ typedef NSDictionary *(^QCKDSLSharedExampleContext)(void); typedef void (^QCKDSLSharedExampleBlock)(QCKDSLSharedExampleContext); typedef void (^QCKDSLEmptyBlock)(void); - -extern void qck_beforeSuite(QCKDSLEmptyBlock closure); -extern void qck_afterSuite(QCKDSLEmptyBlock closure); -extern void qck_sharedExamples(NSString *name, QCKDSLSharedExampleBlock closure); -extern void qck_describe(NSString *description, QCKDSLEmptyBlock closure); -extern void qck_context(NSString *description, QCKDSLEmptyBlock closure); -extern void qck_beforeEach(QCKDSLEmptyBlock closure); -extern void qck_afterEach(QCKDSLEmptyBlock closure); -extern void qck_pending(NSString *description, QCKDSLEmptyBlock closure); -extern void qck_xdescribe(NSString *description, QCKDSLEmptyBlock closure); -extern void qck_xcontext(NSString *description, QCKDSLEmptyBlock closure); -extern void qck_fdescribe(NSString *description, QCKDSLEmptyBlock closure); -extern void qck_fcontext(NSString *description, QCKDSLEmptyBlock closure); +typedef void (^QCKDSLExampleMetadataBlock)(ExampleMetadata *exampleMetadata); + +#define QUICK_EXPORT FOUNDATION_EXPORT + +QUICK_EXPORT void qck_beforeSuite(QCKDSLEmptyBlock closure); +QUICK_EXPORT void qck_afterSuite(QCKDSLEmptyBlock closure); +QUICK_EXPORT void qck_sharedExamples(NSString *name, QCKDSLSharedExampleBlock closure); +QUICK_EXPORT void qck_describe(NSString *description, QCKDSLEmptyBlock closure); +QUICK_EXPORT void qck_context(NSString *description, QCKDSLEmptyBlock closure); +QUICK_EXPORT void qck_beforeEach(QCKDSLEmptyBlock closure); +QUICK_EXPORT void qck_beforeEachWithMetadata(QCKDSLExampleMetadataBlock closure); +QUICK_EXPORT void qck_afterEach(QCKDSLEmptyBlock closure); +QUICK_EXPORT void qck_afterEachWithMetadata(QCKDSLExampleMetadataBlock closure); +QUICK_EXPORT void qck_pending(NSString *description, QCKDSLEmptyBlock closure); +QUICK_EXPORT void qck_xdescribe(NSString *description, QCKDSLEmptyBlock closure); +QUICK_EXPORT void qck_xcontext(NSString *description, QCKDSLEmptyBlock closure); +QUICK_EXPORT void qck_fdescribe(NSString *description, QCKDSLEmptyBlock closure); +QUICK_EXPORT void qck_fcontext(NSString *description, QCKDSLEmptyBlock closure); #ifndef QUICK_DISABLE_SHORT_SYNTAX /** @@ -134,6 +141,14 @@ static inline void beforeEach(QCKDSLEmptyBlock closure) { qck_beforeEach(closure); } +/** + Identical to QCKDSL.beforeEach, except the closure is provided with + metadata on the example that the closure is being run prior to. + */ +static inline void beforeEachWithMetadata(QCKDSLExampleMetadataBlock closure) { + qck_beforeEachWithMetadata(closure); +} + /** Defines a closure to be run after each example in the current example group. This closure is not run for pending or otherwise disabled examples. @@ -146,6 +161,14 @@ static inline void afterEach(QCKDSLEmptyBlock closure) { qck_afterEach(closure); } +/** + Identical to QCKDSL.afterEach, except the closure is provided with + metadata on the example that the closure is being run after. + */ +static inline void afterEachWithMetadata(QCKDSLExampleMetadataBlock closure) { + qck_afterEachWithMetadata(closure); +} + /** Defines an example or example group that should not be executed. Use `pending` to temporarily disable examples or groups that should not be run yet. @@ -207,5 +230,5 @@ static inline void fcontext(NSString *description, QCKDSLEmptyBlock closure) { typedef void (^QCKItBlock)(NSString *description, QCKDSLEmptyBlock closure); typedef void (^QCKItBehavesLikeBlock)(NSString *description, QCKDSLSharedExampleContext context); -extern QCKItBlock qck_it_builder(NSDictionary *flags, NSString *file, NSUInteger line); -extern QCKItBehavesLikeBlock qck_itBehavesLike_builder(NSDictionary *flags, NSString *file, NSUInteger line); +QUICK_EXPORT QCKItBlock qck_it_builder(NSDictionary *flags, NSString *file, NSUInteger line); +QUICK_EXPORT QCKItBehavesLikeBlock qck_itBehavesLike_builder(NSDictionary *flags, NSString *file, NSUInteger line); diff --git a/Carthage/Build/Mac/Quick.framework/Versions/A/Headers/Quick-Swift.h b/Carthage/Build/Mac/Quick.framework/Versions/A/Headers/Quick-Swift.h index 62fbf88e..cebf76e3 100644 --- a/Carthage/Build/Mac/Quick.framework/Versions/A/Headers/Quick-Swift.h +++ b/Carthage/Build/Mac/Quick.framework/Versions/A/Headers/Quick-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 1.2 (swiftlang-602.0.49.6 clang-602.0.49) +// Generated by Apple Swift version 2.0 (swiftlang-700.0.59 clang-700.0.72) #pragma clang diagnostic push #if defined(__has_include) && __has_include() @@ -33,6 +33,11 @@ typedef struct _NSZone NSZone; #else # define SWIFT_RUNTIME_NAME(X) #endif +#if defined(__has_attribute) && __has_attribute(swift_name) +# define SWIFT_COMPILE_NAME(X) __attribute__((swift_name(X))) +#else +# define SWIFT_COMPILE_NAME(X) +#endif #if !defined(SWIFT_CLASS_EXTRA) # define SWIFT_CLASS_EXTRA #endif @@ -45,13 +50,16 @@ typedef struct _NSZone NSZone; #if !defined(SWIFT_CLASS) # if defined(__has_attribute) && __has_attribute(objc_subclassing_restricted) # define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_CLASS_EXTRA +# define SWIFT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA # else # define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA +# define SWIFT_CLASS_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA # endif #endif #if !defined(SWIFT_PROTOCOL) # define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA +# define SWIFT_PROTOCOL_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA #endif #if !defined(SWIFT_EXTENSION) @@ -68,47 +76,41 @@ typedef struct _NSZone NSZone; #if !defined(SWIFT_ENUM) # define SWIFT_ENUM(_type, _name) enum _name : _type _name; enum SWIFT_ENUM_EXTRA _name : _type #endif -#if __has_feature(nullability) -# define SWIFT_NULLABILITY(X) X -#else -# if !defined(__nonnull) -# define __nonnull -# endif -# if !defined(__nullable) -# define __nullable -# endif -# if !defined(__null_unspecified) -# define __null_unspecified -# endif -# define SWIFT_NULLABILITY(X) -#endif +typedef float swift_float2 __attribute__((__ext_vector_type__(2))); +typedef float swift_float3 __attribute__((__ext_vector_type__(3))); +typedef float swift_float4 __attribute__((__ext_vector_type__(4))); +typedef double swift_double2 __attribute__((__ext_vector_type__(2))); +typedef double swift_double3 __attribute__((__ext_vector_type__(3))); +typedef double swift_double4 __attribute__((__ext_vector_type__(4))); +typedef int swift_int2 __attribute__((__ext_vector_type__(2))); +typedef int swift_int3 __attribute__((__ext_vector_type__(3))); +typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #if defined(__has_feature) && __has_feature(modules) +@import ObjectiveC; #endif #pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" #pragma clang diagnostic ignored "-Wduplicate-method-arg" -/// An object encapsulating the file and line number at which -/// a particular example is defined. +/// An object encapsulating the file and line number at which a particular example is defined. SWIFT_CLASS("_TtC5Quick8Callsite") -@interface Callsite +@interface Callsite : NSObject /// The absolute path of the file in which an example is defined. @property (nonatomic, readonly, copy) NSString * __nonnull file; /// The line number on which an example is defined. -@property (nonatomic, readonly) NSInteger line; +@property (nonatomic, readonly) NSUInteger line; @end @class Example; @class ExampleMetadata; -/// A configuration encapsulates various options you can use -/// to configure Quick's behavior. +/// A configuration encapsulates various options you can use to configure Quick's behavior. SWIFT_CLASS("_TtC5Quick13Configuration") -@interface Configuration +@interface Configuration : NSObject /// Run all examples if none match the configured filters. True by default. @property (nonatomic) BOOL runAllWhenEverythingFiltered; @@ -133,17 +135,10 @@ SWIFT_CLASS("_TtC5Quick13Configuration") /// that are run. - (void)exclude:(BOOL (^ __nonnull)(Example * __nonnull))filter; -/// Identical to Quick.Configuration.beforeEach, except the closure is -/// provided with metadata on the example that the closure is being run -/// prior to. +/// Identical to Quick.Configuration.beforeEach, except the closure is provided with metadata on the example that the closure is being run prior to. - (void)beforeEachWithMetadata:(void (^ __nonnull)(ExampleMetadata * __nonnull))closure; -/// Like Quick.DSL.beforeEach, this configures Quick to execute the -/// given closure before each example that is run. The closure -/// passed to this method is executed before each example Quick runs, -/// globally across the test suite. You may call this method multiple -/// times across mulitple +[QuickConfigure configure:] methods in order -/// to define several closures to run before each example. +/// Like Quick.DSL.beforeEach, this configures Quick to execute the given closure before each example that is run. The closure passed to this method is executed before each example Quick runs, globally across the test suite. You may call this method multiple times across mulitple +[QuickConfigure configure:] methods in order to define several closures to run before each example. /// /// Note that, since Quick makes no guarantee as to the order in which /// +[QuickConfiguration configure:] methods are evaluated, there is no @@ -155,17 +150,10 @@ SWIFT_CLASS("_TtC5Quick13Configuration") /// in the test suite. - (void)beforeEach:(void (^ __nonnull)(void))closure; -/// Identical to Quick.Configuration.afterEach, except the closure -/// is provided with metadata on the example that the closure is being -/// run after. +/// Identical to Quick.Configuration.afterEach, except the closure is provided with metadata on the example that the closure is being run after. - (void)afterEachWithMetadata:(void (^ __nonnull)(ExampleMetadata * __nonnull))closure; -/// Like Quick.DSL.afterEach, this configures Quick to execute the -/// given closure after each example that is run. The closure -/// passed to this method is executed after each example Quick runs, -/// globally across the test suite. You may call this method multiple -/// times across mulitple +[QuickConfigure configure:] methods in order -/// to define several closures to run after each example. +/// Like Quick.DSL.afterEach, this configures Quick to execute the given closure after each example that is run. The closure passed to this method is executed after each example Quick runs, globally across the test suite. You may call this method multiple times across mulitple +[QuickConfigure configure:] methods in order to define several closures to run after each example. /// /// Note that, since Quick makes no guarantee as to the order in which /// +[QuickConfiguration configure:] methods are evaluated, there is no @@ -177,180 +165,73 @@ SWIFT_CLASS("_TtC5Quick13Configuration") /// in the test suite. - (void)afterEach:(void (^ __nonnull)(void))closure; -/// Like Quick.DSL.beforeSuite, this configures Quick to execute -/// the given closure prior to any and all examples that are run. -/// The two methods are functionally equivalent. +/// Like Quick.DSL.beforeSuite, this configures Quick to execute the given closure prior to any and all examples that are run. The two methods are functionally equivalent. - (void)beforeSuite:(void (^ __nonnull)(void))closure; -/// Like Quick.DSL.afterSuite, this configures Quick to execute -/// the given closure after all examples have been run. -/// The two methods are functionally equivalent. +/// Like Quick.DSL.afterSuite, this configures Quick to execute the given closure after all examples have been run. The two methods are functionally equivalent. - (void)afterSuite:(void (^ __nonnull)(void))closure; +- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end -/// Examples, defined with the it function, use assertions to -/// demonstrate how code should behave. These are like "tests" in XCTest. +/// Examples, defined with the it function, use assertions to demonstrate how code should behave. These are like "tests" in XCTest. SWIFT_CLASS("_TtC5Quick7Example") -@interface Example +@interface Example : NSObject -/// A boolean indicating whether the example is a shared example; -/// i.e.: whether it is an example defined with itBehavesLike. +/// A boolean indicating whether the example is a shared example; i.e.: whether it is an example defined with itBehavesLike. @property (nonatomic) BOOL isSharedExample; -/// The site at which the example is defined. -/// This must be set correctly in order for Xcode to highlight -/// the correct line in red when reporting a failure. +/// The site at which the example is defined. This must be set correctly in order for Xcode to highlight the correct line in red when reporting a failure. @property (nonatomic) Callsite * __nonnull callsite; +@property (nonatomic, readonly, copy) NSString * __nonnull description; -/// The example name. A name is a concatenation of the name of -/// the example group the example belongs to, followed by the -/// description of the example itself. +/// The example name. A name is a concatenation of the name of the example group the example belongs to, followed by the description of the example itself. /// /// The example name is used to generate a test method selector /// to be displayed in Xcode's test navigator. @property (nonatomic, readonly, copy) NSString * __nonnull name; -/// Executes the example closure, as well as all before and after -/// closures defined in the its surrounding example groups. +/// Executes the example closure, as well as all before and after closures defined in the its surrounding example groups. - (void)run; @end -/// Example groups are logical groupings of examples, defined with -/// the describe and context functions. Example groups can share -/// setup and teardown code. +/// Example groups are logical groupings of examples, defined with the describe and context functions. Example groups can share setup and teardown code. SWIFT_CLASS("_TtC5Quick12ExampleGroup") -@interface ExampleGroup +@interface ExampleGroup : NSObject +@property (nonatomic, readonly, copy) NSString * __nonnull description; -/// Returns a list of examples that belong to this example group, -/// or to any of its descendant example groups. -@property (nonatomic, readonly, copy) NSArray * __nonnull examples; +/// Returns a list of examples that belong to this example group, or to any of its descendant example groups. +@property (nonatomic, readonly, copy) NSArray * __nonnull examples; @end -/// A class that encapsulates information about an example, -/// including the index at which the example was executed, as -/// well as the example itself. +/// A class that encapsulates information about an example, including the index at which the example was executed, as well as the example itself. SWIFT_CLASS("_TtC5Quick15ExampleMetadata") -@interface ExampleMetadata +@interface ExampleMetadata : NSObject /// The example for which this metadata was collected. @property (nonatomic, readonly) Example * __nonnull example; -/// The index at which this example was executed in the -/// test suite. +/// The index at which this example was executed in the test suite. @property (nonatomic, readonly) NSInteger exampleIndex; @end -/// A namespace for filter flag keys, defined primarily to make the -/// keys available in Objective-C. -SWIFT_CLASS("QCKFilter") -@interface Filter +/// A namespace for filter flag keys, defined primarily to make the keys available in Objective-C. +SWIFT_CLASS("_TtC5Quick6Filter") +@interface Filter : NSObject -/// Example and example groups with [Focused: true] are included in test runs, -/// excluding all other examples without this flag. Use this to only run one or -/// two tests that you're currently focusing on. +/// Example and example groups with [Focused: true] are included in test runs, excluding all other examples without this flag. Use this to only run one or two tests that you're currently focusing on. + (NSString * __nonnull)focused; -/// Example and example groups with [Pending: true] are excluded from test runs. -/// Use this to temporarily suspend examples that you know do not pass yet. +/// Example and example groups with [Pending: true] are excluded from test runs. Use this to temporarily suspend examples that you know do not pass yet. + (NSString * __nonnull)pending; -@end - - - -/// A collection of state Quick builds up in order to work its magic. -/// World is primarily responsible for maintaining a mapping of QuickSpec -/// classes to root example groups for those classes. -/// -/// It also maintains a mapping of shared example names to shared -/// example closures. -/// -/// You may configure how Quick behaves by calling the -[World configure:] -/// method from within an overridden +[QuickConfiguration configure:] method. -SWIFT_CLASS("_TtC5Quick5World") -@interface World - -/// The example group that is currently being run. -/// The DSL requires that this group is correctly set in order to build a -/// correct hierarchy of example groups and their examples. -@property (nonatomic) ExampleGroup * __nullable currentExampleGroup; - -/// The example metadata of the test that is currently being run. -/// This is useful for using the Quick test metadata (like its name) at -/// runtime. -@property (nonatomic) ExampleMetadata * __nullable currentExampleMetadata; - -/// A flag that indicates whether additional test suites are being run -/// within this test suite. This is only true within the context of Quick -/// functional tests. -@property (nonatomic) BOOL isRunningAdditionalSuites; -+ (World * __nonnull)sharedWorld; - -/// Exposes the World's Configuration object within the scope of the closure -/// so that it may be configured. This method must not be called outside of -/// an overridden +[QuickConfiguration configure:] method. -/// -/// \param closure A closure that takes a Configuration object that can -/// be mutated to change Quick's behavior. -- (void)configure:(void (^ __nonnull)(Configuration * __nonnull))closure; - -/// Finalizes the World's configuration. -/// Any subsequent calls to World.configure() will raise. -- (void)finalizeConfiguration; - -/// Returns an internally constructed root example group for the given -/// QuickSpec class. -/// -/// A root example group with the description "root example group" is lazily -/// initialized for each QuickSpec class. This root example group wraps the -/// top level of a -[QuickSpec spec] method--it's thanks to this group that -/// users can define beforeEach and it closures at the top level, like so: -/// -///
override func spec() {

// These belong to the root example group -/// beforeEach {} -/// it("is at the top level") {}

}

-/// \param cls The QuickSpec class for which to retrieve the root example group. -/// -/// \returns The root example group for the class. -- (ExampleGroup * __nonnull)rootExampleGroupForSpecClass:(Class __nonnull)cls; - -/// Returns all examples that should be run for a given spec class. -/// There are two filtering passes that occur when determining which examples should be run. -/// That is, these examples are the ones that are included by inclusion filters, and are -/// not excluded by exclusion filters. -/// -/// \param specClass The QuickSpec subclass for which examples are to be returned. -/// -/// \returns A list of examples to be run as test invocations. -- (NSArray * __nonnull)examplesForSpecClass:(Class __nonnull)specClass; -@end - -@class NSDictionary; - -@interface World (SWIFT_EXTENSION(Quick)) -- (void)beforeSuite:(void (^ __nonnull)(void))closure; -- (void)afterSuite:(void (^ __nonnull)(void))closure; -- (void)sharedExamples:(NSString * __nonnull)name closure:(void (^ __nonnull)(NSDictionary * __nonnull (^ __nonnull)(void)))closure; -- (void)describe:(NSString * __nonnull)description flags:(NSDictionary * __nonnull)flags closure:(void (^ __nonnull)(void))closure; -- (void)context:(NSString * __nonnull)description flags:(NSDictionary * __nonnull)flags closure:(void (^ __nonnull)(void))closure; -- (void)fdescribe:(NSString * __nonnull)description flags:(NSDictionary * __nonnull)flags closure:(void (^ __nonnull)(void))closure; -- (void)xdescribe:(NSString * __nonnull)description flags:(NSDictionary * __nonnull)flags closure:(void (^ __nonnull)(void))closure; -- (void)beforeEach:(void (^ __nonnull)(void))closure; -- (void)beforeEachWithClosure:(void (^ __nonnull)(ExampleMetadata * __nonnull))closure; -- (void)afterEach:(void (^ __nonnull)(void))closure; -- (void)afterEachWithClosure:(void (^ __nonnull)(ExampleMetadata * __nonnull))closure; -- (void)itWithDescription:(NSString * __nonnull)description flags:(NSDictionary * __nonnull)flags file:(NSString * __nonnull)file line:(NSInteger)line closure:(void (^ __nonnull)(void))closure; -- (void)fitWithDescription:(NSString * __nonnull)description flags:(NSDictionary * __nonnull)flags file:(NSString * __nonnull)file line:(NSInteger)line closure:(void (^ __nonnull)(void))closure; -- (void)xitWithDescription:(NSString * __nonnull)description flags:(NSDictionary * __nonnull)flags file:(NSString * __nonnull)file line:(NSInteger)line closure:(void (^ __nonnull)(void))closure; -- (void)itBehavesLikeSharedExampleNamed:(NSString * __nonnull)name sharedExampleContext:(NSDictionary * __nonnull (^ __nonnull)(void))sharedExampleContext flags:(NSDictionary * __nonnull)flags file:(NSString * __nonnull)file line:(NSInteger)line; -- (void)pending:(NSString * __nonnull)description closure:(void (^ __nonnull)(void))closure; +- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end #pragma clang diagnostic pop diff --git a/Carthage/Build/Mac/Quick.framework/Versions/A/Modules/Quick.swiftmodule/x86_64.swiftdoc b/Carthage/Build/Mac/Quick.framework/Versions/A/Modules/Quick.swiftmodule/x86_64.swiftdoc index 4f8a918f..bf163c9f 100644 Binary files a/Carthage/Build/Mac/Quick.framework/Versions/A/Modules/Quick.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/Mac/Quick.framework/Versions/A/Modules/Quick.swiftmodule/x86_64.swiftdoc differ diff --git a/Carthage/Build/Mac/Quick.framework/Versions/A/Modules/Quick.swiftmodule/x86_64.swiftmodule b/Carthage/Build/Mac/Quick.framework/Versions/A/Modules/Quick.swiftmodule/x86_64.swiftmodule index b85abb74..a61baa6d 100644 Binary files a/Carthage/Build/Mac/Quick.framework/Versions/A/Modules/Quick.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/Mac/Quick.framework/Versions/A/Modules/Quick.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/Mac/Quick.framework/Versions/A/Quick b/Carthage/Build/Mac/Quick.framework/Versions/A/Quick index b792848b..ba61cf22 100755 Binary files a/Carthage/Build/Mac/Quick.framework/Versions/A/Quick and b/Carthage/Build/Mac/Quick.framework/Versions/A/Quick differ diff --git a/Carthage/Build/Mac/Quick.framework/Versions/A/Resources/Info.plist b/Carthage/Build/Mac/Quick.framework/Versions/A/Resources/Info.plist index 977ce3fa..b4286fb5 100644 --- a/Carthage/Build/Mac/Quick.framework/Versions/A/Resources/Info.plist +++ b/Carthage/Build/Mac/Quick.framework/Versions/A/Resources/Info.plist @@ -3,7 +3,7 @@ BuildMachineOSBuild - 14D136 + 14F27 CFBundleDevelopmentRegion en CFBundleExecutable @@ -20,22 +20,26 @@ 1.0 CFBundleSignature ???? + CFBundleSupportedPlatforms + + MacOSX + CFBundleVersion 1 DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 6D1002 + 7A218 DTPlatformVersion GM DTSDKBuild - 14D125 + 15A278 DTSDKName - macosx10.10 + macosx10.11 DTXcode - 0631 + 0700 DTXcodeBuild - 6D1002 + 7A218 NSHumanReadableCopyright Copyright © 2014 - present, Quick Team. All rights reserved. diff --git a/Carthage/Build/iOS/Alamofire.framework/Alamofire b/Carthage/Build/iOS/Alamofire.framework/Alamofire index 311f6114..ac192106 100755 Binary files a/Carthage/Build/iOS/Alamofire.framework/Alamofire and b/Carthage/Build/iOS/Alamofire.framework/Alamofire differ diff --git a/Carthage/Build/iOS/Alamofire.framework/Headers/Alamofire-Swift.h b/Carthage/Build/iOS/Alamofire.framework/Headers/Alamofire-Swift.h index f2ec68fa..fcd261f3 100644 --- a/Carthage/Build/iOS/Alamofire.framework/Headers/Alamofire-Swift.h +++ b/Carthage/Build/iOS/Alamofire.framework/Headers/Alamofire-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 1.2 (swiftlang-602.0.53.1 clang-602.0.53) +// Generated by Apple Swift version 2.0 (swiftlang-700.0.59 clang-700.0.72) #pragma clang diagnostic push #if defined(__has_include) && __has_include() @@ -33,6 +33,11 @@ typedef struct _NSZone NSZone; #else # define SWIFT_RUNTIME_NAME(X) #endif +#if defined(__has_attribute) && __has_attribute(swift_name) +# define SWIFT_COMPILE_NAME(X) __attribute__((swift_name(X))) +#else +# define SWIFT_COMPILE_NAME(X) +#endif #if !defined(SWIFT_CLASS_EXTRA) # define SWIFT_CLASS_EXTRA #endif @@ -45,13 +50,16 @@ typedef struct _NSZone NSZone; #if !defined(SWIFT_CLASS) # if defined(__has_attribute) && __has_attribute(objc_subclassing_restricted) # define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_CLASS_EXTRA +# define SWIFT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA # else # define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA +# define SWIFT_CLASS_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA # endif #endif #if !defined(SWIFT_PROTOCOL) # define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA +# define SWIFT_PROTOCOL_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA #endif #if !defined(SWIFT_EXTENSION) @@ -68,22 +76,19 @@ typedef struct _NSZone NSZone; #if !defined(SWIFT_ENUM) # define SWIFT_ENUM(_type, _name) enum _name : _type _name; enum SWIFT_ENUM_EXTRA _name : _type #endif -#if __has_feature(nullability) -# define SWIFT_NULLABILITY(X) X -#else -# if !defined(__nonnull) -# define __nonnull -# endif -# if !defined(__nullable) -# define __nullable -# endif -# if !defined(__null_unspecified) -# define __null_unspecified -# endif -# define SWIFT_NULLABILITY(X) -#endif +typedef float swift_float2 __attribute__((__ext_vector_type__(2))); +typedef float swift_float3 __attribute__((__ext_vector_type__(3))); +typedef float swift_float4 __attribute__((__ext_vector_type__(4))); +typedef double swift_double2 __attribute__((__ext_vector_type__(2))); +typedef double swift_double3 __attribute__((__ext_vector_type__(3))); +typedef double swift_double4 __attribute__((__ext_vector_type__(4))); +typedef int swift_int2 __attribute__((__ext_vector_type__(2))); +typedef int swift_int3 __attribute__((__ext_vector_type__(3))); +typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #if defined(__has_feature) && __has_feature(modules) @import Foundation; +@import Foundation.NSURLSession; +@import ObjectiveC; #endif #pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" @@ -98,9 +103,10 @@ typedef struct _NSZone NSZone; @property (nonatomic, readonly, copy) NSString * __nonnull URLString; @end +@class NSMutableURLRequest; @interface NSURLRequest (SWIFT_EXTENSION(Alamofire)) -@property (nonatomic, readonly) NSURLRequest * __nonnull URLRequest; +@property (nonatomic, readonly) NSMutableURLRequest * __nonnull URLRequest; @end @@ -108,4 +114,287 @@ typedef struct _NSZone NSZone; @property (nonatomic, readonly, copy) NSString * __nonnull URLString; @end + +@interface NSURLSession (SWIFT_EXTENSION(Alamofire)) +@end + +@class NSURLSessionTask; +@class TaskDelegate; +@class NSError; +@class NSURLAuthenticationChallenge; +@class NSURLCredential; +@class NSHTTPURLResponse; +@class NSInputStream; +@class NSURLSessionDataTask; +@class NSURLResponse; +@class NSURLSessionDownloadTask; +@class NSData; +@class NSCachedURLResponse; + + +/// Responsible for handling all delegate callbacks for the underlying session. +SWIFT_CLASS("_TtCC9Alamofire7Manager15SessionDelegate") +@interface SessionDelegate : NSObject +- (TaskDelegate * __nullable)objectForKeyedSubscript:(NSURLSessionTask * __nonnull)task; +- (void)setObject:(TaskDelegate * __nullable)newValue forKeyedSubscript:(NSURLSessionTask * __nonnull)task; + +/// Overrides default behavior for NSURLSessionDelegate method URLSession:didBecomeInvalidWithError:. +@property (nonatomic, copy) void (^ __nullable sessionDidBecomeInvalidWithError)(NSURLSession * __nonnull, NSError * __nullable); + +/// Overrides default behavior for NSURLSessionDelegate method URLSessionDidFinishEventsForBackgroundURLSession:. +@property (nonatomic, copy) void (^ __nullable sessionDidFinishEventsForBackgroundURLSession)(NSURLSession * __nonnull); + +/// Tells the delegate that the session has been invalidated. +/// +/// \param session The session object that was invalidated. +/// +/// \param error The error that caused invalidation, or nil if the invalidation was explicit. +- (void)URLSession:(NSURLSession * __nonnull)session didBecomeInvalidWithError:(NSError * __nullable)error; + +/// Requests credentials from the delegate in response to a session-level authentication request from the remote server. +/// +/// \param session The session containing the task that requested authentication. +/// +/// \param challenge An object that contains the request for authentication. +/// +/// \param completionHandler A handler that your delegate method must call providing the disposition and credential. +- (void)URLSession:(NSURLSession * __nonnull)session didReceiveChallenge:(NSURLAuthenticationChallenge * __nonnull)challenge completionHandler:(void (^ __nonnull)(NSURLSessionAuthChallengeDisposition, NSURLCredential * __nullable))completionHandler; + +/// Tells the delegate that all messages enqueued for a session have been delivered. +/// +/// \param session The session that no longer has any outstanding requests. +- (void)URLSessionDidFinishEventsForBackgroundURLSession:(NSURLSession * __nonnull)session; + +/// Overrides default behavior for NSURLSessionTaskDelegate method URLSession:task:willPerformHTTPRedirection:newRequest:completionHandler:. +@property (nonatomic, copy) NSURLRequest * __nullable (^ __nullable taskWillPerformHTTPRedirection)(NSURLSession * __nonnull, NSURLSessionTask * __nonnull, NSHTTPURLResponse * __nonnull, NSURLRequest * __nonnull); + +/// Overrides default behavior for NSURLSessionTaskDelegate method URLSession:session:task:needNewBodyStream:. +@property (nonatomic, copy) NSInputStream * __null_unspecified (^ __nullable taskNeedNewBodyStream)(NSURLSession * __nonnull, NSURLSessionTask * __nonnull); + +/// Overrides default behavior for NSURLSessionTaskDelegate method URLSession:task:didSendBodyData:totalBytesSent:totalBytesExpectedToSend:. +@property (nonatomic, copy) void (^ __nullable taskDidSendBodyData)(NSURLSession * __nonnull, NSURLSessionTask * __nonnull, int64_t, int64_t, int64_t); + +/// Overrides default behavior for NSURLSessionTaskDelegate method URLSession:task:didCompleteWithError:. +@property (nonatomic, copy) void (^ __nullable taskDidComplete)(NSURLSession * __nonnull, NSURLSessionTask * __nonnull, NSError * __nullable); + +/// Tells the delegate that the remote server requested an HTTP redirect. +/// +/// \param session The session containing the task whose request resulted in a redirect. +/// +/// \param task The task whose request resulted in a redirect. +/// +/// \param response An object containing the server’s response to the original request. +/// +/// \param request A URL request object filled out with the new location. +/// +/// \param completionHandler A closure that your handler should call with either the value of the request +/// parameter, a modified URL request object, or NULL to refuse the redirect and +/// return the body of the redirect response. +- (void)URLSession:(NSURLSession * __nonnull)session task:(NSURLSessionTask * __nonnull)task willPerformHTTPRedirection:(NSHTTPURLResponse * __nonnull)response newRequest:(NSURLRequest * __nonnull)request completionHandler:(void (^ __nonnull)(NSURLRequest * __nullable))completionHandler; + +/// Requests credentials from the delegate in response to an authentication request from the remote server. +/// +/// \param session The session containing the task whose request requires authentication. +/// +/// \param task The task whose request requires authentication. +/// +/// \param challenge An object that contains the request for authentication. +/// +/// \param completionHandler A handler that your delegate method must call providing the disposition and credential. +- (void)URLSession:(NSURLSession * __nonnull)session task:(NSURLSessionTask * __nonnull)task didReceiveChallenge:(NSURLAuthenticationChallenge * __nonnull)challenge completionHandler:(void (^ __nonnull)(NSURLSessionAuthChallengeDisposition, NSURLCredential * __nullable))completionHandler; + +/// Tells the delegate when a task requires a new request body stream to send to the remote server. +/// +/// \param session The session containing the task that needs a new body stream. +/// +/// \param task The task that needs a new body stream. +/// +/// \param completionHandler A completion handler that your delegate method should call with the new body stream. +- (void)URLSession:(NSURLSession * __nonnull)session task:(NSURLSessionTask * __nonnull)task needNewBodyStream:(void (^ __nonnull)(NSInputStream * __nullable))completionHandler; + +/// Periodically informs the delegate of the progress of sending body content to the server. +/// +/// \param session The session containing the data task. +/// +/// \param task The data task. +/// +/// \param bytesSent The number of bytes sent since the last time this delegate method was called. +/// +/// \param totalBytesSent The total number of bytes sent so far. +/// +/// \param totalBytesExpectedToSend The expected length of the body data. +- (void)URLSession:(NSURLSession * __nonnull)session task:(NSURLSessionTask * __nonnull)task didSendBodyData:(int64_t)bytesSent totalBytesSent:(int64_t)totalBytesSent totalBytesExpectedToSend:(int64_t)totalBytesExpectedToSend; + +/// Tells the delegate that the task finished transferring data. +/// +/// \param session The session containing the task whose request finished transferring data. +/// +/// \param task The task whose request finished transferring data. +/// +/// \param error If an error occurred, an error object indicating how the transfer failed, otherwise nil. +- (void)URLSession:(NSURLSession * __nonnull)session task:(NSURLSessionTask * __nonnull)task didCompleteWithError:(NSError * __nullable)error; + +/// Overrides default behavior for NSURLSessionDataDelegate method URLSession:dataTask:didReceiveResponse:completionHandler:. +@property (nonatomic, copy) NSURLSessionResponseDisposition (^ __nullable dataTaskDidReceiveResponse)(NSURLSession * __nonnull, NSURLSessionDataTask * __nonnull, NSURLResponse * __nonnull); + +/// Overrides default behavior for NSURLSessionDataDelegate method URLSession:dataTask:didBecomeDownloadTask:. +@property (nonatomic, copy) void (^ __nullable dataTaskDidBecomeDownloadTask)(NSURLSession * __nonnull, NSURLSessionDataTask * __nonnull, NSURLSessionDownloadTask * __nonnull); + +/// Overrides default behavior for NSURLSessionDataDelegate method URLSession:dataTask:didReceiveData:. +@property (nonatomic, copy) void (^ __nullable dataTaskDidReceiveData)(NSURLSession * __nonnull, NSURLSessionDataTask * __nonnull, NSData * __nonnull); + +/// Overrides default behavior for NSURLSessionDataDelegate method URLSession:dataTask:willCacheResponse:completionHandler:. +@property (nonatomic, copy) NSCachedURLResponse * __null_unspecified (^ __nullable dataTaskWillCacheResponse)(NSURLSession * __nonnull, NSURLSessionDataTask * __nonnull, NSCachedURLResponse * __nonnull); + +/// Tells the delegate that the data task received the initial reply (headers) from the server. +/// +/// \param session The session containing the data task that received an initial reply. +/// +/// \param dataTask The data task that received an initial reply. +/// +/// \param response A URL response object populated with headers. +/// +/// \param completionHandler A completion handler that your code calls to continue the transfer, passing a +/// constant to indicate whether the transfer should continue as a data task or +/// should become a download task. +- (void)URLSession:(NSURLSession * __nonnull)session dataTask:(NSURLSessionDataTask * __nonnull)dataTask didReceiveResponse:(NSURLResponse * __nonnull)response completionHandler:(void (^ __nonnull)(NSURLSessionResponseDisposition))completionHandler; + +/// Tells the delegate that the data task was changed to a download task. +/// +/// \param session The session containing the task that was replaced by a download task. +/// +/// \param dataTask The data task that was replaced by a download task. +/// +/// \param downloadTask The new download task that replaced the data task. +- (void)URLSession:(NSURLSession * __nonnull)session dataTask:(NSURLSessionDataTask * __nonnull)dataTask didBecomeDownloadTask:(NSURLSessionDownloadTask * __nonnull)downloadTask; + +/// Tells the delegate that the data task has received some of the expected data. +/// +/// \param session The session containing the data task that provided data. +/// +/// \param dataTask The data task that provided data. +/// +/// \param data A data object containing the transferred data. +- (void)URLSession:(NSURLSession * __nonnull)session dataTask:(NSURLSessionDataTask * __nonnull)dataTask didReceiveData:(NSData * __nonnull)data; + +/// Asks the delegate whether the data (or upload) task should store the response in the cache. +/// +/// \param session The session containing the data (or upload) task. +/// +/// \param dataTask The data (or upload) task. +/// +/// \param proposedResponse The default caching behavior. This behavior is determined based on the current +/// caching policy and the values of certain received headers, such as the Pragma +/// and Cache-Control headers. +/// +/// \param completionHandler A block that your handler must call, providing either the original proposed +/// response, a modified version of that response, or NULL to prevent caching the +/// response. If your delegate implements this method, it must call this completion +/// handler; otherwise, your app leaks memory. +- (void)URLSession:(NSURLSession * __nonnull)session dataTask:(NSURLSessionDataTask * __nonnull)dataTask willCacheResponse:(NSCachedURLResponse * __nonnull)proposedResponse completionHandler:(void (^ __nonnull)(NSCachedURLResponse * __nullable))completionHandler; + +/// Overrides default behavior for NSURLSessionDownloadDelegate method URLSession:downloadTask:didFinishDownloadingToURL:. +@property (nonatomic, copy) void (^ __nullable downloadTaskDidFinishDownloadingToURL)(NSURLSession * __nonnull, NSURLSessionDownloadTask * __nonnull, NSURL * __nonnull); + +/// Overrides default behavior for NSURLSessionDownloadDelegate method URLSession:downloadTask:didWriteData:totalBytesWritten:totalBytesExpectedToWrite:. +@property (nonatomic, copy) void (^ __nullable downloadTaskDidWriteData)(NSURLSession * __nonnull, NSURLSessionDownloadTask * __nonnull, int64_t, int64_t, int64_t); + +/// Overrides default behavior for NSURLSessionDownloadDelegate method URLSession:downloadTask:didResumeAtOffset:expectedTotalBytes:. +@property (nonatomic, copy) void (^ __nullable downloadTaskDidResumeAtOffset)(NSURLSession * __nonnull, NSURLSessionDownloadTask * __nonnull, int64_t, int64_t); + +/// Tells the delegate that a download task has finished downloading. +/// +/// \param session The session containing the download task that finished. +/// +/// \param downloadTask The download task that finished. +/// +/// \param location A file URL for the temporary file. Because the file is temporary, you must either +/// open the file for reading or move it to a permanent location in your app’s sandbox +/// container directory before returning from this delegate method. +- (void)URLSession:(NSURLSession * __nonnull)session downloadTask:(NSURLSessionDownloadTask * __nonnull)downloadTask didFinishDownloadingToURL:(NSURL * __nonnull)location; + +/// Periodically informs the delegate about the download’s progress. +/// +/// \param session The session containing the download task. +/// +/// \param downloadTask The download task. +/// +/// \param bytesWritten The number of bytes transferred since the last time this delegate +/// method was called. +/// +/// \param totalBytesWritten The total number of bytes transferred so far. +/// +/// \param totalBytesExpectedToWrite The expected length of the file, as provided by the Content-Length +/// header. If this header was not provided, the value is +/// NSURLSessionTransferSizeUnknown +/// . +- (void)URLSession:(NSURLSession * __nonnull)session downloadTask:(NSURLSessionDownloadTask * __nonnull)downloadTask didWriteData:(int64_t)bytesWritten totalBytesWritten:(int64_t)totalBytesWritten totalBytesExpectedToWrite:(int64_t)totalBytesExpectedToWrite; + +/// Tells the delegate that the download task has resumed downloading. +/// +/// \param session The session containing the download task that finished. +/// +/// \param downloadTask The download task that resumed. See explanation in the discussion. +/// +/// \param fileOffset If the file's cache policy or last modified date prevents reuse of the +/// existing content, then this value is zero. Otherwise, this value is an +/// integer representing the number of bytes on disk that do not need to be +/// retrieved again. +/// +/// \param expectedTotalBytes The expected length of the file, as provided by the Content-Length header. +/// If this header was not provided, the value is NSURLSessionTransferSizeUnknown. +- (void)URLSession:(NSURLSession * __nonnull)session downloadTask:(NSURLSessionDownloadTask * __nonnull)downloadTask didResumeAtOffset:(int64_t)fileOffset expectedTotalBytes:(int64_t)expectedTotalBytes; +- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; +@end + +@class NSURLSessionStreamTask; +@class NSOutputStream; + +@interface SessionDelegate (SWIFT_EXTENSION(Alamofire)) + +/// Overrides default behavior for NSURLSessionStreamDelegate method URLSession:readClosedForStreamTask:. +@property (nonatomic, copy) void (^ __nullable streamTaskReadClosed)(NSURLSession * __nonnull, NSURLSessionStreamTask * __nonnull); + +/// Overrides default behavior for NSURLSessionStreamDelegate method URLSession:writeClosedForStreamTask:. +@property (nonatomic, copy) void (^ __nullable streamTaskWriteClosed)(NSURLSession * __nonnull, NSURLSessionStreamTask * __nonnull); + +/// Overrides default behavior for NSURLSessionStreamDelegate method URLSession:betterRouteDiscoveredForStreamTask:. +@property (nonatomic, copy) void (^ __nullable streamTaskBetterRouteDiscovered)(NSURLSession * __nonnull, NSURLSessionStreamTask * __nonnull); + +/// Overrides default behavior for NSURLSessionStreamDelegate method URLSession:streamTask:didBecomeInputStream:outputStream:. +@property (nonatomic, copy) void (^ __nullable streamTaskDidBecomeInputStream)(NSURLSession * __nonnull, NSURLSessionStreamTask * __nonnull, NSInputStream * __nonnull, NSOutputStream * __nonnull); + +/// Tells the delegate that the read side of the connection has been closed. +/// +/// \param session The session. +/// +/// \param streamTask The stream task. +- (void)URLSession:(NSURLSession * __nonnull)session readClosedForStreamTask:(NSURLSessionStreamTask * __nonnull)streamTask; + +/// Tells the delegate that the write side of the connection has been closed. +/// +/// \param session The session. +/// +/// \param streamTask The stream task. +- (void)URLSession:(NSURLSession * __nonnull)session writeClosedForStreamTask:(NSURLSessionStreamTask * __nonnull)streamTask; + +/// Tells the delegate that the system has determined that a better route to the host is available. +/// +/// \param session The session. +/// +/// \param streamTask The stream task. +- (void)URLSession:(NSURLSession * __nonnull)session betterRouteDiscoveredForStreamTask:(NSURLSessionStreamTask * __nonnull)streamTask; + +/// Tells the delegate that the stream task has been completed and provides the unopened stream objects. +/// +/// \param session The session. +/// +/// \param streamTask The stream task. +/// +/// \param inputStream The new input stream. +/// +/// \param outputStream The new output stream. +- (void)URLSession:(NSURLSession * __nonnull)session streamTask:(NSURLSessionStreamTask * __nonnull)streamTask didBecomeInputStream:(NSInputStream * __nonnull)inputStream outputStream:(NSOutputStream * __nonnull)outputStream; +@end + #pragma clang diagnostic pop diff --git a/Carthage/Build/iOS/Alamofire.framework/Info.plist b/Carthage/Build/iOS/Alamofire.framework/Info.plist index 14b91443..58b04360 100644 Binary files a/Carthage/Build/iOS/Alamofire.framework/Info.plist and b/Carthage/Build/iOS/Alamofire.framework/Info.plist differ diff --git a/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/arm.swiftdoc index aa8f2a52..3e8d6f27 100644 Binary files a/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/arm.swiftdoc differ diff --git a/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/arm.swiftmodule index 974beb22..bb7f4a3a 100644 Binary files a/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/arm.swiftmodule differ diff --git a/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/arm64.swiftdoc index 8f18e6be..1da2da81 100644 Binary files a/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/arm64.swiftdoc differ diff --git a/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/arm64.swiftmodule index f8d009fa..bc7be3c5 100644 Binary files a/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/arm64.swiftmodule differ diff --git a/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/i386.swiftdoc index c4039460..15dbc22c 100644 Binary files a/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/i386.swiftdoc differ diff --git a/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/i386.swiftmodule index a61a319c..bac876ff 100644 Binary files a/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/i386.swiftmodule differ diff --git a/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/x86_64.swiftdoc index e0b811bf..5a6e658d 100644 Binary files a/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/x86_64.swiftdoc differ diff --git a/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/x86_64.swiftmodule index a78e1f5c..6d904207 100644 Binary files a/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/Alamofire.framework/Modules/Alamofire.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/iOS/Alamofire.framework/_CodeSignature/CodeResources b/Carthage/Build/iOS/Alamofire.framework/_CodeSignature/CodeResources index 7834177e..fecbb2de 100644 --- a/Carthage/Build/iOS/Alamofire.framework/_CodeSignature/CodeResources +++ b/Carthage/Build/iOS/Alamofire.framework/_CodeSignature/CodeResources @@ -6,7 +6,7 @@ Headers/Alamofire-Swift.h - HiQtSuDBMB+nsgQg1fOFtUYxpE0= + 0VBQZ35GxwVrfG0AAAZz6YfQ82o= Headers/Alamofire.h @@ -14,23 +14,23 @@ Info.plist - 9yl5MrkIESHUlLSwgpMAZm0akRk= + 0ocO0InWrH4bWfFXc1Hs6ficIjc= Modules/Alamofire.swiftmodule/arm.swiftdoc - gFBLshJFHHXkqbXIgGX2A83sieY= + jSx5rzxqkC1KeMX3uH36FXPd37o= Modules/Alamofire.swiftmodule/arm.swiftmodule - cjP9tYKonEB1T5MQAiBIIKIunac= + e26C/6bLFAJy09tQrjaTBRO65Z8= Modules/Alamofire.swiftmodule/arm64.swiftdoc - r/CEEsly320MTkzvW2gm5WqwPdA= + Bwd4+GC1+4Ls/n6d+wuH7FZwZAQ= Modules/Alamofire.swiftmodule/arm64.swiftmodule - dyPA/tsaB6EbDQVe0Av8YnRNEV4= + TakS7Mz5KGaa27ek1kr0fv2d2EI= Modules/module.modulemap @@ -41,7 +41,7 @@ Headers/Alamofire-Swift.h - HiQtSuDBMB+nsgQg1fOFtUYxpE0= + 0VBQZ35GxwVrfG0AAAZz6YfQ82o= Headers/Alamofire.h @@ -49,19 +49,19 @@ Modules/Alamofire.swiftmodule/arm.swiftdoc - gFBLshJFHHXkqbXIgGX2A83sieY= + jSx5rzxqkC1KeMX3uH36FXPd37o= Modules/Alamofire.swiftmodule/arm.swiftmodule - cjP9tYKonEB1T5MQAiBIIKIunac= + e26C/6bLFAJy09tQrjaTBRO65Z8= Modules/Alamofire.swiftmodule/arm64.swiftdoc - r/CEEsly320MTkzvW2gm5WqwPdA= + Bwd4+GC1+4Ls/n6d+wuH7FZwZAQ= Modules/Alamofire.swiftmodule/arm64.swiftmodule - dyPA/tsaB6EbDQVe0Av8YnRNEV4= + TakS7Mz5KGaa27ek1kr0fv2d2EI= Modules/module.modulemap diff --git a/Carthage/Build/iOS/JWTDecode.framework/Headers/JWTDecode-Swift.h b/Carthage/Build/iOS/JWTDecode.framework/Headers/JWTDecode-Swift.h index 273b43d3..b95125c9 100644 --- a/Carthage/Build/iOS/JWTDecode.framework/Headers/JWTDecode-Swift.h +++ b/Carthage/Build/iOS/JWTDecode.framework/Headers/JWTDecode-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 1.2 (swiftlang-602.0.53.1 clang-602.0.53) +// Generated by Apple Swift version 2.0 (swiftlang-700.0.59 clang-700.0.72) #pragma clang diagnostic push #if defined(__has_include) && __has_include() @@ -33,6 +33,11 @@ typedef struct _NSZone NSZone; #else # define SWIFT_RUNTIME_NAME(X) #endif +#if defined(__has_attribute) && __has_attribute(swift_name) +# define SWIFT_COMPILE_NAME(X) __attribute__((swift_name(X))) +#else +# define SWIFT_COMPILE_NAME(X) +#endif #if !defined(SWIFT_CLASS_EXTRA) # define SWIFT_CLASS_EXTRA #endif @@ -45,13 +50,16 @@ typedef struct _NSZone NSZone; #if !defined(SWIFT_CLASS) # if defined(__has_attribute) && __has_attribute(objc_subclassing_restricted) # define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_CLASS_EXTRA +# define SWIFT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA # else # define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA +# define SWIFT_CLASS_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA # endif #endif #if !defined(SWIFT_PROTOCOL) # define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA +# define SWIFT_PROTOCOL_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA #endif #if !defined(SWIFT_EXTENSION) @@ -68,23 +76,17 @@ typedef struct _NSZone NSZone; #if !defined(SWIFT_ENUM) # define SWIFT_ENUM(_type, _name) enum _name : _type _name; enum SWIFT_ENUM_EXTRA _name : _type #endif -#if __has_feature(nullability) -# define SWIFT_NULLABILITY(X) X -#else -# if !defined(__nonnull) -# define __nonnull -# endif -# if !defined(__nullable) -# define __nullable -# endif -# if !defined(__null_unspecified) -# define __null_unspecified -# endif -# define SWIFT_NULLABILITY(X) -#endif +typedef float swift_float2 __attribute__((__ext_vector_type__(2))); +typedef float swift_float3 __attribute__((__ext_vector_type__(3))); +typedef float swift_float4 __attribute__((__ext_vector_type__(4))); +typedef double swift_double2 __attribute__((__ext_vector_type__(2))); +typedef double swift_double3 __attribute__((__ext_vector_type__(3))); +typedef double swift_double4 __attribute__((__ext_vector_type__(4))); +typedef int swift_int2 __attribute__((__ext_vector_type__(2))); +typedef int swift_int3 __attribute__((__ext_vector_type__(3))); +typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #if defined(__has_feature) && __has_feature(modules) @import ObjectiveC; -@import Foundation; #endif #pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" @@ -92,29 +94,29 @@ typedef struct _NSZone NSZone; @class NSDate; -/// Class that decodes a JWT payload from Base64 -SWIFT_CLASS("A0JWTDecoder") -@interface JWTDecoder : NSObject +/// Class to allow Objective-C code to decode a JWT +SWIFT_CLASS("_TtC9JWTDecode5A0JWT") +@interface A0JWT : NSObject -/// Create a new instance of JWTDecoder -/// -/// \param jwt to decode -/// -/// \returns a new instance -- (SWIFT_NULLABILITY(nonnull) instancetype)initWithJwt:(NSString * __nonnull)jwt OBJC_DESIGNATED_INITIALIZER; +/// token header part +@property (nonatomic, readonly, copy) NSDictionary * __nonnull header; -/// Returns the payload of the JWT -/// -/// \param error if the JWT can't be decoded -/// -/// \returns dictionary with JWT payload -- (NSDictionary * __nullable)payloadWithError:(NSError * __nullable * __null_unspecified)error; +/// token body part or claims +@property (nonatomic, readonly, copy) NSDictionary * __nonnull body; -/// If the JWT is expired or not -@property (nonatomic, readonly) BOOL expired; +/// token signature part +@property (nonatomic, readonly, copy) NSString * __nullable signature; -/// Date when the JWT will expire -@property (nonatomic, readonly) NSDate * __nullable expireDate; +/// value of the exp claim +@property (nonatomic, readonly) NSDate * __nullable expiresAt; + +/// Creates a new instance of A0JWT and decodes the given jwt token. +/// +/// :param: jwtValue of the token to decode +/// +/// :returns: a new instance of A0JWT +/// that holds the decode token ++ (A0JWT * __nullable)decode:(NSString * __nonnull)jwtValue error:(NSError * __nullable * __null_unspecified)error; @end #pragma clang diagnostic pop diff --git a/Carthage/Build/iOS/JWTDecode.framework/Info.plist b/Carthage/Build/iOS/JWTDecode.framework/Info.plist index 77a22d2f..413c68b6 100644 Binary files a/Carthage/Build/iOS/JWTDecode.framework/Info.plist and b/Carthage/Build/iOS/JWTDecode.framework/Info.plist differ diff --git a/Carthage/Build/iOS/JWTDecode.framework/JWTDecode b/Carthage/Build/iOS/JWTDecode.framework/JWTDecode index be8260ee..0c35f006 100755 Binary files a/Carthage/Build/iOS/JWTDecode.framework/JWTDecode and b/Carthage/Build/iOS/JWTDecode.framework/JWTDecode differ diff --git a/Carthage/Build/iOS/JWTDecode.framework/Modules/JWTDecode.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/JWTDecode.framework/Modules/JWTDecode.swiftmodule/arm.swiftdoc index 170355ae..8d875077 100644 Binary files a/Carthage/Build/iOS/JWTDecode.framework/Modules/JWTDecode.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/JWTDecode.framework/Modules/JWTDecode.swiftmodule/arm.swiftdoc differ diff --git a/Carthage/Build/iOS/JWTDecode.framework/Modules/JWTDecode.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/JWTDecode.framework/Modules/JWTDecode.swiftmodule/arm.swiftmodule index 9e8fa2f6..45ecd9d6 100644 Binary files a/Carthage/Build/iOS/JWTDecode.framework/Modules/JWTDecode.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/JWTDecode.framework/Modules/JWTDecode.swiftmodule/arm.swiftmodule differ diff --git a/Carthage/Build/iOS/JWTDecode.framework/Modules/JWTDecode.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/JWTDecode.framework/Modules/JWTDecode.swiftmodule/arm64.swiftdoc index 132aae43..3c4defc7 100644 Binary files a/Carthage/Build/iOS/JWTDecode.framework/Modules/JWTDecode.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/JWTDecode.framework/Modules/JWTDecode.swiftmodule/arm64.swiftdoc differ diff --git a/Carthage/Build/iOS/JWTDecode.framework/Modules/JWTDecode.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/JWTDecode.framework/Modules/JWTDecode.swiftmodule/arm64.swiftmodule index 278720a4..c0d78a2b 100644 Binary files a/Carthage/Build/iOS/JWTDecode.framework/Modules/JWTDecode.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/JWTDecode.framework/Modules/JWTDecode.swiftmodule/arm64.swiftmodule differ diff --git a/Carthage/Build/iOS/JWTDecode.framework/Modules/JWTDecode.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/JWTDecode.framework/Modules/JWTDecode.swiftmodule/i386.swiftdoc index cf2c1a9e..f9d0ecee 100644 Binary files a/Carthage/Build/iOS/JWTDecode.framework/Modules/JWTDecode.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/JWTDecode.framework/Modules/JWTDecode.swiftmodule/i386.swiftdoc differ diff --git a/Carthage/Build/iOS/JWTDecode.framework/Modules/JWTDecode.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/JWTDecode.framework/Modules/JWTDecode.swiftmodule/i386.swiftmodule index a060a6da..cc6fb48b 100644 Binary files a/Carthage/Build/iOS/JWTDecode.framework/Modules/JWTDecode.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/JWTDecode.framework/Modules/JWTDecode.swiftmodule/i386.swiftmodule differ diff --git a/Carthage/Build/iOS/JWTDecode.framework/Modules/JWTDecode.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/JWTDecode.framework/Modules/JWTDecode.swiftmodule/x86_64.swiftdoc index e0401e46..03697f18 100644 Binary files a/Carthage/Build/iOS/JWTDecode.framework/Modules/JWTDecode.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/JWTDecode.framework/Modules/JWTDecode.swiftmodule/x86_64.swiftdoc differ diff --git a/Carthage/Build/iOS/JWTDecode.framework/Modules/JWTDecode.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/JWTDecode.framework/Modules/JWTDecode.swiftmodule/x86_64.swiftmodule index fc4b503a..5104ebc7 100644 Binary files a/Carthage/Build/iOS/JWTDecode.framework/Modules/JWTDecode.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/JWTDecode.framework/Modules/JWTDecode.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/iOS/JWTDecode.framework/_CodeSignature/CodeResources b/Carthage/Build/iOS/JWTDecode.framework/_CodeSignature/CodeResources index acd9a00f..6fadc39c 100644 --- a/Carthage/Build/iOS/JWTDecode.framework/_CodeSignature/CodeResources +++ b/Carthage/Build/iOS/JWTDecode.framework/_CodeSignature/CodeResources @@ -6,7 +6,7 @@ Headers/JWTDecode-Swift.h - qglGLpYGoZ2VE8alFs+rGVu/WxE= + 4XlFKc+Ak/+CMECOxhw7Zsovudo= Headers/JWTDecode.h @@ -14,23 +14,23 @@ Info.plist - ufm6KA0eVFqlg+NxGiHiBPhoR7s= + ZytGjZyf4o8l0Q7lnBVd4aWhkUE= Modules/JWTDecode.swiftmodule/arm.swiftdoc - OilYcVejYM3lhY1vmSptohiAi3w= + JM7KXCuqWYKIrUec9h8olWFTnp8= Modules/JWTDecode.swiftmodule/arm.swiftmodule - FAM+OxnsfxIuTrzIXksVixVHYn4= + 9mWDjN8ZoeOnoEfGXuNSNz2BQCk= Modules/JWTDecode.swiftmodule/arm64.swiftdoc - s0RTzeBYrS8s/f0ynb+rOZcmDHE= + EAvR75PteUKG6ZI+xvUQ+s2lB1U= Modules/JWTDecode.swiftmodule/arm64.swiftmodule - CZt0Ina21RFFyjRNeV2+Y0wrBJc= + QLHi03u5dpo/uRseNM3sEPPwq6A= Modules/module.modulemap @@ -41,7 +41,7 @@ Headers/JWTDecode-Swift.h - qglGLpYGoZ2VE8alFs+rGVu/WxE= + 4XlFKc+Ak/+CMECOxhw7Zsovudo= Headers/JWTDecode.h @@ -49,19 +49,19 @@ Modules/JWTDecode.swiftmodule/arm.swiftdoc - OilYcVejYM3lhY1vmSptohiAi3w= + JM7KXCuqWYKIrUec9h8olWFTnp8= Modules/JWTDecode.swiftmodule/arm.swiftmodule - FAM+OxnsfxIuTrzIXksVixVHYn4= + 9mWDjN8ZoeOnoEfGXuNSNz2BQCk= Modules/JWTDecode.swiftmodule/arm64.swiftdoc - s0RTzeBYrS8s/f0ynb+rOZcmDHE= + EAvR75PteUKG6ZI+xvUQ+s2lB1U= Modules/JWTDecode.swiftmodule/arm64.swiftmodule - CZt0Ina21RFFyjRNeV2+Y0wrBJc= + QLHi03u5dpo/uRseNM3sEPPwq6A= Modules/module.modulemap diff --git a/Carthage/Build/iOS/Nimble.framework/Headers/DSL.h b/Carthage/Build/iOS/Nimble.framework/Headers/DSL.h index 8186e1f1..551af885 100644 --- a/Carthage/Build/iOS/Nimble.framework/Headers/DSL.h +++ b/Carthage/Build/iOS/Nimble.framework/Headers/DSL.h @@ -14,7 +14,8 @@ #define NIMBLE_SHORT(PROTO, ORIGINAL) FOUNDATION_STATIC_INLINE PROTO { return (ORIGINAL); } #endif -NIMBLE_EXPORT NMBExpectation *NMB_expect(id(^actualBlock)(), const char *file, unsigned int line); +NIMBLE_EXPORT NMBExpectation *NMB_expect(id(^actualBlock)(), NSString *file, NSUInteger line); +NIMBLE_EXPORT NMBExpectation *NMB_expectAction(void(^actualBlock)(), NSString *file, NSUInteger line); NIMBLE_EXPORT id NMB_equal(id expectedValue); NIMBLE_SHORT(id equal(id expectedValue), @@ -80,9 +81,11 @@ NIMBLE_EXPORT id NMB_beEmpty(void); NIMBLE_SHORT(id beEmpty(void), NMB_beEmpty()); -NIMBLE_EXPORT id NMB_contain(id itemOrSubstring); -NIMBLE_SHORT(id contain(id itemOrSubstring), - NMB_contain(itemOrSubstring)); +NIMBLE_EXPORT id NMB_containWithNilTermination(id itemOrSubstring, ...) NS_REQUIRES_NIL_TERMINATION; +#define NMB_contain(...) NMB_containWithNilTermination(__VA_ARGS__, nil) +#ifndef NIMBLE_DISABLE_SHORT_SYNTAX +#define contain(...) NMB_contain(__VA_ARGS__) +#endif NIMBLE_EXPORT id NMB_endWith(id itemElementOrSubstring); NIMBLE_SHORT(id endWith(id itemElementOrSubstring), @@ -106,15 +109,21 @@ NIMBLE_SHORT(id allPass(id matcher), typedef void (^NMBWaitUntilTimeoutBlock)(NSTimeInterval timeout, void (^action)(void (^)(void))); typedef void (^NMBWaitUntilBlock)(void (^action)(void (^)(void))); -NIMBLE_EXPORT NMBWaitUntilTimeoutBlock nmb_wait_until_timeout_builder(NSString *file, NSUInteger line); -NIMBLE_EXPORT NMBWaitUntilBlock nmb_wait_until_builder(NSString *file, NSUInteger line); +NIMBLE_EXPORT NMBWaitUntilTimeoutBlock NMB_waitUntilTimeoutBuilder(NSString *file, NSUInteger line); +NIMBLE_EXPORT NMBWaitUntilBlock NMB_waitUntilBuilder(NSString *file, NSUInteger line); + +NIMBLE_EXPORT void NMB_failWithMessage(NSString *msg, NSString *file, NSUInteger line); -#define NMB_waitUntilTimeout nmb_wait_until_timeout_builder(@(__FILE__), __LINE__) -#define NMB_waitUntil nmb_wait_until_builder(@(__FILE__), __LINE__) +#define NMB_waitUntilTimeout NMB_waitUntilTimeoutBuilder(@(__FILE__), __LINE__) +#define NMB_waitUntil NMB_waitUntilBuilder(@(__FILE__), __LINE__) #ifndef NIMBLE_DISABLE_SHORT_SYNTAX -#define expect(...) NMB_expect(^id{ return (__VA_ARGS__); }, __FILE__, __LINE__) -#define expectAction(...) NMB_expect(^id{ (__VA_ARGS__); return nil; }, __FILE__, __LINE__) +#define expect(...) NMB_expect(^id{ return (__VA_ARGS__); }, @(__FILE__), __LINE__) +#define expectAction(BLOCK) NMB_expectAction((BLOCK), @(__FILE__), __LINE__) +#define failWithMessage(msg) NMB_failWithMessage(msg, @(__FILE__), __LINE__) +#define fail() failWithMessage(@"fail() always fails") + + #define waitUntilTimeout NMB_waitUntilTimeout #define waitUntil NMB_waitUntil #endif diff --git a/Carthage/Build/iOS/Nimble.framework/Headers/Nimble-Swift.h b/Carthage/Build/iOS/Nimble.framework/Headers/Nimble-Swift.h index b339c90c..6b083459 100644 --- a/Carthage/Build/iOS/Nimble.framework/Headers/Nimble-Swift.h +++ b/Carthage/Build/iOS/Nimble.framework/Headers/Nimble-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 1.2 (swiftlang-602.0.53.1 clang-602.0.53) +// Generated by Apple Swift version 2.0 (swiftlang-700.0.59 clang-700.0.72) #pragma clang diagnostic push #if defined(__has_include) && __has_include() @@ -33,6 +33,11 @@ typedef struct _NSZone NSZone; #else # define SWIFT_RUNTIME_NAME(X) #endif +#if defined(__has_attribute) && __has_attribute(swift_name) +# define SWIFT_COMPILE_NAME(X) __attribute__((swift_name(X))) +#else +# define SWIFT_COMPILE_NAME(X) +#endif #if !defined(SWIFT_CLASS_EXTRA) # define SWIFT_CLASS_EXTRA #endif @@ -45,13 +50,16 @@ typedef struct _NSZone NSZone; #if !defined(SWIFT_CLASS) # if defined(__has_attribute) && __has_attribute(objc_subclassing_restricted) # define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_CLASS_EXTRA +# define SWIFT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA # else # define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA +# define SWIFT_CLASS_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA # endif #endif #if !defined(SWIFT_PROTOCOL) # define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA +# define SWIFT_PROTOCOL_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA #endif #if !defined(SWIFT_EXTENSION) @@ -68,37 +76,38 @@ typedef struct _NSZone NSZone; #if !defined(SWIFT_ENUM) # define SWIFT_ENUM(_type, _name) enum _name : _type _name; enum SWIFT_ENUM_EXTRA _name : _type #endif -#if __has_feature(nullability) -# define SWIFT_NULLABILITY(X) X -#else -# if !defined(__nonnull) -# define __nonnull -# endif -# if !defined(__nullable) -# define __nullable -# endif -# if !defined(__null_unspecified) -# define __null_unspecified -# endif -# define SWIFT_NULLABILITY(X) -#endif +typedef float swift_float2 __attribute__((__ext_vector_type__(2))); +typedef float swift_float3 __attribute__((__ext_vector_type__(3))); +typedef float swift_float4 __attribute__((__ext_vector_type__(4))); +typedef double swift_double2 __attribute__((__ext_vector_type__(2))); +typedef double swift_double3 __attribute__((__ext_vector_type__(3))); +typedef double swift_double4 __attribute__((__ext_vector_type__(4))); +typedef int swift_int2 __attribute__((__ext_vector_type__(2))); +typedef int swift_int3 __attribute__((__ext_vector_type__(3))); +typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #if defined(__has_feature) && __has_feature(modules) -@import Foundation; @import ObjectiveC; +@import Foundation; #endif #pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" #pragma clang diagnostic ignored "-Wduplicate-method-arg" + +/// Encapsulates the failure message that matchers can report to the end user. +/// +/// This is shared state between Nimble and matchers that mutate this value. SWIFT_CLASS("_TtC6Nimble14FailureMessage") -@interface FailureMessage +@interface FailureMessage : NSObject @property (nonatomic, copy) NSString * __nonnull expected; @property (nonatomic, copy) NSString * __nullable actualValue; @property (nonatomic, copy) NSString * __nonnull to; @property (nonatomic, copy) NSString * __nonnull postfixMessage; @property (nonatomic, copy) NSString * __nonnull postfixActual; -- (SWIFT_NULLABILITY(nonnull) instancetype)init OBJC_DESIGNATED_INITIALIZER; -- (NSString * __nonnull)stringValue; +@property (nonatomic, copy) NSString * __nullable userDescription; +@property (nonatomic, copy) NSString * __nonnull stringValue; +- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; +- (nonnull instancetype)initWithStringValue:(NSString * __nonnull)stringValue OBJC_DESIGNATED_INITIALIZER; @end @@ -111,7 +120,8 @@ SWIFT_PROTOCOL("_TtP6Nimble13NMBCollection_") -///
Protocol for types to support beLessThan(), beLessThanOrEqualTo(),

beGreaterThan(), beGreaterThanOrEqualTo(), and equal() matchers.

+/// Protocol for types to support beLessThan(), beLessThanOrEqualTo(), beGreaterThan(), beGreaterThanOrEqualTo(), and equal() matchers. +/// /// Types that conform to Swift's Comparable protocol will work implicitly too SWIFT_PROTOCOL("_TtP6Nimble13NMBComparable_") @protocol NMBComparable @@ -138,20 +148,27 @@ SWIFT_PROTOCOL("_TtP6Nimble20NMBDoubleConvertible_") SWIFT_CLASS("_TtC6Nimble14NMBExpectation") @interface NMBExpectation : NSObject -- (SWIFT_NULLABILITY(nonnull) instancetype)initWithActualBlock:(NSObject * __null_unspecified (^ __nonnull)(void))actualBlock negative:(BOOL)negative file:(NSString * __nonnull)file line:(NSUInteger)line OBJC_DESIGNATED_INITIALIZER; +- (nonnull instancetype)initWithActualBlock:(NSObject * __null_unspecified (^ __nonnull)(void))actualBlock negative:(BOOL)negative file:(NSString * __nonnull)file line:(NSUInteger)line OBJC_DESIGNATED_INITIALIZER; @property (nonatomic, readonly, copy) NMBExpectation * __nonnull (^ __nonnull withTimeout)(NSTimeInterval); @property (nonatomic, readonly, copy) void (^ __nonnull to)(id __nonnull); +@property (nonatomic, readonly, copy) void (^ __nonnull toWithDescription)(id __nonnull, NSString * __nonnull); @property (nonatomic, readonly, copy) void (^ __nonnull toNot)(id __nonnull); +@property (nonatomic, readonly, copy) void (^ __nonnull toNotWithDescription)(id __nonnull, NSString * __nonnull); @property (nonatomic, readonly, copy) void (^ __nonnull notTo)(id __nonnull); +@property (nonatomic, readonly, copy) void (^ __nonnull notToWithDescription)(id __nonnull, NSString * __nonnull); @property (nonatomic, readonly, copy) void (^ __nonnull toEventually)(id __nonnull); +@property (nonatomic, readonly, copy) void (^ __nonnull toEventuallyWithDescription)(id __nonnull, NSString * __nonnull); @property (nonatomic, readonly, copy) void (^ __nonnull toEventuallyNot)(id __nonnull); +@property (nonatomic, readonly, copy) void (^ __nonnull toEventuallyNotWithDescription)(id __nonnull, NSString * __nonnull); +@property (nonatomic, readonly, copy) void (^ __nonnull toNotEventually)(id __nonnull); +@property (nonatomic, readonly, copy) void (^ __nonnull toNotEventuallyWithDescription)(id __nonnull, NSString * __nonnull); ++ (void)failWithMessage:(NSString * __nonnull)message file:(NSString * __nonnull)file line:(NSUInteger)line; @end @class SourceLocation; -/// Objective-C interface to the Swift variant of Matcher. This gives you full control over -/// to() and toNot() behaviors when matching a value. +/// Objective-C interface to the Swift variant of Matcher. SWIFT_PROTOCOL("_TtP6Nimble10NMBMatcher_") @protocol NMBMatcher - (BOOL)matches:(NSObject * __null_unspecified (^ __nonnull)(void))actualBlock failureMessage:(FailureMessage * __nonnull)failureMessage location:(SourceLocation * __nonnull)location; @@ -160,7 +177,7 @@ SWIFT_PROTOCOL("_TtP6Nimble10NMBMatcher_") SWIFT_CLASS("_TtC6Nimble23NMBObjCBeCloseToMatcher") -@interface NMBObjCBeCloseToMatcher +@interface NMBObjCBeCloseToMatcher : NSObject - (BOOL)matches:(NSObject * __null_unspecified (^ __nonnull)(void))actualExpression failureMessage:(FailureMessage * __nonnull)failureMessage location:(SourceLocation * __nonnull)location; - (BOOL)doesNotMatch:(NSObject * __null_unspecified (^ __nonnull)(void))actualExpression failureMessage:(FailureMessage * __nonnull)failureMessage location:(SourceLocation * __nonnull)location; @property (nonatomic, readonly, copy) NMBObjCBeCloseToMatcher * __nonnull (^ __nonnull within)(double); @@ -168,17 +185,12 @@ SWIFT_CLASS("_TtC6Nimble23NMBObjCBeCloseToMatcher") SWIFT_CLASS("_TtC6Nimble14NMBObjCMatcher") -@interface NMBObjCMatcher +@interface NMBObjCMatcher : NSObject - (BOOL)matches:(NSObject * __null_unspecified (^ __nonnull)(void))actualBlock failureMessage:(FailureMessage * __nonnull)failureMessage location:(SourceLocation * __nonnull)location; - (BOOL)doesNotMatch:(NSObject * __null_unspecified (^ __nonnull)(void))actualBlock failureMessage:(FailureMessage * __nonnull)failureMessage location:(SourceLocation * __nonnull)location; @end -@interface NMBObjCMatcher (SWIFT_EXTENSION(Nimble)) -+ (NMBObjCMatcher * __nonnull)endWithMatcher:(id __nonnull)expected; -@end - - @interface NMBObjCMatcher (SWIFT_EXTENSION(Nimble)) + (NMBObjCMatcher * __nonnull)beNilMatcher; @end @@ -258,7 +270,12 @@ SWIFT_CLASS("_TtC6Nimble14NMBObjCMatcher") @interface NMBObjCMatcher (SWIFT_EXTENSION(Nimble)) -+ (NMBObjCMatcher * __nonnull)containMatcher:(NSObject * __nullable)expected; ++ (NMBObjCMatcher * __nonnull)containMatcher:(NSArray * __nonnull)expected; +@end + + +@interface NMBObjCMatcher (SWIFT_EXTENSION(Nimble)) ++ (NMBObjCMatcher * __nonnull)endWithMatcher:(id __nonnull)expected; @end @@ -270,17 +287,16 @@ SWIFT_CLASS("_TtC6Nimble14NMBObjCMatcher") @end @class NSDictionary; +@class NSException; SWIFT_CLASS("_TtC6Nimble28NMBObjCRaiseExceptionMatcher") -@interface NMBObjCRaiseExceptionMatcher +@interface NMBObjCRaiseExceptionMatcher : NSObject - (BOOL)matches:(NSObject * __null_unspecified (^ __nonnull)(void))actualBlock failureMessage:(FailureMessage * __nonnull)failureMessage location:(SourceLocation * __nonnull)location; - (BOOL)doesNotMatch:(NSObject * __null_unspecified (^ __nonnull)(void))actualBlock failureMessage:(FailureMessage * __nonnull)failureMessage location:(SourceLocation * __nonnull)location; @property (nonatomic, readonly, copy) NMBObjCRaiseExceptionMatcher * __nonnull (^ __nonnull named)(NSString * __nonnull); @property (nonatomic, readonly, copy) NMBObjCRaiseExceptionMatcher * __nonnull (^ __nonnull reason)(NSString * __nullable); @property (nonatomic, readonly, copy) NMBObjCRaiseExceptionMatcher * __nonnull (^ __nonnull userInfo)(NSDictionary * __nullable); -@property (nonatomic, readonly, copy) NMBObjCRaiseExceptionMatcher * __nonnull (^ __nonnull withName)(id __nonnull); -@property (nonatomic, readonly, copy) NMBObjCRaiseExceptionMatcher * __nonnull (^ __nonnull withReason)(id __nonnull); -@property (nonatomic, readonly, copy) NMBObjCRaiseExceptionMatcher * __nonnull (^ __nonnull withUserInfo)(id __nonnull); +@property (nonatomic, readonly, copy) NMBObjCRaiseExceptionMatcher * __nonnull (^ __nonnull satisfyingBlock)(void (^ __nullable)(NSException * __nonnull)); @end @@ -292,22 +308,11 @@ SWIFT_PROTOCOL("_TtP6Nimble20NMBOrderedCollection_") @end - -/// Only classes, protocols, methods, properties, and subscript declarations can be -/// bridges to Objective-C via the @objc keyword. This class encapsulates callback-style -/// asynchronous waiting logic so that it may be called from Objective-C and Swift. -SWIFT_CLASS("_TtC6Nimble7NMBWait") -@interface NMBWait -+ (void)untilTimeout:(NSTimeInterval)timeout file:(NSString * __nonnull)file line:(NSUInteger)line action:(void (^ __nonnull)(void (^ __nonnull)(void)))action; -+ (void)untilFile:(NSString * __nonnull)file line:(NSUInteger)line action:(void (^ __nonnull)(void (^ __nonnull)(void)))action; -@end - - -@interface NSArray (SWIFT_EXTENSION(Nimble)) +@interface NSArray (SWIFT_EXTENSION(Nimble)) @end -@interface NSArray (SWIFT_EXTENSION(Nimble)) +@interface NSArray (SWIFT_EXTENSION(Nimble)) @end @@ -315,7 +320,8 @@ SWIFT_CLASS("_TtC6Nimble7NMBWait") @end -@interface NSDecimalNumber (SWIFT_EXTENSION(Nimble)) +@interface NSDate (SWIFT_EXTENSION(Nimble)) +@property (nonatomic, readonly) double doubleValue; @end @@ -354,7 +360,7 @@ SWIFT_CLASS("_TtC6Nimble7NMBWait") SWIFT_CLASS("_TtC6Nimble14SourceLocation") -@interface SourceLocation +@interface SourceLocation : NSObject @property (nonatomic, readonly, copy) NSString * __nonnull file; @property (nonatomic, readonly) NSUInteger line; @property (nonatomic, readonly, copy) NSString * __nonnull description; diff --git a/Carthage/Build/iOS/Nimble.framework/Info.plist b/Carthage/Build/iOS/Nimble.framework/Info.plist index 1e204867..b8f35e64 100644 Binary files a/Carthage/Build/iOS/Nimble.framework/Info.plist and b/Carthage/Build/iOS/Nimble.framework/Info.plist differ diff --git a/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm.swiftdoc index 5039090a..ecdb5a69 100644 Binary files a/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm.swiftdoc differ diff --git a/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm.swiftmodule index cbaf280c..408d8f10 100644 Binary files a/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm.swiftmodule differ diff --git a/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm64.swiftdoc index ccf486a6..9f13980b 100644 Binary files a/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm64.swiftdoc differ diff --git a/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm64.swiftmodule index 03380dae..bd8c512e 100644 Binary files a/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/arm64.swiftmodule differ diff --git a/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/i386.swiftdoc index f7571b22..0af93e7a 100644 Binary files a/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/i386.swiftdoc differ diff --git a/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/i386.swiftmodule index a617da06..285ae350 100644 Binary files a/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/i386.swiftmodule differ diff --git a/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/x86_64.swiftdoc index a55f2dfa..c5a574ed 100644 Binary files a/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/x86_64.swiftdoc differ diff --git a/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/x86_64.swiftmodule index 029d7986..de50526c 100644 Binary files a/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/Nimble.framework/Modules/Nimble.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/iOS/Nimble.framework/Nimble b/Carthage/Build/iOS/Nimble.framework/Nimble index 29c1b132..f871f60f 100755 Binary files a/Carthage/Build/iOS/Nimble.framework/Nimble and b/Carthage/Build/iOS/Nimble.framework/Nimble differ diff --git a/Carthage/Build/iOS/Nimble.framework/_CodeSignature/CodeResources b/Carthage/Build/iOS/Nimble.framework/_CodeSignature/CodeResources index 5f043ccd..28327a54 100644 --- a/Carthage/Build/iOS/Nimble.framework/_CodeSignature/CodeResources +++ b/Carthage/Build/iOS/Nimble.framework/_CodeSignature/CodeResources @@ -6,7 +6,7 @@ Headers/DSL.h - efzUjc/0uiV6lnHEXTxaB8VcwOc= + auYzCIxlY2jTkyI1BlljW3KUTJY= Headers/NMBExceptionCapture.h @@ -14,7 +14,7 @@ Headers/Nimble-Swift.h - xIm+277er+mK0xzoe90/iMGvNHo= + 5/eafmXgULL2D56G12jAMD5cO6o= Headers/Nimble.h @@ -22,23 +22,23 @@ Info.plist - fyfnISR8HwUGVmxND8wIJc9AsU4= + 2Iqgk9rGm+G54WJCjk/EZ/Z4+ZQ= Modules/Nimble.swiftmodule/arm.swiftdoc - 8QhmkzUAQZXDoW+vJs7Ll0XjCB4= + lSaVfyH8XbRz0WDbmqKJxc5QtbY= Modules/Nimble.swiftmodule/arm.swiftmodule - HRUM3I0ijDKbjBS+xhkjAJNA3AM= + WV2bryuTY3Ss+8AWkUkch35EHF0= Modules/Nimble.swiftmodule/arm64.swiftdoc - kE/P5WvprV0kaqd2/jB8TCyKBZg= + 6W52hA33Ca+9qq8Yiql4aY8+0Rk= Modules/Nimble.swiftmodule/arm64.swiftmodule - GCIQJTUGcFOIKwPh0Up4XAUwFjk= + gkxZWQ7C2vomwY1DxaacgLDxCgI= Modules/module.modulemap @@ -49,7 +49,7 @@ Headers/DSL.h - efzUjc/0uiV6lnHEXTxaB8VcwOc= + auYzCIxlY2jTkyI1BlljW3KUTJY= Headers/NMBExceptionCapture.h @@ -57,7 +57,7 @@ Headers/Nimble-Swift.h - xIm+277er+mK0xzoe90/iMGvNHo= + 5/eafmXgULL2D56G12jAMD5cO6o= Headers/Nimble.h @@ -65,19 +65,19 @@ Modules/Nimble.swiftmodule/arm.swiftdoc - 8QhmkzUAQZXDoW+vJs7Ll0XjCB4= + lSaVfyH8XbRz0WDbmqKJxc5QtbY= Modules/Nimble.swiftmodule/arm.swiftmodule - HRUM3I0ijDKbjBS+xhkjAJNA3AM= + WV2bryuTY3Ss+8AWkUkch35EHF0= Modules/Nimble.swiftmodule/arm64.swiftdoc - kE/P5WvprV0kaqd2/jB8TCyKBZg= + 6W52hA33Ca+9qq8Yiql4aY8+0Rk= Modules/Nimble.swiftmodule/arm64.swiftmodule - GCIQJTUGcFOIKwPh0Up4XAUwFjk= + gkxZWQ7C2vomwY1DxaacgLDxCgI= Modules/module.modulemap diff --git a/Carthage/Build/iOS/OHHTTPStubs.framework/Headers/Compatibility.h b/Carthage/Build/iOS/OHHTTPStubs.framework/Headers/Compatibility.h new file mode 100644 index 00000000..b41ddda6 --- /dev/null +++ b/Carthage/Build/iOS/OHHTTPStubs.framework/Headers/Compatibility.h @@ -0,0 +1,47 @@ +/*********************************************************************************** + * + * Copyright (c) 2012 Olivier Halligon + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + ***********************************************************************************/ + + +/* + * This file allows to keep compatibility with older SDKs which didn't have + * the latest features and associated macros yet. + */ + + +#ifndef NS_DESIGNATED_INITIALIZER + #if __has_attribute(objc_designated_initializer) + #define NS_DESIGNATED_INITIALIZER __attribute__((objc_designated_initializer)) + #else + #define NS_DESIGNATED_INITIALIZER + #endif +#endif + +// Allow to use nullability macros and keywords even if not supported yet +#if ! __has_feature(nullability) + #define NS_ASSUME_NONNULL_BEGIN + #define NS_ASSUME_NONNULL_END + #define nullable + #define __nullable + #define __nonnull +#endif diff --git a/Carthage/Build/iOS/OHHTTPStubs.framework/Headers/OHHTTPStubs+Mocktail.h b/Carthage/Build/iOS/OHHTTPStubs.framework/Headers/OHHTTPStubs+Mocktail.h new file mode 100644 index 00000000..09f218cf --- /dev/null +++ b/Carthage/Build/iOS/OHHTTPStubs.framework/Headers/OHHTTPStubs+Mocktail.h @@ -0,0 +1,80 @@ +// +// OHHTTPStubs+Mocktail.h +// CardCompanion +// +// Created by Wang, Sunny on 7/30/15. +// + +#import +#import + +NS_ASSUME_NONNULL_BEGIN + +/** + * Error codes for the OHHTTPStubs Mocktail category + */ +typedef NS_ENUM(NSInteger, OHHTTPStubsMocktailError) { + /** The specified path does not exist */ + OHHTTPStubsMocktailErrorPathDoesNotExist = 1, + /** The specified path was not readable */ + OHHTTPStubsMocktailErrorPathFailedToRead, + /** The specified path is not a directory */ + OHHTTPStubsMocktailErrorPathIsNotFolder, + /** The specified file is not a valid Mocktail file */ + OHHTTPStubsMocktailErrorInvalidFileFormat, + /** The specified Mocktail file has invalid headers */ + OHHTTPStubsMocktailErrorInvalidFileHeader, + /** An unexpected internal error occured */ + OHHTTPStubsMocktailErrorInternalError +}; + +extern NSString* const MocktailErrorDomain; + +@interface OHHTTPStubs (Mocktail) + +/** + * Add a stub given a file in the format of Mocktail as defined at https://github.com/square/objc-mocktail. + * + * This method will split the HTTP method Regex, the absolute URL Regex, the headers, the HTTP status code and + * response body, and use them to add a stub. + * + * @param fileName The name of the mocktail file (without extension of '.tail') in the Mocktail format. + * @param bundleOrNil The bundle in which the mocktail file is located. If `nil`, the `[NSBundle bundleForClass:self.class]` will be used. + * @param error An out value that returns any error encountered during stubbing. Returns an NSError object if any error; otherwise returns nil. + * + * @return a stub descriptor that uniquely identifies the stub and can be later used to remove it with + * `removeStub:`. + */ ++(id)stubRequestsUsingMocktailNamed:(NSString *)fileName inBundle:(nullable NSBundle*)bundleOrNil error:(NSError **)error; + +/** + * Add a stub given a file URL in the format of Mocktail as defined at https://github.com/square/objc-mocktail. + * + * This method will split the HTTP method Regex, the absolute URL Regex, the headers, the HTTP status code and + * response body, and use them to add a stub. + * + * @param fileURL The URL pointing to the file in the Mocktail format. + * @param error An out value that returns any error encountered during stubbing. Returns an NSError object if any error; otherwise returns nil. + * + * @return a stub descriptor that uniquely identifies the stub and can be later used to remove it with + * `removeStub:`. + */ ++(id)stubRequestsUsingMocktail:(NSURL *)fileURL error:(NSError **)error; + +/** + * Add stubs using files under a folder in the format of Mocktail as defined at https://github.com/square/objc-mocktail. + * + * This method will retrieve all the files under the folder; for each file with surfix of ".tail", it will split the HTTP method Regex, the absolute URL Regex, the headers, the HTTP status code and response body, and use them to add a stub. + * + * @param path The name of the folder containing files in the Mocktail format. + * @param bundleOrNil The bundle in which the path is located. If `nil`, the `[NSBundle bundleForClass:self.class]` will be used. + * @param error An out value that returns any error encountered during stubbing. Returns an NSError object if any error; otherwise returns nil. + * + * @return an array of stub descriptor that uniquely identifies the stub and can be later used to remove it with + * `removeStub:`. + */ ++(NSArray *)stubRequestsUsingMocktailsAtPath:(NSString *)path inBundle:(nullable NSBundle*)bundleOrNil error:(NSError **)error; + +@end + +NS_ASSUME_NONNULL_END diff --git a/Carthage/Build/iOS/OHHTTPStubs.framework/Headers/OHHTTPStubs.h b/Carthage/Build/iOS/OHHTTPStubs.framework/Headers/OHHTTPStubs.h index d4b85dc1..54636a0a 100644 --- a/Carthage/Build/iOS/OHHTTPStubs.framework/Headers/OHHTTPStubs.h +++ b/Carthage/Build/iOS/OHHTTPStubs.framework/Headers/OHHTTPStubs.h @@ -22,39 +22,23 @@ * ***********************************************************************************/ -// For SDK 7.1 Compatibility (as this macro was only included starting SDK 8.0) -#ifndef NS_DESIGNATED_INITIALIZER - #if __has_attribute(objc_designated_initializer) - #define NS_DESIGNATED_INITIALIZER __attribute__((objc_designated_initializer)) - #else - #define NS_DESIGNATED_INITIALIZER - #endif -#endif //////////////////////////////////////////////////////////////////////////////// #pragma mark - Imports #import -#import "OHHTTPStubsResponse.h" -// Because this is supposed to be an umbrella header, we should import every public headers here -#import "OHHTTPStubsResponse+HTTPMessage.h" -#import "OHHTTPStubsResponse+JSON.h" -#import "OHPathHelpers.h" - -#ifdef NS_ASSUME_NONNULL_BEGIN - NS_ASSUME_NONNULL_BEGIN - #define _nullable_ __nullable - #define _nonnull_ __nonnull -#else - #define _nullable_ - #define _nonnull_ -#endif + +#import +#import + + +NS_ASSUME_NONNULL_BEGIN //////////////////////////////////////////////////////////////////////////////// #pragma mark - Types typedef BOOL(^OHHTTPStubsTestBlock)(NSURLRequest* request); -typedef OHHTTPStubsResponse* _nonnull_ (^OHHTTPStubsResponseBlock)( NSURLRequest* request); +typedef OHHTTPStubsResponse* __nonnull (^OHHTTPStubsResponseBlock)( NSURLRequest* request); /** * This opaque type represents an installed stub and is used to uniquely @@ -74,7 +58,7 @@ typedef OHHTTPStubsResponse* _nonnull_ (^OHHTTPStubsResponseBlock)( NSURLRequest * This is especially useful if you dump all installed stubs using `allStubs` * or if you want to log which stubs are being triggered using `onStubActivation:`. */ -@property(nonatomic, strong) NSString* _nullable_ name; +@property(nonatomic, strong, nullable) NSString* name; @end //////////////////////////////////////////////////////////////////////////////// @@ -190,6 +174,22 @@ typedef OHHTTPStubsResponse* _nonnull_ (^OHHTTPStubsResponseBlock)( NSURLRequest @end -#ifdef NS_ASSUME_NONNULL_END - NS_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END + + +//////////////////////////////////////////////////////////////////////////////// +#pragma mark - Umbrella Header Imports + +// Because this is supposed to be an umbrella header, we should also import every public headers here +#if __has_include() + #import +#endif +#if __has_include() + #import +#endif +#if __has_include() + #import +#endif +#if __has_include() +#import #endif diff --git a/Carthage/Build/iOS/OHHTTPStubs.framework/Headers/OHHTTPStubsResponse+HTTPMessage.h b/Carthage/Build/iOS/OHHTTPStubs.framework/Headers/OHHTTPStubsResponse+HTTPMessage.h index 0ac0f6e1..2776a4f3 100644 --- a/Carthage/Build/iOS/OHHTTPStubs.framework/Headers/OHHTTPStubsResponse+HTTPMessage.h +++ b/Carthage/Build/iOS/OHHTTPStubs.framework/Headers/OHHTTPStubsResponse+HTTPMessage.h @@ -1,24 +1,41 @@ -// -// OHHTTPStubsResponse+HTTPMessage.h -// OHHTTPStubs -// -// Created by Olivier Halligon on 01/09/13. -// Copyright (c) 2013 AliSoftware. All rights reserved. -// - -#import "OHHTTPStubsResponse.h" - -#ifdef NS_ASSUME_NONNULL_BEGIN - NS_ASSUME_NONNULL_BEGIN - #define _nullable_ __nullable -#else - #define _nullable_ -#endif +/*********************************************************************************** + * + * Copyright (c) 2012 Olivier Halligon + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + ***********************************************************************************/ +/* This category is not available on watchOS because CFNetwork is needed for its implementation but isn't available on Nano */ +#if __has_include() + +#import +#import + +NS_ASSUME_NONNULL_BEGIN + /** * Adds support for building stubs from "HTTP Messages" conforming to * the format output by `curl -is` + * + * @note This category is not available on watchOS */ @interface OHHTTPStubsResponse (HTTPMessage) @@ -52,11 +69,11 @@ */ +(instancetype)responseNamed:(NSString*)responseName - inBundle:(NSBundle* _nullable_)bundleOrNil; + inBundle:(nullable NSBundle*)bundleOrNil; @end -#ifdef NS_ASSUME_NONNULL_END - NS_ASSUME_NONNULL_END +NS_ASSUME_NONNULL_END + #endif diff --git a/Carthage/Build/iOS/OHHTTPStubs.framework/Headers/OHHTTPStubsResponse+JSON.h b/Carthage/Build/iOS/OHHTTPStubs.framework/Headers/OHHTTPStubsResponse+JSON.h index fc8719df..3069ff32 100644 --- a/Carthage/Build/iOS/OHHTTPStubs.framework/Headers/OHHTTPStubsResponse+JSON.h +++ b/Carthage/Build/iOS/OHHTTPStubs.framework/Headers/OHHTTPStubsResponse+JSON.h @@ -1,20 +1,32 @@ -// -// OHHTTPStubsResponse+JSON.h -// OHHTTPStubs -// -// Created by Olivier Halligon on 01/09/13. -// Copyright (c) 2013 AliSoftware. All rights reserved. -// +/*********************************************************************************** + * + * Copyright (c) 2012 Olivier Halligon + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + ***********************************************************************************/ -#import "OHHTTPStubsResponse.h" -#ifdef NS_ASSUME_NONNULL_BEGIN - NS_ASSUME_NONNULL_BEGIN - #define _nullable_ __nullable -#else - #define _nullable_ -#endif +#import +#import +NS_ASSUME_NONNULL_BEGIN /** * Adds convenience methods to manipulate JSON objects directly. @@ -38,10 +50,8 @@ */ + (instancetype)responseWithJSONObject:(id)jsonObject statusCode:(int)statusCode - headers:(NSDictionary * _nullable_)httpHeaders; + headers:(nullable NSDictionary *)httpHeaders; @end -#ifdef NS_ASSUME_NONNULL_END - NS_ASSUME_NONNULL_END -#endif +NS_ASSUME_NONNULL_END diff --git a/Carthage/Build/iOS/OHHTTPStubs.framework/Headers/OHHTTPStubsResponse.h b/Carthage/Build/iOS/OHHTTPStubs.framework/Headers/OHHTTPStubsResponse.h index a80abd13..f96dfbf9 100644 --- a/Carthage/Build/iOS/OHHTTPStubs.framework/Headers/OHHTTPStubsResponse.h +++ b/Carthage/Build/iOS/OHHTTPStubs.framework/Headers/OHHTTPStubsResponse.h @@ -22,19 +22,12 @@ * ***********************************************************************************/ -// For SDK 7.1 Compatibility (as this macro was only included starting SDK 8.0) -#ifndef NS_DESIGNATED_INITIALIZER - #if __has_attribute(objc_designated_initializer) - #define NS_DESIGNATED_INITIALIZER __attribute__((objc_designated_initializer)) - #else - #define NS_DESIGNATED_INITIALIZER - #endif -#endif //////////////////////////////////////////////////////////////////////////////// #pragma mark - Imports #import +#import //////////////////////////////////////////////////////////////////////////////// #pragma mark - Defines & Constants @@ -47,13 +40,8 @@ OHHTTPStubsDownloadSpeed3G, OHHTTPStubsDownloadSpeed3GPlus, OHHTTPStubsDownloadSpeedWifi; -#ifdef NS_ASSUME_NONNULL_BEGIN - NS_ASSUME_NONNULL_BEGIN - #define _nullable_ __nullable -#else - #define _nullable_ -#endif +NS_ASSUME_NONNULL_BEGIN //////////////////////////////////////////////////////////////////////////////// #pragma mark - Interface @@ -70,7 +58,7 @@ OHHTTPStubsDownloadSpeedWifi; /** * The headers to use for the fake response */ -@property(nonatomic, strong) NSDictionary* _nullable_ httpHeaders; +@property(nonatomic, strong, nullable) NSDictionary* httpHeaders; /** * The HTTP status code to use for the fake response */ @@ -79,7 +67,7 @@ OHHTTPStubsDownloadSpeedWifi; * The inputStream used when sending the response. * @note You generally don't manipulate this directly. */ -@property(nonatomic, strong) NSInputStream* _nullable_ inputStream; +@property(nonatomic, strong, nullable) NSInputStream* inputStream; /** * The size of the fake response body, in bytes. */ @@ -101,9 +89,7 @@ OHHTTPStubsDownloadSpeedWifi; * * If `error` is non-`nil`, the request will result in a failure and no response will be sent. */ -@property(nonatomic, strong) NSError* _nullable_ error; - - +@property(nonatomic, strong, nullable) NSError* error; //////////////////////////////////////////////////////////////////////////////// @@ -125,7 +111,7 @@ OHHTTPStubsDownloadSpeedWifi; */ +(instancetype)responseWithData:(NSData*)data statusCode:(int)statusCode - headers:(NSDictionary* _nullable_)httpHeaders; + headers:(nullable NSDictionary*)httpHeaders; /* -------------------------------------------------------------------------- */ @@ -145,7 +131,7 @@ OHHTTPStubsDownloadSpeedWifi; */ +(instancetype)responseWithFileAtPath:(NSString *)filePath statusCode:(int)statusCode - headers:(NSDictionary* _nullable_)httpHeaders; + headers:(nullable NSDictionary*)httpHeaders; /* -------------------------------------------------------------------------- */ #pragma mark > Building an error response @@ -204,6 +190,15 @@ OHHTTPStubsDownloadSpeedWifi; #pragma mark - Initializers /*! @name Initializers */ +/** + * Designated empty initializer + * + * @return An empty `OHHTTPStubsResponse` on which you need to set either an error or a statusCode, httpHeaders, inputStream and dataSize. + * + * @note This is not recommended to use this method directly. You should use `initWithInputStream:dataSize:statusCode:headers:` instead. + */ +-(instancetype)init NS_DESIGNATED_INITIALIZER; + /** * Designed initializer. Initialize a response with the given input stream, dataSize, * statusCode and headers. @@ -220,7 +215,7 @@ OHHTTPStubsDownloadSpeedWifi; -(instancetype)initWithInputStream:(NSInputStream*)inputStream dataSize:(unsigned long long)dataSize statusCode:(int)statusCode - headers:(NSDictionary* _nullable_)httpHeaders NS_DESIGNATED_INITIALIZER; + headers:(nullable NSDictionary*)httpHeaders NS_DESIGNATED_INITIALIZER; /** @@ -236,7 +231,7 @@ OHHTTPStubsDownloadSpeedWifi; */ -(instancetype)initWithFileAtPath:(NSString*)filePath statusCode:(int)statusCode - headers:(NSDictionary* _nullable_)httpHeaders; + headers:(nullable NSDictionary*)httpHeaders; /** @@ -250,7 +245,7 @@ OHHTTPStubsDownloadSpeedWifi; */ -(instancetype)initWithData:(NSData*)data statusCode:(int)statusCode - headers:(NSDictionary* _nullable_)httpHeaders; + headers:(nullable NSDictionary*)httpHeaders; /** @@ -266,6 +261,4 @@ OHHTTPStubsDownloadSpeedWifi; @end -#ifdef NS_ASSUME_NONNULL_END - NS_ASSUME_NONNULL_END -#endif +NS_ASSUME_NONNULL_END diff --git a/Carthage/Build/iOS/OHHTTPStubs.framework/Headers/OHPathHelpers.h b/Carthage/Build/iOS/OHHTTPStubs.framework/Headers/OHPathHelpers.h index aa250547..b3c301ac 100644 --- a/Carthage/Build/iOS/OHHTTPStubs.framework/Headers/OHPathHelpers.h +++ b/Carthage/Build/iOS/OHHTTPStubs.framework/Headers/OHPathHelpers.h @@ -1,20 +1,32 @@ -// -// OHPathHelpers.h -// Pods -// -// Created by Olivier Halligon on 18/04/2015. -// -// +/*********************************************************************************** + * + * Copyright (c) 2012 Olivier Halligon + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + ***********************************************************************************/ -#import -#ifdef NS_ASSUME_NONNULL_BEGIN - NS_ASSUME_NONNULL_BEGIN - #define _nullable_ __nullable -#else - #define _nullable_ -#endif +#import +#import +NS_ASSUME_NONNULL_BEGIN /** * Useful function to build a path given a file name and a class. @@ -27,7 +39,7 @@ * * @return The path of the given file in the same bundle as the inBundleForClass class */ -NSString* _nullable_ OHPathForFile(NSString* fileName, Class inBundleForClass); +NSString* __nullable OHPathForFile(NSString* fileName, Class inBundleForClass); /** * Useful function to build a path given a file name and a bundle. @@ -44,7 +56,7 @@ NSString* _nullable_ OHPathForFile(NSString* fileName, Class inBundleForClass); * value (so you won't expect it to default to the `mainBundle`). * You should use `[NSBundle bundleForClass:]` instead. */ -NSString* _nullable_ OHPathForFileInBundle(NSString* fileName, NSBundle* bundle); +NSString* __nullable OHPathForFileInBundle(NSString* fileName, NSBundle* bundle); /** * Useful function to build a path to a file in the Documents's directory in the @@ -54,7 +66,7 @@ NSString* _nullable_ OHPathForFileInBundle(NSString* fileName, NSBundle* bundle) * * @return The path of the file in the Documents directory in your App Sandbox */ -NSString* _nullable_ OHPathForFileInDocumentsDir(NSString* fileName); +NSString* __nullable OHPathForFileInDocumentsDir(NSString* fileName); @@ -69,9 +81,6 @@ NSString* _nullable_ OHPathForFileInDocumentsDir(NSString* fileName); * * @return The NSBundle object representing the bundle with the given basename located in your application's resources. */ -NSBundle* _nullable_ OHResourceBundle(NSString* bundleBasename, Class inBundleForClass); - +NSBundle* __nullable OHResourceBundle(NSString* bundleBasename, Class inBundleForClass); -#ifdef NS_ASSUME_NONNULL_END - NS_ASSUME_NONNULL_END -#endif +NS_ASSUME_NONNULL_END diff --git a/Carthage/Build/iOS/OHHTTPStubs.framework/Info.plist b/Carthage/Build/iOS/OHHTTPStubs.framework/Info.plist index 5e9fbbfb..c1771aa8 100644 Binary files a/Carthage/Build/iOS/OHHTTPStubs.framework/Info.plist and b/Carthage/Build/iOS/OHHTTPStubs.framework/Info.plist differ diff --git a/Carthage/Build/iOS/OHHTTPStubs.framework/OHHTTPStubs b/Carthage/Build/iOS/OHHTTPStubs.framework/OHHTTPStubs index f51d7d96..a5a2db93 100755 Binary files a/Carthage/Build/iOS/OHHTTPStubs.framework/OHHTTPStubs and b/Carthage/Build/iOS/OHHTTPStubs.framework/OHHTTPStubs differ diff --git a/Carthage/Build/iOS/OHHTTPStubs.framework/_CodeSignature/CodeResources b/Carthage/Build/iOS/OHHTTPStubs.framework/_CodeSignature/CodeResources index f71f183e..13d566ea 100644 --- a/Carthage/Build/iOS/OHHTTPStubs.framework/_CodeSignature/CodeResources +++ b/Carthage/Build/iOS/OHHTTPStubs.framework/_CodeSignature/CodeResources @@ -4,29 +4,37 @@ files + Headers/Compatibility.h + + nemLhJiiA6nuG4OxoVs57Y5zqGo= + + Headers/OHHTTPStubs+Mocktail.h + + I8bdJCahx5vpvaqH0I3oq5ISHEU= + Headers/OHHTTPStubs.h - ZkXCkCRNKzaJS/i+B9tx8gxjWWs= + Z/SlgWsuJ0vpbiFJJnd4+y6rP2w= Headers/OHHTTPStubsResponse+HTTPMessage.h - hgifl+yah1JagNk/rKesX9FHBV8= + 8mTZt7FXcs2TGd9QA2DlnFQ1Qus= Headers/OHHTTPStubsResponse+JSON.h - OX+IsaPPIQ4BdCfrwyNXYSEQU58= + Hj/JeqXzjLu42YRoMyfhKjzBb3o= Headers/OHHTTPStubsResponse.h - XHfS5+5MkBD0hmctMm/Uk5d+EkI= + JdImAemcp0oZJ8HetxcTWXPxqyE= Headers/OHPathHelpers.h - GEUzcWco3IiHZuJHljoi0fkrZcg= + gTTt2mHzEL2wV2HtiBVBQOQCOBs= Info.plist - YC9+KHInbDtNu7iKp2qzy+94W8s= + Oa15qik9N8NKi9VZJRHe+7KIDNs= Modules/module.modulemap @@ -35,25 +43,33 @@ files2 + Headers/Compatibility.h + + nemLhJiiA6nuG4OxoVs57Y5zqGo= + + Headers/OHHTTPStubs+Mocktail.h + + I8bdJCahx5vpvaqH0I3oq5ISHEU= + Headers/OHHTTPStubs.h - ZkXCkCRNKzaJS/i+B9tx8gxjWWs= + Z/SlgWsuJ0vpbiFJJnd4+y6rP2w= Headers/OHHTTPStubsResponse+HTTPMessage.h - hgifl+yah1JagNk/rKesX9FHBV8= + 8mTZt7FXcs2TGd9QA2DlnFQ1Qus= Headers/OHHTTPStubsResponse+JSON.h - OX+IsaPPIQ4BdCfrwyNXYSEQU58= + Hj/JeqXzjLu42YRoMyfhKjzBb3o= Headers/OHHTTPStubsResponse.h - XHfS5+5MkBD0hmctMm/Uk5d+EkI= + JdImAemcp0oZJ8HetxcTWXPxqyE= Headers/OHPathHelpers.h - GEUzcWco3IiHZuJHljoi0fkrZcg= + gTTt2mHzEL2wV2HtiBVBQOQCOBs= Modules/module.modulemap diff --git a/Carthage/Build/iOS/Quick.framework/Headers/QCKDSL.h b/Carthage/Build/iOS/Quick.framework/Headers/QCKDSL.h index 7e63cbde..c5f3152a 100644 --- a/Carthage/Build/iOS/Quick.framework/Headers/QCKDSL.h +++ b/Carthage/Build/iOS/Quick.framework/Headers/QCKDSL.h @@ -1,5 +1,7 @@ #import +@class ExampleMetadata; + /** Provides a hook for Quick to be configured before any examples are run. Within this scope, override the +[QuickConfiguration configure:] method @@ -46,19 +48,24 @@ typedef NSDictionary *(^QCKDSLSharedExampleContext)(void); typedef void (^QCKDSLSharedExampleBlock)(QCKDSLSharedExampleContext); typedef void (^QCKDSLEmptyBlock)(void); - -extern void qck_beforeSuite(QCKDSLEmptyBlock closure); -extern void qck_afterSuite(QCKDSLEmptyBlock closure); -extern void qck_sharedExamples(NSString *name, QCKDSLSharedExampleBlock closure); -extern void qck_describe(NSString *description, QCKDSLEmptyBlock closure); -extern void qck_context(NSString *description, QCKDSLEmptyBlock closure); -extern void qck_beforeEach(QCKDSLEmptyBlock closure); -extern void qck_afterEach(QCKDSLEmptyBlock closure); -extern void qck_pending(NSString *description, QCKDSLEmptyBlock closure); -extern void qck_xdescribe(NSString *description, QCKDSLEmptyBlock closure); -extern void qck_xcontext(NSString *description, QCKDSLEmptyBlock closure); -extern void qck_fdescribe(NSString *description, QCKDSLEmptyBlock closure); -extern void qck_fcontext(NSString *description, QCKDSLEmptyBlock closure); +typedef void (^QCKDSLExampleMetadataBlock)(ExampleMetadata *exampleMetadata); + +#define QUICK_EXPORT FOUNDATION_EXPORT + +QUICK_EXPORT void qck_beforeSuite(QCKDSLEmptyBlock closure); +QUICK_EXPORT void qck_afterSuite(QCKDSLEmptyBlock closure); +QUICK_EXPORT void qck_sharedExamples(NSString *name, QCKDSLSharedExampleBlock closure); +QUICK_EXPORT void qck_describe(NSString *description, QCKDSLEmptyBlock closure); +QUICK_EXPORT void qck_context(NSString *description, QCKDSLEmptyBlock closure); +QUICK_EXPORT void qck_beforeEach(QCKDSLEmptyBlock closure); +QUICK_EXPORT void qck_beforeEachWithMetadata(QCKDSLExampleMetadataBlock closure); +QUICK_EXPORT void qck_afterEach(QCKDSLEmptyBlock closure); +QUICK_EXPORT void qck_afterEachWithMetadata(QCKDSLExampleMetadataBlock closure); +QUICK_EXPORT void qck_pending(NSString *description, QCKDSLEmptyBlock closure); +QUICK_EXPORT void qck_xdescribe(NSString *description, QCKDSLEmptyBlock closure); +QUICK_EXPORT void qck_xcontext(NSString *description, QCKDSLEmptyBlock closure); +QUICK_EXPORT void qck_fdescribe(NSString *description, QCKDSLEmptyBlock closure); +QUICK_EXPORT void qck_fcontext(NSString *description, QCKDSLEmptyBlock closure); #ifndef QUICK_DISABLE_SHORT_SYNTAX /** @@ -134,6 +141,14 @@ static inline void beforeEach(QCKDSLEmptyBlock closure) { qck_beforeEach(closure); } +/** + Identical to QCKDSL.beforeEach, except the closure is provided with + metadata on the example that the closure is being run prior to. + */ +static inline void beforeEachWithMetadata(QCKDSLExampleMetadataBlock closure) { + qck_beforeEachWithMetadata(closure); +} + /** Defines a closure to be run after each example in the current example group. This closure is not run for pending or otherwise disabled examples. @@ -146,6 +161,14 @@ static inline void afterEach(QCKDSLEmptyBlock closure) { qck_afterEach(closure); } +/** + Identical to QCKDSL.afterEach, except the closure is provided with + metadata on the example that the closure is being run after. + */ +static inline void afterEachWithMetadata(QCKDSLExampleMetadataBlock closure) { + qck_afterEachWithMetadata(closure); +} + /** Defines an example or example group that should not be executed. Use `pending` to temporarily disable examples or groups that should not be run yet. @@ -207,5 +230,5 @@ static inline void fcontext(NSString *description, QCKDSLEmptyBlock closure) { typedef void (^QCKItBlock)(NSString *description, QCKDSLEmptyBlock closure); typedef void (^QCKItBehavesLikeBlock)(NSString *description, QCKDSLSharedExampleContext context); -extern QCKItBlock qck_it_builder(NSDictionary *flags, NSString *file, NSUInteger line); -extern QCKItBehavesLikeBlock qck_itBehavesLike_builder(NSDictionary *flags, NSString *file, NSUInteger line); +QUICK_EXPORT QCKItBlock qck_it_builder(NSDictionary *flags, NSString *file, NSUInteger line); +QUICK_EXPORT QCKItBehavesLikeBlock qck_itBehavesLike_builder(NSDictionary *flags, NSString *file, NSUInteger line); diff --git a/Carthage/Build/iOS/Quick.framework/Headers/Quick-Swift.h b/Carthage/Build/iOS/Quick.framework/Headers/Quick-Swift.h index 62fbf88e..cebf76e3 100644 --- a/Carthage/Build/iOS/Quick.framework/Headers/Quick-Swift.h +++ b/Carthage/Build/iOS/Quick.framework/Headers/Quick-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 1.2 (swiftlang-602.0.49.6 clang-602.0.49) +// Generated by Apple Swift version 2.0 (swiftlang-700.0.59 clang-700.0.72) #pragma clang diagnostic push #if defined(__has_include) && __has_include() @@ -33,6 +33,11 @@ typedef struct _NSZone NSZone; #else # define SWIFT_RUNTIME_NAME(X) #endif +#if defined(__has_attribute) && __has_attribute(swift_name) +# define SWIFT_COMPILE_NAME(X) __attribute__((swift_name(X))) +#else +# define SWIFT_COMPILE_NAME(X) +#endif #if !defined(SWIFT_CLASS_EXTRA) # define SWIFT_CLASS_EXTRA #endif @@ -45,13 +50,16 @@ typedef struct _NSZone NSZone; #if !defined(SWIFT_CLASS) # if defined(__has_attribute) && __has_attribute(objc_subclassing_restricted) # define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_CLASS_EXTRA +# define SWIFT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA # else # define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA +# define SWIFT_CLASS_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA # endif #endif #if !defined(SWIFT_PROTOCOL) # define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA +# define SWIFT_PROTOCOL_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA #endif #if !defined(SWIFT_EXTENSION) @@ -68,47 +76,41 @@ typedef struct _NSZone NSZone; #if !defined(SWIFT_ENUM) # define SWIFT_ENUM(_type, _name) enum _name : _type _name; enum SWIFT_ENUM_EXTRA _name : _type #endif -#if __has_feature(nullability) -# define SWIFT_NULLABILITY(X) X -#else -# if !defined(__nonnull) -# define __nonnull -# endif -# if !defined(__nullable) -# define __nullable -# endif -# if !defined(__null_unspecified) -# define __null_unspecified -# endif -# define SWIFT_NULLABILITY(X) -#endif +typedef float swift_float2 __attribute__((__ext_vector_type__(2))); +typedef float swift_float3 __attribute__((__ext_vector_type__(3))); +typedef float swift_float4 __attribute__((__ext_vector_type__(4))); +typedef double swift_double2 __attribute__((__ext_vector_type__(2))); +typedef double swift_double3 __attribute__((__ext_vector_type__(3))); +typedef double swift_double4 __attribute__((__ext_vector_type__(4))); +typedef int swift_int2 __attribute__((__ext_vector_type__(2))); +typedef int swift_int3 __attribute__((__ext_vector_type__(3))); +typedef int swift_int4 __attribute__((__ext_vector_type__(4))); #if defined(__has_feature) && __has_feature(modules) +@import ObjectiveC; #endif #pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" #pragma clang diagnostic ignored "-Wduplicate-method-arg" -/// An object encapsulating the file and line number at which -/// a particular example is defined. +/// An object encapsulating the file and line number at which a particular example is defined. SWIFT_CLASS("_TtC5Quick8Callsite") -@interface Callsite +@interface Callsite : NSObject /// The absolute path of the file in which an example is defined. @property (nonatomic, readonly, copy) NSString * __nonnull file; /// The line number on which an example is defined. -@property (nonatomic, readonly) NSInteger line; +@property (nonatomic, readonly) NSUInteger line; @end @class Example; @class ExampleMetadata; -/// A configuration encapsulates various options you can use -/// to configure Quick's behavior. +/// A configuration encapsulates various options you can use to configure Quick's behavior. SWIFT_CLASS("_TtC5Quick13Configuration") -@interface Configuration +@interface Configuration : NSObject /// Run all examples if none match the configured filters. True by default. @property (nonatomic) BOOL runAllWhenEverythingFiltered; @@ -133,17 +135,10 @@ SWIFT_CLASS("_TtC5Quick13Configuration") /// that are run. - (void)exclude:(BOOL (^ __nonnull)(Example * __nonnull))filter; -/// Identical to Quick.Configuration.beforeEach, except the closure is -/// provided with metadata on the example that the closure is being run -/// prior to. +/// Identical to Quick.Configuration.beforeEach, except the closure is provided with metadata on the example that the closure is being run prior to. - (void)beforeEachWithMetadata:(void (^ __nonnull)(ExampleMetadata * __nonnull))closure; -/// Like Quick.DSL.beforeEach, this configures Quick to execute the -/// given closure before each example that is run. The closure -/// passed to this method is executed before each example Quick runs, -/// globally across the test suite. You may call this method multiple -/// times across mulitple +[QuickConfigure configure:] methods in order -/// to define several closures to run before each example. +/// Like Quick.DSL.beforeEach, this configures Quick to execute the given closure before each example that is run. The closure passed to this method is executed before each example Quick runs, globally across the test suite. You may call this method multiple times across mulitple +[QuickConfigure configure:] methods in order to define several closures to run before each example. /// /// Note that, since Quick makes no guarantee as to the order in which /// +[QuickConfiguration configure:] methods are evaluated, there is no @@ -155,17 +150,10 @@ SWIFT_CLASS("_TtC5Quick13Configuration") /// in the test suite. - (void)beforeEach:(void (^ __nonnull)(void))closure; -/// Identical to Quick.Configuration.afterEach, except the closure -/// is provided with metadata on the example that the closure is being -/// run after. +/// Identical to Quick.Configuration.afterEach, except the closure is provided with metadata on the example that the closure is being run after. - (void)afterEachWithMetadata:(void (^ __nonnull)(ExampleMetadata * __nonnull))closure; -/// Like Quick.DSL.afterEach, this configures Quick to execute the -/// given closure after each example that is run. The closure -/// passed to this method is executed after each example Quick runs, -/// globally across the test suite. You may call this method multiple -/// times across mulitple +[QuickConfigure configure:] methods in order -/// to define several closures to run after each example. +/// Like Quick.DSL.afterEach, this configures Quick to execute the given closure after each example that is run. The closure passed to this method is executed after each example Quick runs, globally across the test suite. You may call this method multiple times across mulitple +[QuickConfigure configure:] methods in order to define several closures to run after each example. /// /// Note that, since Quick makes no guarantee as to the order in which /// +[QuickConfiguration configure:] methods are evaluated, there is no @@ -177,180 +165,73 @@ SWIFT_CLASS("_TtC5Quick13Configuration") /// in the test suite. - (void)afterEach:(void (^ __nonnull)(void))closure; -/// Like Quick.DSL.beforeSuite, this configures Quick to execute -/// the given closure prior to any and all examples that are run. -/// The two methods are functionally equivalent. +/// Like Quick.DSL.beforeSuite, this configures Quick to execute the given closure prior to any and all examples that are run. The two methods are functionally equivalent. - (void)beforeSuite:(void (^ __nonnull)(void))closure; -/// Like Quick.DSL.afterSuite, this configures Quick to execute -/// the given closure after all examples have been run. -/// The two methods are functionally equivalent. +/// Like Quick.DSL.afterSuite, this configures Quick to execute the given closure after all examples have been run. The two methods are functionally equivalent. - (void)afterSuite:(void (^ __nonnull)(void))closure; +- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end -/// Examples, defined with the it function, use assertions to -/// demonstrate how code should behave. These are like "tests" in XCTest. +/// Examples, defined with the it function, use assertions to demonstrate how code should behave. These are like "tests" in XCTest. SWIFT_CLASS("_TtC5Quick7Example") -@interface Example +@interface Example : NSObject -/// A boolean indicating whether the example is a shared example; -/// i.e.: whether it is an example defined with itBehavesLike. +/// A boolean indicating whether the example is a shared example; i.e.: whether it is an example defined with itBehavesLike. @property (nonatomic) BOOL isSharedExample; -/// The site at which the example is defined. -/// This must be set correctly in order for Xcode to highlight -/// the correct line in red when reporting a failure. +/// The site at which the example is defined. This must be set correctly in order for Xcode to highlight the correct line in red when reporting a failure. @property (nonatomic) Callsite * __nonnull callsite; +@property (nonatomic, readonly, copy) NSString * __nonnull description; -/// The example name. A name is a concatenation of the name of -/// the example group the example belongs to, followed by the -/// description of the example itself. +/// The example name. A name is a concatenation of the name of the example group the example belongs to, followed by the description of the example itself. /// /// The example name is used to generate a test method selector /// to be displayed in Xcode's test navigator. @property (nonatomic, readonly, copy) NSString * __nonnull name; -/// Executes the example closure, as well as all before and after -/// closures defined in the its surrounding example groups. +/// Executes the example closure, as well as all before and after closures defined in the its surrounding example groups. - (void)run; @end -/// Example groups are logical groupings of examples, defined with -/// the describe and context functions. Example groups can share -/// setup and teardown code. +/// Example groups are logical groupings of examples, defined with the describe and context functions. Example groups can share setup and teardown code. SWIFT_CLASS("_TtC5Quick12ExampleGroup") -@interface ExampleGroup +@interface ExampleGroup : NSObject +@property (nonatomic, readonly, copy) NSString * __nonnull description; -/// Returns a list of examples that belong to this example group, -/// or to any of its descendant example groups. -@property (nonatomic, readonly, copy) NSArray * __nonnull examples; +/// Returns a list of examples that belong to this example group, or to any of its descendant example groups. +@property (nonatomic, readonly, copy) NSArray * __nonnull examples; @end -/// A class that encapsulates information about an example, -/// including the index at which the example was executed, as -/// well as the example itself. +/// A class that encapsulates information about an example, including the index at which the example was executed, as well as the example itself. SWIFT_CLASS("_TtC5Quick15ExampleMetadata") -@interface ExampleMetadata +@interface ExampleMetadata : NSObject /// The example for which this metadata was collected. @property (nonatomic, readonly) Example * __nonnull example; -/// The index at which this example was executed in the -/// test suite. +/// The index at which this example was executed in the test suite. @property (nonatomic, readonly) NSInteger exampleIndex; @end -/// A namespace for filter flag keys, defined primarily to make the -/// keys available in Objective-C. -SWIFT_CLASS("QCKFilter") -@interface Filter +/// A namespace for filter flag keys, defined primarily to make the keys available in Objective-C. +SWIFT_CLASS("_TtC5Quick6Filter") +@interface Filter : NSObject -/// Example and example groups with [Focused: true] are included in test runs, -/// excluding all other examples without this flag. Use this to only run one or -/// two tests that you're currently focusing on. +/// Example and example groups with [Focused: true] are included in test runs, excluding all other examples without this flag. Use this to only run one or two tests that you're currently focusing on. + (NSString * __nonnull)focused; -/// Example and example groups with [Pending: true] are excluded from test runs. -/// Use this to temporarily suspend examples that you know do not pass yet. +/// Example and example groups with [Pending: true] are excluded from test runs. Use this to temporarily suspend examples that you know do not pass yet. + (NSString * __nonnull)pending; -@end - - - -/// A collection of state Quick builds up in order to work its magic. -/// World is primarily responsible for maintaining a mapping of QuickSpec -/// classes to root example groups for those classes. -/// -/// It also maintains a mapping of shared example names to shared -/// example closures. -/// -/// You may configure how Quick behaves by calling the -[World configure:] -/// method from within an overridden +[QuickConfiguration configure:] method. -SWIFT_CLASS("_TtC5Quick5World") -@interface World - -/// The example group that is currently being run. -/// The DSL requires that this group is correctly set in order to build a -/// correct hierarchy of example groups and their examples. -@property (nonatomic) ExampleGroup * __nullable currentExampleGroup; - -/// The example metadata of the test that is currently being run. -/// This is useful for using the Quick test metadata (like its name) at -/// runtime. -@property (nonatomic) ExampleMetadata * __nullable currentExampleMetadata; - -/// A flag that indicates whether additional test suites are being run -/// within this test suite. This is only true within the context of Quick -/// functional tests. -@property (nonatomic) BOOL isRunningAdditionalSuites; -+ (World * __nonnull)sharedWorld; - -/// Exposes the World's Configuration object within the scope of the closure -/// so that it may be configured. This method must not be called outside of -/// an overridden +[QuickConfiguration configure:] method. -/// -/// \param closure A closure that takes a Configuration object that can -/// be mutated to change Quick's behavior. -- (void)configure:(void (^ __nonnull)(Configuration * __nonnull))closure; - -/// Finalizes the World's configuration. -/// Any subsequent calls to World.configure() will raise. -- (void)finalizeConfiguration; - -/// Returns an internally constructed root example group for the given -/// QuickSpec class. -/// -/// A root example group with the description "root example group" is lazily -/// initialized for each QuickSpec class. This root example group wraps the -/// top level of a -[QuickSpec spec] method--it's thanks to this group that -/// users can define beforeEach and it closures at the top level, like so: -/// -///
override func spec() {

// These belong to the root example group -/// beforeEach {} -/// it("is at the top level") {}

}

-/// \param cls The QuickSpec class for which to retrieve the root example group. -/// -/// \returns The root example group for the class. -- (ExampleGroup * __nonnull)rootExampleGroupForSpecClass:(Class __nonnull)cls; - -/// Returns all examples that should be run for a given spec class. -/// There are two filtering passes that occur when determining which examples should be run. -/// That is, these examples are the ones that are included by inclusion filters, and are -/// not excluded by exclusion filters. -/// -/// \param specClass The QuickSpec subclass for which examples are to be returned. -/// -/// \returns A list of examples to be run as test invocations. -- (NSArray * __nonnull)examplesForSpecClass:(Class __nonnull)specClass; -@end - -@class NSDictionary; - -@interface World (SWIFT_EXTENSION(Quick)) -- (void)beforeSuite:(void (^ __nonnull)(void))closure; -- (void)afterSuite:(void (^ __nonnull)(void))closure; -- (void)sharedExamples:(NSString * __nonnull)name closure:(void (^ __nonnull)(NSDictionary * __nonnull (^ __nonnull)(void)))closure; -- (void)describe:(NSString * __nonnull)description flags:(NSDictionary * __nonnull)flags closure:(void (^ __nonnull)(void))closure; -- (void)context:(NSString * __nonnull)description flags:(NSDictionary * __nonnull)flags closure:(void (^ __nonnull)(void))closure; -- (void)fdescribe:(NSString * __nonnull)description flags:(NSDictionary * __nonnull)flags closure:(void (^ __nonnull)(void))closure; -- (void)xdescribe:(NSString * __nonnull)description flags:(NSDictionary * __nonnull)flags closure:(void (^ __nonnull)(void))closure; -- (void)beforeEach:(void (^ __nonnull)(void))closure; -- (void)beforeEachWithClosure:(void (^ __nonnull)(ExampleMetadata * __nonnull))closure; -- (void)afterEach:(void (^ __nonnull)(void))closure; -- (void)afterEachWithClosure:(void (^ __nonnull)(ExampleMetadata * __nonnull))closure; -- (void)itWithDescription:(NSString * __nonnull)description flags:(NSDictionary * __nonnull)flags file:(NSString * __nonnull)file line:(NSInteger)line closure:(void (^ __nonnull)(void))closure; -- (void)fitWithDescription:(NSString * __nonnull)description flags:(NSDictionary * __nonnull)flags file:(NSString * __nonnull)file line:(NSInteger)line closure:(void (^ __nonnull)(void))closure; -- (void)xitWithDescription:(NSString * __nonnull)description flags:(NSDictionary * __nonnull)flags file:(NSString * __nonnull)file line:(NSInteger)line closure:(void (^ __nonnull)(void))closure; -- (void)itBehavesLikeSharedExampleNamed:(NSString * __nonnull)name sharedExampleContext:(NSDictionary * __nonnull (^ __nonnull)(void))sharedExampleContext flags:(NSDictionary * __nonnull)flags file:(NSString * __nonnull)file line:(NSInteger)line; -- (void)pending:(NSString * __nonnull)description closure:(void (^ __nonnull)(void))closure; +- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end #pragma clang diagnostic pop diff --git a/Carthage/Build/iOS/Quick.framework/Info.plist b/Carthage/Build/iOS/Quick.framework/Info.plist index 76ecfa16..97f594b0 100644 Binary files a/Carthage/Build/iOS/Quick.framework/Info.plist and b/Carthage/Build/iOS/Quick.framework/Info.plist differ diff --git a/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm.swiftdoc index fea729a5..f3f3fd66 100644 Binary files a/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm.swiftdoc differ diff --git a/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm.swiftmodule index f4f63327..7cf95618 100644 Binary files a/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm.swiftmodule differ diff --git a/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm64.swiftdoc index 14699065..0da84dbc 100644 Binary files a/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm64.swiftdoc differ diff --git a/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm64.swiftmodule index c09abefb..3dbbbb70 100644 Binary files a/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/arm64.swiftmodule differ diff --git a/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/i386.swiftdoc index e3cce090..7d640c4d 100644 Binary files a/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/i386.swiftdoc differ diff --git a/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/i386.swiftmodule index dd538554..a2fcedbf 100644 Binary files a/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/i386.swiftmodule differ diff --git a/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/x86_64.swiftdoc index 1a4c52b0..43d14b64 100644 Binary files a/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/x86_64.swiftdoc differ diff --git a/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/x86_64.swiftmodule index 77df20f5..ea738728 100644 Binary files a/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/Quick.framework/Modules/Quick.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/iOS/Quick.framework/Quick b/Carthage/Build/iOS/Quick.framework/Quick index 88fb1e6e..508fae8e 100755 Binary files a/Carthage/Build/iOS/Quick.framework/Quick and b/Carthage/Build/iOS/Quick.framework/Quick differ diff --git a/Carthage/Build/iOS/Quick.framework/_CodeSignature/CodeResources b/Carthage/Build/iOS/Quick.framework/_CodeSignature/CodeResources index e42c2e9e..8ee2cf56 100644 --- a/Carthage/Build/iOS/Quick.framework/_CodeSignature/CodeResources +++ b/Carthage/Build/iOS/Quick.framework/_CodeSignature/CodeResources @@ -6,11 +6,11 @@ Headers/QCKDSL.h - 7PbIJRcEKu110FAe5LNaPVYKGuw= + ZKiC7b5Xxh1q3DnR7Y0VojsEeiQ= Headers/Quick-Swift.h - GhK9GU5/z4W4V5yhuvfd4uoOZFw= + 0+jHVffDfs2L52S7EWK1RgUUFFQ= Headers/Quick.h @@ -26,23 +26,23 @@ Info.plist - XWFFPghetL4m69yPy1WgY75vOb0= + 6NNtqO9qwMHrXCaIpLVUJ6iOoto= Modules/Quick.swiftmodule/arm.swiftdoc - nneJJXwVKWmSU81eyoS62MNPye4= + jSB7WPmZ7hrMY24i9VtBZRL7id0= Modules/Quick.swiftmodule/arm.swiftmodule - KWhSUjdbqZoeGrvhAsJXNSXB8fk= + KsMJScjQX50SPRmcLc/Bnlb8OSw= Modules/Quick.swiftmodule/arm64.swiftdoc - cly/Ztl6hanO5tcRLYTNPvZRfsY= + S+mzHjofsaICGrg37LgPK1XYym0= Modules/Quick.swiftmodule/arm64.swiftmodule - 84q3u7/hF9gS/TlZnmAJTrMWxos= + qpMkSe/Hn7yBws0AyVBiz/xZvqE= Modules/module.modulemap @@ -53,11 +53,11 @@ Headers/QCKDSL.h - 7PbIJRcEKu110FAe5LNaPVYKGuw= + ZKiC7b5Xxh1q3DnR7Y0VojsEeiQ= Headers/Quick-Swift.h - GhK9GU5/z4W4V5yhuvfd4uoOZFw= + 0+jHVffDfs2L52S7EWK1RgUUFFQ= Headers/Quick.h @@ -73,19 +73,19 @@ Modules/Quick.swiftmodule/arm.swiftdoc - nneJJXwVKWmSU81eyoS62MNPye4= + jSB7WPmZ7hrMY24i9VtBZRL7id0= Modules/Quick.swiftmodule/arm.swiftmodule - KWhSUjdbqZoeGrvhAsJXNSXB8fk= + KsMJScjQX50SPRmcLc/Bnlb8OSw= Modules/Quick.swiftmodule/arm64.swiftdoc - cly/Ztl6hanO5tcRLYTNPvZRfsY= + S+mzHjofsaICGrg37LgPK1XYym0= Modules/Quick.swiftmodule/arm64.swiftmodule - 84q3u7/hF9gS/TlZnmAJTrMWxos= + qpMkSe/Hn7yBws0AyVBiz/xZvqE= Modules/module.modulemap diff --git a/Carthage/Build/watchOS/Alamofire.framework/Alamofire b/Carthage/Build/watchOS/Alamofire.framework/Alamofire new file mode 100755 index 00000000..a50d0aac Binary files /dev/null and b/Carthage/Build/watchOS/Alamofire.framework/Alamofire differ diff --git a/Carthage/Build/watchOS/Alamofire.framework/Headers/Alamofire-Swift.h b/Carthage/Build/watchOS/Alamofire.framework/Headers/Alamofire-Swift.h new file mode 100644 index 00000000..61d20e2f --- /dev/null +++ b/Carthage/Build/watchOS/Alamofire.framework/Headers/Alamofire-Swift.h @@ -0,0 +1,120 @@ +// Generated by Apple Swift version 2.0 (swiftlang-700.0.59 clang-700.0.72) +#pragma clang diagnostic push + +#if defined(__has_include) && __has_include() +# include +#endif + +#pragma clang diagnostic ignored "-Wauto-import" +#include +#include +#include +#include + +#if defined(__has_include) && __has_include() +# include +#elif !defined(__cplusplus) || __cplusplus < 201103L +typedef uint_least16_t char16_t; +typedef uint_least32_t char32_t; +#endif + +typedef struct _NSZone NSZone; + +#if !defined(SWIFT_PASTE) +# define SWIFT_PASTE_HELPER(x, y) x##y +# define SWIFT_PASTE(x, y) SWIFT_PASTE_HELPER(x, y) +#endif +#if !defined(SWIFT_METATYPE) +# define SWIFT_METATYPE(X) Class +#endif + +#if defined(__has_attribute) && __has_attribute(objc_runtime_name) +# define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) +#else +# define SWIFT_RUNTIME_NAME(X) +#endif +#if defined(__has_attribute) && __has_attribute(swift_name) +# define SWIFT_COMPILE_NAME(X) __attribute__((swift_name(X))) +#else +# define SWIFT_COMPILE_NAME(X) +#endif +#if !defined(SWIFT_CLASS_EXTRA) +# define SWIFT_CLASS_EXTRA +#endif +#if !defined(SWIFT_PROTOCOL_EXTRA) +# define SWIFT_PROTOCOL_EXTRA +#endif +#if !defined(SWIFT_ENUM_EXTRA) +# define SWIFT_ENUM_EXTRA +#endif +#if !defined(SWIFT_CLASS) +# if defined(__has_attribute) && __has_attribute(objc_subclassing_restricted) +# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_CLASS_EXTRA +# define SWIFT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA +# else +# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA +# define SWIFT_CLASS_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA +# endif +#endif + +#if !defined(SWIFT_PROTOCOL) +# define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA +# define SWIFT_PROTOCOL_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA +#endif + +#if !defined(SWIFT_EXTENSION) +# define SWIFT_EXTENSION(M) SWIFT_PASTE(M##_Swift_, __LINE__) +#endif + +#if !defined(OBJC_DESIGNATED_INITIALIZER) +# if defined(__has_attribute) && __has_attribute(objc_designated_initializer) +# define OBJC_DESIGNATED_INITIALIZER __attribute__((objc_designated_initializer)) +# else +# define OBJC_DESIGNATED_INITIALIZER +# endif +#endif +#if !defined(SWIFT_ENUM) +# define SWIFT_ENUM(_type, _name) enum _name : _type _name; enum SWIFT_ENUM_EXTRA _name : _type +#endif +typedef float swift_float2 __attribute__((__ext_vector_type__(2))); +typedef float swift_float3 __attribute__((__ext_vector_type__(3))); +typedef float swift_float4 __attribute__((__ext_vector_type__(4))); +typedef double swift_double2 __attribute__((__ext_vector_type__(2))); +typedef double swift_double3 __attribute__((__ext_vector_type__(3))); +typedef double swift_double4 __attribute__((__ext_vector_type__(4))); +typedef int swift_int2 __attribute__((__ext_vector_type__(2))); +typedef int swift_int3 __attribute__((__ext_vector_type__(3))); +typedef int swift_int4 __attribute__((__ext_vector_type__(4))); +#if defined(__has_feature) && __has_feature(modules) +@import Foundation; +@import Foundation.NSURLSession; +#endif + +#pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" +#pragma clang diagnostic ignored "-Wduplicate-method-arg" + +@interface NSURL (SWIFT_EXTENSION(Alamofire)) +@property (nonatomic, readonly, copy) NSString * __nonnull URLString; +@end + + +@interface NSURLComponents (SWIFT_EXTENSION(Alamofire)) +@property (nonatomic, readonly, copy) NSString * __nonnull URLString; +@end + +@class NSMutableURLRequest; + +@interface NSURLRequest (SWIFT_EXTENSION(Alamofire)) +@property (nonatomic, readonly) NSMutableURLRequest * __nonnull URLRequest; +@end + + +@interface NSURLRequest (SWIFT_EXTENSION(Alamofire)) +@property (nonatomic, readonly, copy) NSString * __nonnull URLString; +@end + + +@interface NSURLSession (SWIFT_EXTENSION(Alamofire)) +@end + +#pragma clang diagnostic pop diff --git a/Carthage/Build/watchOS/Alamofire.framework/Headers/Alamofire.h b/Carthage/Build/watchOS/Alamofire.framework/Headers/Alamofire.h new file mode 100644 index 00000000..f56a1e11 --- /dev/null +++ b/Carthage/Build/watchOS/Alamofire.framework/Headers/Alamofire.h @@ -0,0 +1,26 @@ +// Alamofire.h +// +// Copyright (c) 2014–2015 Alamofire Software Foundation (http://alamofire.org/) +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +#import + +FOUNDATION_EXPORT double AlamofireVersionNumber; +FOUNDATION_EXPORT const unsigned char AlamofireVersionString[]; diff --git a/Carthage/Build/watchOS/Alamofire.framework/Info.plist b/Carthage/Build/watchOS/Alamofire.framework/Info.plist new file mode 100644 index 00000000..03320d61 Binary files /dev/null and b/Carthage/Build/watchOS/Alamofire.framework/Info.plist differ diff --git a/Carthage/Build/watchOS/Alamofire.framework/Modules/Alamofire.swiftmodule/arm.swiftdoc b/Carthage/Build/watchOS/Alamofire.framework/Modules/Alamofire.swiftmodule/arm.swiftdoc new file mode 100644 index 00000000..58042de1 Binary files /dev/null and b/Carthage/Build/watchOS/Alamofire.framework/Modules/Alamofire.swiftmodule/arm.swiftdoc differ diff --git a/Carthage/Build/watchOS/Alamofire.framework/Modules/Alamofire.swiftmodule/arm.swiftmodule b/Carthage/Build/watchOS/Alamofire.framework/Modules/Alamofire.swiftmodule/arm.swiftmodule new file mode 100644 index 00000000..1b80a41e Binary files /dev/null and b/Carthage/Build/watchOS/Alamofire.framework/Modules/Alamofire.swiftmodule/arm.swiftmodule differ diff --git a/Carthage/Build/watchOS/Alamofire.framework/Modules/Alamofire.swiftmodule/i386.swiftdoc b/Carthage/Build/watchOS/Alamofire.framework/Modules/Alamofire.swiftmodule/i386.swiftdoc new file mode 100644 index 00000000..f58a9df4 Binary files /dev/null and b/Carthage/Build/watchOS/Alamofire.framework/Modules/Alamofire.swiftmodule/i386.swiftdoc differ diff --git a/Carthage/Build/watchOS/Alamofire.framework/Modules/Alamofire.swiftmodule/i386.swiftmodule b/Carthage/Build/watchOS/Alamofire.framework/Modules/Alamofire.swiftmodule/i386.swiftmodule new file mode 100644 index 00000000..4ee9ad08 Binary files /dev/null and b/Carthage/Build/watchOS/Alamofire.framework/Modules/Alamofire.swiftmodule/i386.swiftmodule differ diff --git a/Carthage/Build/watchOS/Alamofire.framework/Modules/module.modulemap b/Carthage/Build/watchOS/Alamofire.framework/Modules/module.modulemap new file mode 100644 index 00000000..8096dcc9 --- /dev/null +++ b/Carthage/Build/watchOS/Alamofire.framework/Modules/module.modulemap @@ -0,0 +1,10 @@ +framework module Alamofire { + umbrella header "Alamofire.h" + + export * + module * { export * } +} + +module Alamofire.Swift { + header "Alamofire-Swift.h" +}