Removing deprecation warnings

Author: Joan Martin

Sources/Harmony/Data/DataSource/FileSystemStorageDataSource.swift

@@ -119,7 +119,7 @@ public class FileSystemStorageDataSource : GetDataSource, PutDataSource, DeleteD
                         throw CoreError.NotFound("Data not found at path: \(url.path)")
                     }
                     // Attempting to unarchive in case it was an array
-                    if let datas = NSKeyedUnarchiver.unarchiveObject(with: data) as? [Data] {
+                    if let datas = try? NSKeyedUnarchiver.unarchivedObject(ofClasses: [NSArray.self, NSData.self], from: data) as? [Data] {
                         // it was an array!
                         array.append(contentsOf: datas)
                     } else {
@@ -134,7 +134,7 @@ public class FileSystemStorageDataSource : GetDataSource, PutDataSource, DeleteD
             guard let data = fileManager.contents(atPath: path) else {
                 return Future(CoreError.NotFound("Data not found at path: \(path)"))
             }
-            guard let array = NSKeyedUnarchiver.unarchiveObject(with: data) as? [Data] else {
+            guard let array = try? NSKeyedUnarchiver.unarchivedObject(ofClasses: [NSArray.self, NSData.self], from: data) as? [Data] else {
                 return Future(CoreError.NotFound("Data not found at path: \(path)"))
             }
             return Future(array)
@@ -185,7 +185,7 @@ public class FileSystemStorageDataSource : GetDataSource, PutDataSource, DeleteD
                 if fileManager.fileExists(atPath: folderURL.path) == false {
                     try fileManager.createDirectory(atPath: folderURL.path, withIntermediateDirectories: true, attributes: nil)
                 }
-                let data = NSKeyedArchiver.archivedData(withRootObject: array)
+                let data = try NSKeyedArchiver.archivedData(withRootObject: array, requiringSecureCoding: false)
                 try data.write(to: fileURL, options: writingOptions)
                 r.set(array)
             }

Sources/Harmony/Data/Mapper/Mapper+NSCoding.swift

@@ -18,12 +18,12 @@ import Foundation
 
 public class NSCodingToDataMapper <T:NSCoding> : Mapper <T, Data> {
     public override func map(_ from: T) -> Data {
-        return NSKeyedArchiver.archivedData(withRootObject: from)
+        return try! NSKeyedArchiver.archivedData(withRootObject: from, requiringSecureCoding: false)
     }
 }
 
-public class DataToNSCodingMapper <T:NSCoding> : Mapper <Data, T> {
+public class DataToNSCodingMapper <T:NSCoding> : Mapper <Data, T> where T:NSObject {
     public override func map(_ from: Data) -> T {
-        return NSKeyedUnarchiver.unarchiveObject(with: from) as! T
+        return try! NSKeyedUnarchiver.unarchivedObject(ofClass: T.self, from: from)!
     }
 }

Sources/Harmony/Security/KeychainDataSource.swift

@@ -77,11 +77,13 @@ public class KeychainDataSource<T> : GetDataSource, PutDataSource, DeleteDataSou
         switch query {
         case let query as KeyQuery:
             let nsarray = array as NSArray
-            switch keychain.set(nsarray, forKey: query.key) {
-            case .success:
-                return Future(array)
-            case .failed(let status):
-                return Future(CoreError.OSStatusFailure(status, "Keychain failed to set value for key \(query.key) (OSStatus \(status))"))
+            return Future { r in
+                switch try keychain.set(nsarray, forKey: query.key) {
+                case .success:
+                    r.set(array)
+                case .failed(let status):
+                    throw CoreError.OSStatusFailure(status, "Keychain failed to set value for key \(query.key) (OSStatus \(status))")
+                }
             }
         default:
             query.fatalError(.putAll, self)

Sources/Harmony/Security/KeychainService.swift

@@ -155,10 +155,10 @@ public extension KeychainService {
     ///
     /// - Parameter key: The key.
     /// - Returns: The NSCoding conforming type stored in the keychain or nil.
-    func get<T>(_ key: String) -> T? where T: NSCoding {
+    func get<T>(_ key: String) -> T? where T: NSCoding, T: NSObject {
         if let data : Data = get(key) {
-            if let value = NSKeyedUnarchiver.unarchiveObject(with: data) {
-                return (value as! T)
+            if let value = try? NSKeyedUnarchiver.unarchivedObject(ofClass: T.self, from: data) {
+                return value
             } else {
                 return nil
             }
@@ -173,8 +173,8 @@ public extension KeychainService {
     ///   - key: The key.
     /// - Returns: The operation result.
     @discardableResult
-    func set<T>(_ value: T, forKey key: String) -> Result where T: NSCoding {
-        let data = NSKeyedArchiver.archivedData(withRootObject: value)
+    func set<T>(_ value: T, forKey key: String) throws -> Result where T: NSCoding {
+        let data = try NSKeyedArchiver.archivedData(withRootObject: value, requiringSecureCoding: false)
         return set(data, forKey: key)
     }
 }