From 1fe10989a09ace8e01196e78dfbdbf178b46e817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguye=CC=82=CC=83n?= Date: Sat, 1 Apr 2017 20:42:12 -0700 Subject: [PATCH 1/2] OHHTTPStubs master --- Cartfile.private | 2 +- Cartfile.resolved | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cartfile.private b/Cartfile.private index b0e1205..1b68a9c 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1 +1 @@ -github "AliSoftware/OHHTTPStubs" "swift-3.0" +github "AliSoftware/OHHTTPStubs" "master" diff --git a/Cartfile.resolved b/Cartfile.resolved index c7e9ac5..0aafb81 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "AliSoftware/OHHTTPStubs" "57feceaabf333e72b2c637dfba6c13a7a5c49619" +github "AliSoftware/OHHTTPStubs" "8660a5a2253bdd6291be36251ba90b06bceb46a2" From 2974a33db83b7ed58eeff61d2bd18bce242f43b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguye=CC=82=CC=83n?= Date: Sat, 1 Apr 2017 20:43:06 -0700 Subject: [PATCH 2/2] Resolved Swift 3.1 compiler warning --- MapboxStatic/Snapshot.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MapboxStatic/Snapshot.swift b/MapboxStatic/Snapshot.swift index c13f56d..4bf8c18 100644 --- a/MapboxStatic/Snapshot.swift +++ b/MapboxStatic/Snapshot.swift @@ -201,7 +201,7 @@ open class Snapshot: NSObject { let apiMessage = json["message"] as? String guard image != nil && error == nil && apiMessage == nil else { - let apiError = Snapshot.descriptiveError(json, response: response, underlyingError: error as? NSError) + let apiError = Snapshot.descriptiveError(json, response: response, underlyingError: error as NSError?) DispatchQueue.main.async { handler(nil, apiError) }