DVC-2073 use CFBundleShortVersionString and CFBundleVersion to auto populate appVersion / appBuild

Author: jonathannorris

DevCycle/DVCUser.swift

@@ -60,16 +60,6 @@ public class UserBuilder {
         return self
     }
 
-    public func appVersion(_ appVersion: String) -> UserBuilder {
-        self.user.appVersion = appVersion
-        return self
-    }
-    
-    public func appBuild(_ appBuild: Int) -> UserBuilder {
-        self.user.appBuild = appBuild
-        return self
-    }
-    
     public func customData(_ customData: [String: Any]) -> UserBuilder {
         self.customData = customData
         return self
@@ -132,6 +122,10 @@ public class DVCUser: Codable {
         self.deviceModel = platform.deviceModel
         self.sdkType = platform.sdkType
         self.sdkVersion = platform.sdkVersion
+        self.appVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String
+        if let appBuildStr = Bundle.main.infoDictionary?["CFBundleVersion"] as? String {
+            self.appBuild = Int(appBuildStr)
+        }
     }
 
     enum CodingKeys: String, CodingKey {

DevCycle/ObjC/ObjCDVCUser.swift

@@ -14,7 +14,6 @@ public class ObjCUser: NSObject {
     @objc public var name: String?
     @objc public var language: String?
     @objc public var country: String?
-    @objc public var appVersion: String?
     @objc public var customData: [String: Any]?
     @objc public var privateCustomData: [String: Any]?
 
@@ -47,9 +46,6 @@ public class ObjCUser: NSObject {
         if let country = self.country {
             userBuilder = userBuilder.country(country)
         }
-        if let appVersion = self.appVersion {
-            userBuilder = userBuilder.appVersion(appVersion)
-        }
         if let customData = self.customData {
             userBuilder = userBuilder.customData(customData)
         }

DevCycleTests/ObjC/ObjcDVCUserTests.m

@@ -38,7 +38,6 @@ - (void)testNonUserIdPropertiesAreNil {
         XCTAssertNil(user.email);
         XCTAssertNil(user.name);
         XCTAssertNil(user.country);
-        XCTAssertNil(user.appVersion);
         XCTAssertNil(user.customData);
         XCTAssertNil(user.privateCustomData);
     }];
@@ -50,7 +49,6 @@ - (void)testNonUserIdPropertiesAreNotNil {
     user.email = @"email.com";
     user.name = @"Jason Smith";
     user.country = @"CAN";
-    user.appVersion = @"1.0.0";
     DVCClient *client = [DVCClient initialize:@"my_env_key" user:user options:nil onInitialized:^(NSError * _Nullable err) {
         XCTAssertNil(err);
         XCTAssertNotNil(user);
@@ -59,7 +57,6 @@ - (void)testNonUserIdPropertiesAreNotNil {
         XCTAssertEqual(user.email, @"email.com");
         XCTAssertEqual(user.name, @"Jason Smith");
         XCTAssertEqual(user.country, @"CAN");
-        XCTAssertEqual(user.appVersion, @"1.0.0");
     }];
 }
 

Examples/DevCycle-Example-App-ObjC/DevCycle-Example-App-ObjC/ViewController.m

@@ -31,7 +31,6 @@ - (IBAction)loginButtonPressed:(id)sender {
         user.userId = @"my-user";
         user.name = @"My Name";
         user.language = @"EN-CA";
-        user.appVersion = @"1.0.0";
         user.country = @"CA";
         user.email = @"[email protected]";
 

Examples/DevCycle-Example-App/DevCycle-Example-App/ViewController.swift

@@ -27,8 +27,6 @@ class ViewController: UIViewController {
             let user = try? DVCUser.builder()
                               .userId("my-user1")
                               .email("[email protected]")
-                              .appBuild(1005)
-                              .appVersion("1.1.1")
                               .country("CA")
                               .name("Ash Ketchum")
                               .language("EN")