Merge pull request #851 from firebase/bs-firebasecore-version

Report FirebaseCore version

4 files changed, 33 insertions, 6 deletions

diff --git a/Firebase/Core/FIRApp.m b/Firebase/Core/FIRApp.m
index eed63b8..c2ce28e 100644
--- a/Firebase/Core/FIRApp.m
+++ b/Firebase/Core/FIRApp.m
@@ -229,6 +229,8 @@ static NSMutableDictionary *sLibraryVersions;
   sDefaultApp = nil;
   [sAllApps removeAllObjects];
   sAllApps = nil;
+  [sLibraryVersions removeAllObjects];
+  sLibraryVersions = nil;
 }
 
 - (void)deleteApp:(FIRAppVoidBoolCallback)completion {
@@ -426,8 +428,8 @@ static NSMutableDictionary *sLibraryVersions;
   NSMutableArray<NSString *> *libraries =
       [[NSMutableArray<NSString *> alloc] initWithCapacity:sLibraryVersions.count];
   for (NSString *libraryName in sLibraryVersions) {
-    [libraries addObject:
-        [NSString stringWithFormat:@"%@/%@", libraryName, sLibraryVersions[libraryName]]];
+    [libraries
+        addObject:[NSString stringWithFormat:@"%@/%@", libraryName, sLibraryVersions[libraryName]]];
   }
   [libraries sortUsingSelector:@selector(localizedCaseInsensitiveCompare:)];
   return [libraries componentsJoinedByString:@" "];
diff --git a/Firebase/Core/FIROptions.m b/Firebase/Core/FIROptions.m
index 75f2ed2..e8f6600 100644
--- a/Firebase/Core/FIROptions.m
+++ b/Firebase/Core/FIROptions.m
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#import "Private/FIRAppInternal.h"
 #import "Private/FIRBundleUtil.h"
 #import "Private/FIRErrors.h"
 #import "Private/FIRLogger.h"
@@ -108,6 +109,30 @@ static NSDictionary *sDefaultOptionsDictionary = nil;
 
 #pragma mark - Private class methods
 
++ (void)load {
+  // Report FirebaseCore version for useragent string
+  NSRange major = NSMakeRange(0, 1);
+  NSRange minor = NSMakeRange(1, 2);
+  NSRange patch = NSMakeRange(3, 2);
+  [FIRApp
+      registerLibrary:@"fire-ios"
+          withVersion:[NSString stringWithFormat:@"%@.%d.%d",
+                                                 [kFIRLibraryVersionID substringWithRange:major],
+                                                 [[kFIRLibraryVersionID substringWithRange:minor]
+                                                     intValue],
+                                                 [[kFIRLibraryVersionID substringWithRange:patch]
+                                                     intValue]]];
+  NSDictionary<NSString *, id> *info = [[NSBundle mainBundle] infoDictionary];
+  NSString *xcodeVersion = info[@"DTXcodeBuild"];
+  NSString *sdkVersion = info[@"DTSDKBuild"];
+  if (xcodeVersion) {
+    [FIRApp registerLibrary:@"xcode" withVersion:xcodeVersion];
+  }
+  if (sdkVersion) {
+    [FIRApp registerLibrary:@"apple-sdk" withVersion:sdkVersion];
+  }
+}
+
 + (NSDictionary *)defaultOptionsDictionary {
   if (sDefaultOptionsDictionary != nil) {
     return sDefaultOptionsDictionary;
diff --git a/Firebase/Core/Private/FIRAppInternal.h b/Firebase/Core/Private/FIRAppInternal.h
index 4b56728..b7cf5e8 100644
--- a/Firebase/Core/Private/FIRAppInternal.h
+++ b/Firebase/Core/Private/FIRAppInternal.h
@@ -134,7 +134,6 @@ typedef NSString *_Nullable (^FIRAppGetUIDImplementation)(void);
  */
 + (BOOL)isDefaultAppConfigured;
 
-
 /**
  * Registers a given third-party library with the given version number to be reported for
  * analyitcs.
@@ -142,8 +141,10 @@ typedef NSString *_Nullable (^FIRAppGetUIDImplementation)(void);
  * @param library Name of the library
  * @param version Version of the library
  */
-+ (void)registerLibrary:(nonnull NSString *)library withVersion:(nonnull NSString *)version
-    NS_SWIFT_NAME(registerLibrary(_:version:));
+// clang-format off
++ (void)registerLibrary:(NSString *)library
+            withVersion:(NSString *)version NS_SWIFT_NAME(registerLibrary(_:version:));
+// clang-format on
 
 /**
  * A concatenated string representing all the third-party libraries and version numbers.
diff --git a/Firebase/Storage/FIRStorageObservableTask.m b/Firebase/Storage/FIRStorageObservableTask.m
index 7d7c61f..af82fa2 100644
--- a/Firebase/Storage/FIRStorageObservableTask.m
+++ b/Firebase/Storage/FIRStorageObservableTask.m
@@ -206,7 +206,6 @@
   [handlersCopy
       enumerateKeysAndObjectsUsingBlock:^(
           NSString *_Nonnull key, FIRStorageVoidSnapshot _Nonnull handler, BOOL *_Nonnull stop) {
-
         dispatch_async(callbackQueue, ^{
           handler(snapshot);
         });