Merge pull request #9 from fumito-ito/fix-some-warnings

Fix some warnings

Package.swift

@@ -2,45 +2,43 @@
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
-import class Foundation.ProcessInfo
-
-let shouldTest = ProcessInfo.processInfo.environment["TEST"] == "1"
-
-func resolveDependencies() -> [Package.Dependency] {
-    let firebaseRemoteConfig: Package.Dependency = .package(name: "Firebase", url: "https://github.com/firebase/firebase-ios-sdk.git", .upToNextMajor(from: "8.0.0"))
-
-    return [
-        firebaseRemoteConfig,
-    ]
-}
-
-func resolveTargets() -> [Target] {
-    let baseTarget = Target.target(
-        name: "SwiftyRemoteConfig",
-        dependencies: [
-            .product(name: "FirebaseRemoteConfig", package: "Firebase")
-        ],
-        path: "Sources")
-
-    let testTarget = Target.testTarget(
-        name: "SwiftyRemoteConfigTests",
-        dependencies: ["SwiftyRemoteConfig"])
-
-    return shouldTest ? [baseTarget, testTarget] : [baseTarget]
-}
 
 let package = Package(
     name: "SwiftyRemoteConfig",
     platforms: [
         .iOS(.v11),
         .macOS(.v10_12),
+        .tvOS(.v12),
+        .watchOS(.v6),
     ],
     products: [
         // Products define the executables and libraries produced by a package, and make them visible to other packages.
         .library(
             name: "SwiftyRemoteConfig",
-            targets: ["SwiftyRemoteConfig"]),
+            targets: ["SwiftyRemoteConfig"]
+        ),
+    ],
+    dependencies: [
+        .package(
+            name: "Firebase",
+            url: "https://github.com/firebase/firebase-ios-sdk.git",
+            .upToNextMajor(from: "8.0.0")
+        ),
     ],
-    dependencies: resolveDependencies(),
-    targets: resolveTargets()
+    targets: [
+        .target(
+            name: "SwiftyRemoteConfig",
+            dependencies: [
+                .product(name: "FirebaseRemoteConfig", package: "Firebase")
+            ],
+            path: "Sources"
+        ),
+        .testTarget(
+            name: "SwiftyRemoteConfigTests",
+            dependencies: [
+                "SwiftyRemoteConfig"
+            ],
+            path: "Tests"
+        ),
+    ]
 )

Sources/SwiftyRemoteConfig/BuiltIns.swift

@@ -53,7 +53,7 @@ extension RemoteConfigSerializable where Self: RawRepresentable {
 
 extension RemoteConfigSerializable where Self: NSCoding {
     public static var _remoteConfig: RemoteConfigKeyedArchiverBridge<Self> { RemoteConfigKeyedArchiverBridge() }
-    public static var _remoteConfigArray: RemoteConfigKeyedArchiverBridge<[Self]> { RemoteConfigKeyedArchiverBridge() }
+    public static var _remoteConfigArray: RemoteConfigKeyedArchiverArrayBridge<[Self]> { RemoteConfigKeyedArchiverArrayBridge() }
 }
 
 extension Dictionary: RemoteConfigSerializable where Key == String {

Sources/SwiftyRemoteConfig/RemoteConfigBridge.swift

@@ -133,10 +133,6 @@ public struct RemoteConfigUrlBridge: RemoteConfigBridge {
     }
 
     public func deserialize(_ object: RemoteConfigValue) -> URL? {
-        if let url = NSKeyedUnarchiver.unarchiveObject(with: object.dataValue) as? URL {
-            return url
-        }
-
         if let stringValue = object.stringValue, stringValue.isEmpty == false {
             if let url = URL(string: stringValue) {
                 return url
@@ -160,13 +156,41 @@ public struct RemoteConfigCodableBridge<T: Codable>: RemoteConfigBridge {
     }
 }
 
-public struct RemoteConfigKeyedArchiverBridge<T>: RemoteConfigBridge {
+public struct RemoteConfigKeyedArchiverBridge<T: NSCoding>: RemoteConfigBridge {
+    public func get(key: String, remoteConfig: RemoteConfig) -> T? {
+        return self.deserialize(remoteConfig.configValue(forKey: key))
+    }
+
+    public func deserialize(_ object: RemoteConfigValue) -> T? {
+        guard #available(iOS 11.0, macOS 10.13, tvOS 11.0, *) else {
+            return NSKeyedUnarchiver.unarchiveObject(with: object.dataValue) as? T
+        }
+
+        guard let object = try? NSKeyedUnarchiver.unarchivedObject(ofClasses: [T.self], from: object.dataValue) as? T else {
+            return nil
+        }
+
+        return object
+    }
+}
+
+public struct RemoteConfigKeyedArchiverArrayBridge<T: Collection>: RemoteConfigBridge where T.Element: NSCoding {
     public func get(key: String, remoteConfig: RemoteConfig) -> T? {
         return self.deserialize(remoteConfig.configValue(forKey: key))
     }
 
     public func deserialize(_ object: RemoteConfigValue) -> T? {
-        return NSKeyedUnarchiver.unarchiveObject(with: object.dataValue) as? T
+        guard #available(iOS 11.0, macOS 10.13, tvOS 11.0, *) else {
+            return NSKeyedUnarchiver.unarchiveObject(with: object.dataValue) as? T
+        }
+
+        guard let objects = object.jsonValue as? [Data] else {
+            return nil
+        }
+
+        return objects.compactMap({
+            try? NSKeyedUnarchiver.unarchivedObject(ofClasses: [T.Element.self], from: $0) as? T.Element
+        }) as? T
     }
 }
 

SwiftyRemoteConfig.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name         = "SwiftyRemoteConfig"
-  spec.version      = "0.0.2"
+  spec.version      = "0.0.4"
   spec.summary      = "Modern Swift API for FirebaseRemoteConfig"
 
   spec.description  = <<-DESC
@@ -12,8 +12,10 @@ Pod::Spec.new do |spec|
   spec.authors            = { "Fumito Ito" => "weathercook@gmail.com" }
   spec.social_media_url   = "https://twitter.com/fumito_ito"
 
-  spec.platform     = :ios
-  spec.ios.deployment_target = "12.0"
+  spec.ios.deployment_target = "11.0"
+  spec.osx.deployment_target = "10.12"
+  spec.tvos.deployment_target = "12.0"
+  spec.watchos.deployment_target = "6.0"
   spec.source       = { :git => "https://github.com/fumito-ito/SwiftyRemoteConfig.git", :tag => "#{spec.version}" }
   spec.source_files  = "Sources", "Sources/**/*.swift"
   spec.requires_arc = true

Tests/SwiftyRemoteConfigTests/Helpers/RemoteConfigSerializableSpec.swift

@@ -127,13 +127,13 @@ extension RemoteConfigSerializableSpec where Serializable.T: Equatable, Serializ
                 then("create a key") { _ in
                     let key = RemoteConfigKey<Serializable?>("test")
                     XCTAssert(key._key == "test")
-                    XCTAssertNil(key.defaultValue)
+                    XCTAssert(key.defaultValue == nil)
                 }
 
                 then("create an array key") { _ in
                     let key = RemoteConfigKey<[Serializable]?>("test")
                     XCTAssert(key._key == "test")
-                    XCTAssertNil(key.defaultValue)
+                    XCTAssert(key.defaultValue == nil)
                 }
 
                 then("compare optional value to non-optional value") { _ in