move sdkVersion to static init

Author: thomaszurkan-optimizely

OptimizelySDK/Implementation/Events/BatchEventBuilder.swift

@@ -83,7 +83,7 @@ class BatchEventBuilder {
 
         let batchEvent = BatchEvent(revision: config.project.revision,
                                     accountID: config.project.accountId,
-                                    clientVersion: Utils.getSDKVersion(),
+                                    clientVersion: Utils.sdkVersion,
                                     visitors: [visitor],
                                     projectID: config.project.projectId,
                                     clientName: swiftSdkClientName,

OptimizelySDK/Utils/Utils.swift

@@ -10,7 +10,17 @@ import Foundation
 
 class Utils {
 
-    static var sdkVersion:String?
+    // - Bundle(for: OptimizelyManager.self) not working properly to get SDK bundle within unit tests
+    // - Bundle(identifier: bundleIdentifier) works ok consistently
+    // - CocoaPods uses its own bundle identifier, so let it use Bundle(for:) as a fallback
+    //   CocoaPods copies "s.version" in podspec to "CFBundleShortVersionString" in its own Info.plist file
+    static var sdkVersion:String = {
+        let bundle = Bundle(identifier: "com.optimizely.OptimizelySwiftSDK") ?? Bundle(for: OptimizelyManager.self)
+        guard let version = bundle.infoDictionary!["CFBundleShortVersionString"] as? String else {
+            return "3.0.0"
+        }
+        return version
+    }()
 
     // @objc NSNumber can be casted either Bool, Int, or Double
     // more filtering required to avoid NSNumber(false, true) interpreted as Int(0, 1) instead of Bool
@@ -115,25 +125,4 @@ class Utils {
         guard isBoolType(value) else { return nil }
         return (value as! Bool)
     }
-    
-    static func getSDKVersion() -> String {
-        
-        // - Bundle(for: OptimizelyManager.self) not working properly to get SDK bundle within unit tests
-        // - Bundle(identifier: bundleIdentifier) works ok consistently
-        // - CocoaPods uses its own bundle identifier, so let it use Bundle(for:) as a fallback
-        //   CocoaPods copies "s.version" in podspec to "CFBundleShortVersionString" in its own Info.plist file
-        if let sdkVersion = sdkVersion {
-            return sdkVersion
-        }
-
-        let bundle = Bundle(identifier: "com.optimizely.OptimizelySwiftSDK") ?? Bundle(for: OptimizelyManager.self)
-        guard let version = bundle.infoDictionary!["CFBundleShortVersionString"] as? String else {
-            fatalError("Check if SDK framework identifier is correct")
-        }
-        
-        sdkVersion = version
-
-        return version
-    }
-
 }