Fix client factory

ConfigCat.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |spec|
 
   spec.name          = "ConfigCat"
-  spec.version       = "9.1.1"
+  spec.version       = "9.1.2"
   spec.summary       = "ConfigCat Swift SDK"
   spec.swift_version = "4.2"
 

ConfigCat.xcconfig

@@ -47,4 +47,4 @@ SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator watchos watchsimulator app
 SWIFT_VERSION = 4.2
 
 // ConfigCat SDK version
-MARKETING_VERSION = 9.1.1
+MARKETING_VERSION = 9.1.2

README.md

@@ -49,7 +49,7 @@ If you want to use ConfigCat in a [SwiftPM](https://swift.org/package-manager/)
 
 ``` swift
 dependencies: [
-  .package(url: "https://github.com/configcat/swift-sdk", from: "9.1.1")
+  .package(url: "https://github.com/configcat/swift-sdk", from: "9.1.2")
 ]
 ```
 

Sources/ConfigCat/ConfigCatClient.swift

@@ -109,10 +109,12 @@ public final class ConfigCatClient: NSObject, ConfigCatClientProtocol {
         defer {
             mutex.unlock()
         }
-        if let client = instances[sdkKey]?.get(), options != nil {
-            client.log.warning(message: String(format: """
-                                        Client for '%@' is already created and will be reused; options passed are being ignored.
-                                        """, sdkKey))
+        if let client = instances[sdkKey]?.get() {
+            if options != nil {
+                client.log.warning(message: String(format: """
+                                                           Client for '%@' is already created and will be reused; options passed are being ignored.
+                                                           """, sdkKey))
+            }
             return client
         }
         let opts = options ?? ClientOptions.default

Sources/ConfigCat/Utils.swift

@@ -38,7 +38,7 @@ extension Date {
 }
 
 class Constants {
-    static let version: String = "9.1.1"
+    static let version: String = "9.1.2"
     static let configJsonName: String = "config_v5"
     static let globalBaseUrl: String = "https://cdn-global.configcat.com"
     static let euOnlyBaseUrl: String = "https://cdn-eu.configcat.com"

Tests/ConfigCatTests/ConfigCatClientTests.swift

@@ -560,6 +560,18 @@ class ConfigCatClientTests: XCTestCase {
         }
     }
 
+    func testSingleton() {
+        var client1 = ConfigCatClient.get(sdkKey: "test")
+        let client2 = ConfigCatClient.get(sdkKey: "test")
+
+        XCTAssertEqual(client1, client2)
+
+        ConfigCatClient.closeAll()
+        client1 = ConfigCatClient.get(sdkKey: "test")
+
+        XCTAssertNotEqual(client1, client2)
+    }
+
     private func createClient(offline: Bool = false) -> ConfigCatClient {
         ConfigCatClient(sdkKey: "test", refreshMode: PollingModes.manualPoll(), session: MockHTTP.session(), offline: offline)
     }