Merge branch 'master' into yasir/ondecision-activate-getvariation

Author: Yasir Ali

OptimizelySDK/Extensions/OptimizelyManager+Extension.swift

@@ -25,7 +25,7 @@ extension OptimizelyManager {
         HandlerRegistryService.shared.registerBinding(binder:Binder<OPTNotificationCenter>(service: OPTNotificationCenter.self).singetlon().reInitializeStrategy(strategy: .reUse).using(instance:notificationCenter).sdkKey(key: sdkKey))
 
         // the decision service is also a singleton that will reCreate on re-initalize
-        HandlerRegistryService.shared.registerBinding(binder:Binder<OPTDecisionService>(service: OPTDecisionService.self).singetlon().using(instance:decisionService).sdkKey(key: sdkKey))
+        HandlerRegistryService.shared.registerBinding(binder:Binder<OPTDecisionService>(service: OPTDecisionService.self).singetlon().using(instance:decisionService).reInitializeStrategy(strategy: .reUse).sdkKey(key: sdkKey))
 
         // An event dispatcher.  We rely on the factory to create and mantain. Again, recreate on re-initalize.
         HandlerRegistryService.shared.registerBinding(binder:Binder<OPTEventDispatcher>(service: OPTEventDispatcher.self).singetlon().reInitializeStrategy(strategy: .reUse).using(instance: eventDispatcher).sdkKey(key: sdkKey))

OptimizelySDK/OptimizelyTests/OptimizelyTests-Common/EventDispatcherTest.swift

@@ -55,9 +55,13 @@ class EventDispatcherTest: XCTestCase {
 
         eventDispatcher?.dispatcher.sync {
         }
-        
-        XCTAssert(eventDispatcher?.dataStore.count == 1)
-        
+ 
+        if #available(iOS 10.0, tvOS 10.0, *) {
+            XCTAssert(eventDispatcher?.dataStore.count == 1)
+        }
+        else {
+            XCTAssert(eventDispatcher?.dataStore.count == 0)
+        }
         eventDispatcher?.flushEvents()
 
         eventDispatcher?.dispatcher.sync {
@@ -86,8 +90,13 @@ class EventDispatcherTest: XCTestCase {
         }
         wait()
 
-        XCTAssert(eventDispatcher?.dataStore.count == 1)
-        
+        if #available(iOS 10.0, tvOS 10.0, *) {
+            XCTAssert(eventDispatcher?.dataStore.count == 1)
+        }
+        else {
+            XCTAssert(eventDispatcher?.dataStore.count == 0)
+        }
+
         eventDispatcher?.flushEvents()
         wait()
 
@@ -114,8 +123,13 @@ class EventDispatcherTest: XCTestCase {
         }
         wait()
 
-        XCTAssert(eventDispatcher?.dataStore.count == 1)
-        
+        if #available(iOS 10.0, tvOS 10.0, *) {
+            XCTAssert(eventDispatcher?.dataStore.count == 1)
+        }
+        else {
+            XCTAssert(eventDispatcher?.dataStore.count == 0)
+        }
+
         eventDispatcher?.flushEvents()
         wait()
 
@@ -141,8 +155,13 @@ class EventDispatcherTest: XCTestCase {
         }
         wait()
 
-        XCTAssert(eventDispatcher?.dataStore.count == 1)
-        
+        if #available(iOS 10.0, tvOS 10.0, *) {
+            XCTAssert(eventDispatcher?.dataStore.count == 1)
+        }
+        else {
+            XCTAssert(eventDispatcher?.dataStore.count == 0)
+        }
+
         eventDispatcher?.flushEvents()
         wait()
 

OptimizelySDK/OptimizelyTests/OptimizelyTests-DataModel/AttributeValueTests.swift

@@ -77,7 +77,7 @@ class AttributeValueTests: XCTestCase {
         // Float80 is not supported JSON parser (it's not expected to see this from datafile, but it still
         // can be passed as attribute values from client app
         let testsAttributesOnly = [
-            [Float80(value), Double(value)]
+            [CLongDouble(value), Double(value)]
         ]
 
         for (idx, test) in testsAttributesOnly.enumerated() {

OptimizelySDK/OptimizelyTests/OptimizelyTests-DataModel/AttributeValueTests_Evaluate.swift

@@ -251,7 +251,7 @@ extension AttributeValueTests_Evaluate {
     }
 
     func allNumTypes(value: Double) -> [Any] {
-        return [Double(value), Float(value), Float32(value), Float64(value), Float80(value)]
+        return [Double(value), Float(value), Float32(value), Float64(value), CLongDouble(value)]
     }
 
     func allValueTypes(value: Double) -> [Any] {

OptimizelySDK/Utils/Utils.swift

@@ -32,7 +32,7 @@ class Utils {
     static func isDoubleType(_ value: Any) -> Bool {
         // Float32 === Float, Float64 ==== Double
         let allSwiftNumTypes: [Any.Type] = [Double.self,
-                                            Float.self, Float80.self]
+                                            Float.self, CLongDouble.self]
 
         let isSwiftNumType = allSwiftNumTypes.contains{ $0 == type(of: value) }
         let isNSNumberNumType = (value is Double) && !isNSNumberBoolType(value)
@@ -78,7 +78,7 @@ class Utils {
         switch value {
         case is Double: finalValue = Double(value as! Double)
         case is Float: finalValue = Double(value as! Float)
-        case is Float80: finalValue = Double(value as! Float80)
+        case is CLongDouble: finalValue = Double(value as! CLongDouble)
         default: finalValue = nil
         }