Merge branch 'release/2.0.2'

mobilejazz · Mar 23, 2022 · af5c001 · af5c001
2 parents 3cf6943 + f652218
commit af5c001
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 17 deletions.
diff --git a/Harmony.podspec b/Harmony.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
     s.name             = 'Harmony'
-    s.version          = '2.0.1'
+    s.version          = '2.0.2'
     s.summary          = 'Mobile Jazz Harmony'
     s.swift_version    = '5'
 

diff --git a/HarmonyTesting.podspec b/HarmonyTesting.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
     s.name             = 'HarmonyTesting'
-    s.version          = '2.0.1'
+    s.version          = '2.0.2'
     s.summary          = 'Mobile Jazz Harmony Testing'
     s.swift_version    = '5'
 
@@ -33,6 +33,6 @@ Pod::Spec.new do |s|
     s.ios.deployment_target = '12.0'
 
     s.source_files = 'Sources/HarmonyTesting/**/*'
-    s.dependency 'Harmony', '2.0.1'
+    s.dependency 'Harmony', '2.0.2'
 
 end
diff --git a/README.md b/README.md
@@ -38,17 +38,17 @@ Harmony is available through [CocoaPods](http://cocoapods.org). To install
 it, simply add the following line to your Podfile:
 
 ```ruby
-pod 'Harmony', '~> 2.0.1'
+pod 'Harmony', '~> 2.0.2'
 ```
 For unit test, you can use the following pod:
 ```ruby
-pod 'HarmonyTesting', '~> 2.0.1'
+pod 'HarmonyTesting', '~> 2.0.2'
 ```
 
 ### Carthage
 
 ```ruby
-github "mobilejazz/harmony-swift" "2.0.1"
+github "mobilejazz/harmony-swift" "2.0.2"
 ```
 
 Resolve dependencies `carthage update --use-xcframeworks --platform iOS` and add `Harmony.xcframework` to your project. For unit test, add `HarmonyTesting.xcframework` in your build phase of your testing target.
@@ -57,7 +57,7 @@ Resolve dependencies `carthage update --use-xcframeworks --platform iOS` and add
 
 ```ruby
 dependencies: [
-    .package(url: "https://github.com/mobilejazz/harmony-swift", .upToNextMajor(from: "2.0.1"))
+    .package(url: "https://github.com/mobilejazz/harmony-swift", .upToNextMajor(from: "2.0.2"))
 ]
 ```
 This package includes two libraries: `Harmony` and `HarmonyTesting`.

diff --git a/Sources/Harmony/Data/DataSource/FileSystemStorageDataSource.swift b/Sources/Harmony/Data/DataSource/FileSystemStorageDataSource.swift
@@ -119,7 +119,8 @@ 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 = try? NSKeyedUnarchiver.unarchivedObject(ofClasses: [NSArray.self, NSData.self], from: data) as? [Data] {
+//                    if let datas = try? NSKeyedUnarchiver.unarchivedObject(ofClasses: [NSArray.self, NSData.self], from: data) as? [Data] {
+                    if let datas = NSKeyedUnarchiver.unarchiveObject(with: data) as? [Data] {
                         // it was an array!
                         array.append(contentsOf: datas)
                     } else {
@@ -134,7 +135,8 @@ 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 = try? NSKeyedUnarchiver.unarchivedObject(ofClasses: [NSArray.self, NSData.self], from: data) as? [Data] else {
+//            guard let array = try? NSKeyedUnarchiver.unarchivedObject(ofClasses: [NSArray.self, NSData.self], from: data) as? [Data] else {
+            guard let array = NSKeyedUnarchiver.unarchiveObject(with: data) as? [Data] else {
                 return Future(CoreError.NotFound("Data not found at path: \(path)"))
             }
             return Future(array)
@@ -185,7 +187,8 @@ 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 = try NSKeyedArchiver.archivedData(withRootObject: array, requiringSecureCoding: false)
+//                let data = try NSKeyedArchiver.archivedData(withRootObject: array, requiringSecureCoding: false)
+                let data = NSKeyedArchiver.archivedData(withRootObject: array)
                 try data.write(to: fileURL, options: writingOptions)
                 r.set(array)
             }

diff --git a/Sources/Harmony/Data/Mapper/Mapper+NSCoding.swift b/Sources/Harmony/Data/Mapper/Mapper+NSCoding.swift
@@ -18,12 +18,14 @@ import Foundation
 
 public class NSCodingToDataMapper <T:NSCoding> : Mapper <T, Data> {
     public override func map(_ from: T) -> Data {
-        return try! NSKeyedArchiver.archivedData(withRootObject: from, requiringSecureCoding: false)
+//        return try! NSKeyedArchiver.archivedData(withRootObject: from, requiringSecureCoding: false)
+        return NSKeyedArchiver.archivedData(withRootObject: from)
     }
 }
 
-public class DataToNSCodingMapper <T:NSCoding> : Mapper <Data, T> where T:NSObject {
+public class DataToNSCodingMapper <T:NSCoding> : Mapper <Data, T> { // where T:NSObject {
     public override func map(_ from: Data) -> T {
-        return try! NSKeyedUnarchiver.unarchivedObject(ofClass: T.self, from: from)!
+//        return try! NSKeyedUnarchiver.unarchivedObject(ofClass: T.self, from: from)!
+        return NSKeyedUnarchiver.unarchiveObject(with: from) as! T
     }
 }
diff --git a/Sources/Harmony/Security/KeychainService.swift b/Sources/Harmony/Security/KeychainService.swift
@@ -157,8 +157,10 @@ public extension KeychainService {
     /// - Returns: The NSCoding conforming type stored in the keychain or nil.
     func get<T>(_ key: String) -> T? where T: NSCoding, T: NSObject {
         if let data : Data = get(key) {
-            if let value = try? NSKeyedUnarchiver.unarchivedObject(ofClass: T.self, from: data) {
-                return value
+//            if let value = try? NSKeyedUnarchiver.unarchivedObject(ofClass: T.self, from: data) {
+//            return value
+            if let value = NSKeyedUnarchiver.unarchiveObject(with: data) {
+                return (value as! T)
             } else {
                 return nil
             }
@@ -173,8 +175,9 @@ public extension KeychainService {
     ///   - key: The key.
     /// - Returns: The operation result.
     @discardableResult
-    func set<T>(_ value: T, forKey key: String) throws -> Result where T: NSCoding {
-        let data = try NSKeyedArchiver.archivedData(withRootObject: value, requiringSecureCoding: false)
+    func set<T>(_ value: T, forKey key: String) throws -> Result { // where T: NSCoding {
+//        let data = try NSKeyedArchiver.archivedData(withRootObject: value, requiringSecureCoding: false)
+        let data = NSKeyedArchiver.archivedData(withRootObject: value)
         return set(data, forKey: key)
     }
 }