Add support for sending CFBundleVersion along with the CFBundleShortV… (#5452)

* Add support for sending CFBundleVersion along with the CFBundleShortVersionString.

* Style fixes.

Author: dmandar

FirebaseRemoteConfig/Sources/RCNConfigSettings.m

@@ -352,6 +352,8 @@ - (NSString *)nextRequestWithUserProperties:(NSDictionary *)userProperties {
                                                                 _bundleIdentifier]];
   ret = [ret stringByAppendingString:[NSString stringWithFormat:@", app_version:'%@'",
                                                                 FIRRemoteConfigAppVersion()]];
+  ret = [ret stringByAppendingString:[NSString stringWithFormat:@", app_build:'%@'",
+                                                                FIRRemoteConfigAppBuildVersion()]];
   ret = [ret stringByAppendingString:[NSString stringWithFormat:@", sdk_version:'%d'",
                                                                 FIRRemoteConfigSDKVersion()]];
 

FirebaseRemoteConfig/Sources/RCNDevice.h

@@ -32,6 +32,9 @@ NSString *FIRRemoteConfigPodVersion(void);
 /// App version.
 NSString *FIRRemoteConfigAppVersion(void);
 
+/// App build version
+NSString *FIRRemoteConfigAppBuildVersion(void);
+
 /// Device country, in lowercase.
 NSString *FIRRemoteConfigDeviceCountry(void);
 

FirebaseRemoteConfig/Sources/RCNDevice.m

@@ -26,12 +26,17 @@
 #define STR_EXPAND(x) #x
 
 static NSString *const RCNDeviceContextKeyVersion = @"app_version";
+static NSString *const RCNDeviceContextKeyBuild = @"app_build";
 static NSString *const RCNDeviceContextKeyOSVersion = @"os_version";
 static NSString *const RCNDeviceContextKeyDeviceLocale = @"device_locale";
 static NSString *const RCNDeviceContextKeyLocaleLanguage = @"locale_language";
 static NSString *const RCNDeviceContextKeyGMPProjectIdentifier = @"GMP_project_Identifier";
 
 NSString *FIRRemoteConfigAppVersion() {
+  return [[NSBundle mainBundle] infoDictionary][@"CFBundleShortVersionString"];
+}
+
+NSString *FIRRemoteConfigAppBuildVersion() {
   return [[NSBundle mainBundle] infoDictionary][@"CFBundleVersion"];
 }
 
@@ -205,6 +210,7 @@ int FIRRemoteConfigSDKVersion() {
     NSString *GMPProjectIdentifier) {
   NSMutableDictionary *deviceContext = [[NSMutableDictionary alloc] init];
   deviceContext[RCNDeviceContextKeyVersion] = FIRRemoteConfigAppVersion();
+  deviceContext[RCNDeviceContextKeyBuild] = FIRRemoteConfigAppBuildVersion();
   deviceContext[RCNDeviceContextKeyOSVersion] = [GULAppEnvironmentUtil systemVersion];
   deviceContext[RCNDeviceContextKeyDeviceLocale] = FIRRemoteConfigDeviceLocale();
   // NSDictionary setObjectForKey will fail if there's no GMP project ID, must check ahead.
@@ -219,6 +225,9 @@ BOOL FIRRemoteConfigHasDeviceContextChanged(NSDictionary *deviceContext,
   if (![deviceContext[RCNDeviceContextKeyVersion] isEqual:FIRRemoteConfigAppVersion()]) {
     return YES;
   }
+  if (![deviceContext[RCNDeviceContextKeyBuild] isEqual:FIRRemoteConfigAppBuildVersion()]) {
+    return YES;
+  }
   if (!
       [deviceContext[RCNDeviceContextKeyOSVersion] isEqual:[GULAppEnvironmentUtil systemVersion]]) {
     return YES;

FirebaseRemoteConfig/Tests/Unit/RCNConfigDBManagerTest.m

@@ -193,7 +193,8 @@ - (void)testWriteAndLoadMetadataResult {
   NSString *bundleIdentifier = [NSBundle mainBundle].bundleIdentifier;
   NSTimeInterval lastFetchTimestamp = [NSDate date].timeIntervalSince1970;
 
-  NSDictionary *deviceContext = @{@"app_version" : @"1.0.1", @"os_version" : @"iOS9.1"};
+  NSDictionary *deviceContext =
+      @{@"app_version" : @"1.0.1", @"app_build" : @"1.0.1.11", @"os_version" : @"iOS9.1"};
   NSDictionary *syncedDBCustomVariables = @{@"user_level" : @15, @"user_experiences" : @"2468"};
   NSArray *successFetchTimes = @[];
   NSTimeInterval now = [NSDate date].timeIntervalSince1970;