Fix Xcode 8.3 warnings

sebastato · sebastato · commit ee201663e224 · 2017-03-28T10:45:17.000+02:00
diff --git a/Source/Shared/DataCache.swift b/Source/Shared/DataCache.swift
@@ -76,7 +76,7 @@ class DataCache {
     func dataForKey(_ key: String) -> Data? {
         var result: Data?
         privateQueue.addOperation {
-            result = self.cache.object(forKey: key as NSString) as? Data
+            result = self.cache.object(forKey: key as NSString) as Data?
             if result == nil {
                 let targetURL = self.directoryURL.appendingPathComponent(key)
                 result = try? Data(contentsOf: targetURL)
diff --git a/Source/Shared/Keychain.swift b/Source/Shared/Keychain.swift
@@ -60,7 +60,7 @@ class Keychain {
         if status == errSecSuccess {
             if let retrievedData = dataTypeRef as? Data {
                 if retrievedData.count != 0 {
-                    accessToken = NSString(data: retrievedData, encoding: String.Encoding.utf8.rawValue) as? String
+                    accessToken = NSString(data: retrievedData, encoding: String.Encoding.utf8.rawValue) as String?
                 }
             }
         }
diff --git a/Source/Shared/Logger.swift b/Source/Shared/Logger.swift
@@ -32,7 +32,8 @@ open class ConsoleLogger: Logger {
     
     open func session(_ session: Session, didReceiveResult result: Result) {
         print("")
-        print("Session did receive response:  \(result.HTTPSTatusCode), \(result.URL)")
+        print("Session did receive response:  " + String(describing: result.HTTPSTatusCode) + ", "
+            + String(describing: result.URL))
         if let warning = result.response?["warning"] as? [String: AnyObject] {
             if let text = warning["text"] as? String {
                 print("Warning: \(text)")
diff --git a/Source/Shared/Result.swift b/Source/Shared/Result.swift
@@ -71,7 +71,9 @@ open class Result: CustomStringConvertible {
     }
     
     open var description: String {
-        return "Status code: \(HTTPSTatusCode)\nResponse: \(response)\nError: \(error)"
+        return "Status code: " + String(describing: HTTPSTatusCode)
+            + "\nResponse: " + String(describing: response)
+            + "\nError: " + String(describing: error)
     }
     
 }

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ class Keychain {`
`60`	`60`	`if status == errSecSuccess {`
`61`	`61`	`if let retrievedData = dataTypeRef as? Data {`
`62`	`62`	`if retrievedData.count != 0 {`
`63`		`- accessToken = NSString(data: retrievedData, encoding: String.Encoding.utf8.rawValue) as? String`
	`63`	`+ accessToken = NSString(data: retrievedData, encoding: String.Encoding.utf8.rawValue) as String?`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,9 @@ open class Result: CustomStringConvertible {`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`open var description: String {`
`74`		`- return "Status code: \(HTTPSTatusCode)\nResponse: \(response)\nError: \(error)"`
	`74`	`+ return "Status code: " + String(describing: HTTPSTatusCode)`
	`75`	`+ + "\nResponse: " + String(describing: response)`
	`76`	`+ + "\nError: " + String(describing: error)`
`75`	`77`	`}`
`76`	`78`
`77`	`79`	`}`