Expose library version, move it out of options

Author: Greg Soltis

Example/Core/Tests/FIROptionsTest.m

@@ -21,7 +21,6 @@
 extern NSString *const kFIRIsMeasurementEnabled;
 extern NSString *const kFIRIsAnalyticsCollectionEnabled;
 extern NSString *const kFIRIsAnalyticsCollectionDeactivated;
-extern NSString *const kFIRLibraryVersionID;
 
 @interface FIROptions (Test)
 
@@ -153,7 +152,6 @@ - (void)assertOptionsMatchDefaults:(FIROptions *)options andProjectID:(BOOL)matc
   XCTAssertEqualObjects(options.trackingID, kTrackingID);
   XCTAssertEqualObjects(options.GCMSenderID, kGCMSenderID);
   XCTAssertEqualObjects(options.androidClientID, kAndroidClientID);
-  XCTAssertEqualObjects(options.libraryVersionID, kFIRLibraryVersionID);
   XCTAssertEqualObjects(options.databaseURL, kDatabaseURL);
   XCTAssertEqualObjects(options.storageBucket, kStorageBucket);
   XCTAssertEqualObjects(options.bundleID, kBundleID);

Firebase/Core/FIRLogger.m

@@ -15,6 +15,7 @@
 #import "Private/FIRLogger.h"
 
 #import "FIRLoggerLevel.h"
+#import "FIRVersion.h"
 #import "third_party/FIRAppEnvironmentUtil.h"
 
 #include <asl.h>
@@ -229,7 +230,7 @@ void FIRLogBasic(FIRLoggerLevel level,
   NSCAssert(numberOfMatches == 1, @"Incorrect message code format.");
 #endif
   NSString *logMsg = [[NSString alloc] initWithFormat:message arguments:args_ptr];
-  logMsg = [NSString stringWithFormat:@"%@[%@] %@", service, messageCode, logMsg];
+  logMsg = [NSString stringWithFormat:@"%@ - %@[%@] %@", kFIRLibraryVersionID, service, messageCode, logMsg];
   dispatch_async(sFIRClientQueue, ^{
     asl_log(sFIRLoggerClient, NULL, level, "%s", logMsg.UTF8String);
   });

Firebase/Core/FIROptions.m

@@ -303,14 +303,6 @@ - (void)setGoogleAppID:(NSString *)googleAppID {
   _optionsDictionary[kFIRGoogleAppID] = [googleAppID copy];
 }
 
-- (NSString *)libraryVersionID {
-  return kFIRLibraryVersionID;
-}
-
-- (void)setLibraryVersionID:(NSString *)libraryVersionID {
-  _optionsDictionary[kFIRLibraryVersionID] = [libraryVersionID copy];
-}
-
 - (NSString *)databaseURL {
   return self.optionsDictionary[kFIRDatabaseURL];
 }

Firebase/Core/Public/FIRVersion.h

@@ -0,0 +1,19 @@
+/*
+ * Copyright 2017 Google
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import <Foundation/Foundation.h>
+
+extern NSString *const kFIRLibraryVersionID;