From 2349d3e41b57b96fee1055e4d35a34606aa6b726 Mon Sep 17 00:00:00 2001
From: Paul Beusterien <paulbeusterien@google.com>
Date: Thu, 3 May 2018 16:35:33 -0700
Subject: Eliminate duplicate symbol in CocoaPods -all_load build (#1223)

---
 Firebase/Core/FIRLogger.m                   | 4 ++--
 Firebase/Core/FIRVersion.m                  | 7 ++-----
 Firebase/Core/Private/FIRVersion.h          | 4 ++--
 Firestore/Source/API/FIRFirestoreVersion.h  | 2 +-
 Firestore/Source/API/FIRFirestoreVersion.mm | 2 +-
 Firestore/Source/Remote/FSTDatastore.mm     | 2 +-
 6 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/Firebase/Core/FIRLogger.m b/Firebase/Core/FIRLogger.m
index 739664d..eca9a49 100644
--- a/Firebase/Core/FIRLogger.m
+++ b/Firebase/Core/FIRLogger.m
@@ -227,8 +227,8 @@ void FIRLogBasic(FIRLoggerLevel level,
   NSCAssert(numberOfMatches == 1, @"Incorrect message code format.");
 #endif
   NSString *logMsg = [[NSString alloc] initWithFormat:message arguments:args_ptr];
-  logMsg = [NSString
-      stringWithFormat:@"%s - %@[%@] %@", FirebaseVersionString, service, messageCode, logMsg];
+  logMsg =
+      [NSString stringWithFormat:@"%s - %@[%@] %@", FIRVersionString, service, messageCode, logMsg];
   dispatch_async(sFIRClientQueue, ^{
     asl_log(sFIRLoggerClient, NULL, level, "%s", logMsg.UTF8String);
   });
diff --git a/Firebase/Core/FIRVersion.m b/Firebase/Core/FIRVersion.m
index 00a6741..97cd1bc 100644
--- a/Firebase/Core/FIRVersion.m
+++ b/Firebase/Core/FIRVersion.m
@@ -29,8 +29,5 @@
 #define STR(x) STR_EXPAND(x)
 #define STR_EXPAND(x) #x
 
-const unsigned char *const FirebaseVersionString =
-    (const unsigned char *const)STR(Firebase_VERSION);
-
-const unsigned char *const FirebaseCoreVersionString =
-    (const unsigned char *const)STR(FIRCore_VERSION);
+const unsigned char *const FIRVersionString = (const unsigned char *const)STR(Firebase_VERSION);
+const unsigned char *const FIRCoreVersionString = (const unsigned char *const)STR(FIRCore_VERSION);
diff --git a/Firebase/Core/Private/FIRVersion.h b/Firebase/Core/Private/FIRVersion.h
index f18f61f..cec0994 100644
--- a/Firebase/Core/Private/FIRVersion.h
+++ b/Firebase/Core/Private/FIRVersion.h
@@ -17,7 +17,7 @@
 #import <Foundation/Foundation.h>
 
 /** The version of the Firebase SDK. */
-FOUNDATION_EXPORT const unsigned char *const FirebaseVersionString;
+FOUNDATION_EXPORT const unsigned char *const FIRVersionString;
 
 /** The version of the FirebaseCore Component. */
-FOUNDATION_EXPORT const unsigned char *const FirebaseCoreVersionString;
+FOUNDATION_EXPORT const unsigned char *const FIRCoreVersionString;
diff --git a/Firestore/Source/API/FIRFirestoreVersion.h b/Firestore/Source/API/FIRFirestoreVersion.h
index 6fb21eb..aaf7976 100644
--- a/Firestore/Source/API/FIRFirestoreVersion.h
+++ b/Firestore/Source/API/FIRFirestoreVersion.h
@@ -19,4 +19,4 @@
 #import <Foundation/Foundation.h>
 
 /** Version string for the Firebase Firestore SDK. */
-FOUNDATION_EXPORT const unsigned char *const FirebaseFirestoreVersionString;
+FOUNDATION_EXPORT const unsigned char *const FIRFirestoreVersionString;
diff --git a/Firestore/Source/API/FIRFirestoreVersion.mm b/Firestore/Source/API/FIRFirestoreVersion.mm
index 8ebe814..8f0428c 100644
--- a/Firestore/Source/API/FIRFirestoreVersion.mm
+++ b/Firestore/Source/API/FIRFirestoreVersion.mm
@@ -27,5 +27,5 @@
 #define STR(x) STR_EXPAND(x)
 #define STR_EXPAND(x) #x
 
-extern "C" const unsigned char *const FirebaseFirestoreVersionString =
+extern "C" const unsigned char *const FIRFirestoreVersionString =
     (const unsigned char *const)STR(FIRFirestore_VERSION);
diff --git a/Firestore/Source/Remote/FSTDatastore.mm b/Firestore/Source/Remote/FSTDatastore.mm
index c7ee30f..f0852fe 100644
--- a/Firestore/Source/Remote/FSTDatastore.mm
+++ b/Firestore/Source/Remote/FSTDatastore.mm
@@ -185,7 +185,7 @@ typedef GRPCProtoCall * (^RPCFactory)(void);
   // version as a macro, so it would be hardcoded based on version we have at compile time of
   // the Firestore library, rather than the version available at runtime/at compile time by the
   // user of the library.
-  return [NSString stringWithFormat:@"gl-objc/ fire/%s grpc/", FirebaseFirestoreVersionString];
+  return [NSString stringWithFormat:@"gl-objc/ fire/%s grpc/", FIRFirestoreVersionString];
 }
 
 /** Returns the string to be used as google-cloud-resource-prefix header value. */
-- 
cgit v1.2.3


From 8bdafd9f143c5334dc81fe4fce80735138a62811 Mon Sep 17 00:00:00 2001
From: Paul Beusterien <paulbeusterien@google.com>
Date: Mon, 14 May 2018 07:14:22 -0700
Subject: Version updates for 5.0.1 (#1272)

---
 Example/Podfile            |  2 +-
 Firebase/Core/FIROptions.m |  4 ++--
 FirebaseCore.podspec       |  2 +-
 FirebaseFirestore.podspec  |  2 +-
 Firestore/Example/Podfile  |  2 +-
 scripts/push-pods.sh       | 20 +++++++++----------
 scripts/update-tags.sh     | 48 +++++++++++++++++++++++-----------------------
 7 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/Example/Podfile b/Example/Podfile
index 61913f4..0a4177d 100644
--- a/Example/Podfile
+++ b/Example/Podfile
@@ -12,7 +12,7 @@ target 'Core_Example_iOS' do
   # The next line is the forcing function for the Firebase pod. The Firebase
   # version's subspecs should depend on the component versions in their
   # corresponding podspec's.
-  pod 'Firebase/Core', '5.0.0'
+  pod 'Firebase/Core', '5.0.1'
 
   target 'Core_Tests_iOS' do
     inherit! :search_paths
diff --git a/Firebase/Core/FIROptions.m b/Firebase/Core/FIROptions.m
index 8dcd749..81532c5 100644
--- a/Firebase/Core/FIROptions.m
+++ b/Firebase/Core/FIROptions.m
@@ -41,9 +41,9 @@ NSString *const kFIRIsSignInEnabled = @"IS_SIGNIN_ENABLED";
 
 // Library version ID.
 NSString *const kFIRLibraryVersionID =
-    @"4"     // Major version (one or more digits)
+    @"5"     // Major version (one or more digits)
     @"00"    // Minor version (exactly 2 digits)
-    @"20"    // Build number (exactly 2 digits)
+    @"01"    // Build number (exactly 2 digits)
     @"000";  // Fixed "000"
 // Plist file name.
 NSString *const kServiceInfoFileName = @"GoogleService-Info";
diff --git a/FirebaseCore.podspec b/FirebaseCore.podspec
index 5c7bd3a..03047be 100644
--- a/FirebaseCore.podspec
+++ b/FirebaseCore.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseCore'
-  s.version          = '5.0.0'
+  s.version          = '5.0.1'
   s.summary          = 'Firebase Core for iOS (plus community support for macOS and tvOS)'
 
   s.description      = <<-DESC
diff --git a/FirebaseFirestore.podspec b/FirebaseFirestore.podspec
index 2af2606..a9c7115 100644
--- a/FirebaseFirestore.podspec
+++ b/FirebaseFirestore.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseFirestore'
-  s.version          = '0.12.0'
+  s.version          = '0.12.1'
   s.summary          = 'Google Cloud Firestore for iOS'
 
   s.description      = <<-DESC
diff --git a/Firestore/Example/Podfile b/Firestore/Example/Podfile
index 1de1906..a7fa097 100644
--- a/Firestore/Example/Podfile
+++ b/Firestore/Example/Podfile
@@ -6,7 +6,7 @@
 # version's subspecs should depend on the component versions in their
 # corresponding podspec's.
 
-pod 'Firebase/Core', '5.0.0'
+pod 'Firebase/Core', '5.0.1'
 
 use_frameworks!
 
diff --git a/scripts/push-pods.sh b/scripts/push-pods.sh
index 2fb8eaa..9f4c303 100755
--- a/scripts/push-pods.sh
+++ b/scripts/push-pods.sh
@@ -22,20 +22,20 @@
 # investigation.
 
 pod cache clean FirebaseCore --all
-pod cache clean FirebaseAuth --all
-pod cache clean FirebaseDatabase --all
+#pod cache clean FirebaseAuth --all
+#pod cache clean FirebaseDatabase --all
 pod cache clean FirebaseFirestore --all
-pod cache clean FirebaseFunctions --all
-pod cache clean FirebaseMessaging --all
-pod cache clean FirebaseStorage --all
+#pod cache clean FirebaseFunctions --all
+#pod cache clean FirebaseMessaging --all
+#pod cache clean FirebaseStorage --all
 
 pod repo push cpdc-internal-spec FirebaseCore.podspec
-pod repo push cpdc-internal-spec FirebaseAuth.podspec
-pod repo push cpdc-internal-spec FirebaseDatabase.podspec
+#pod repo push cpdc-internal-spec FirebaseAuth.podspec
+#pod repo push cpdc-internal-spec FirebaseDatabase.podspec
 pod repo push cpdc-internal-spec FirebaseFirestore.podspec --allow-warnings
-pod repo push cpdc-internal-spec FirebaseFunctions.podspec
-pod repo push cpdc-internal-spec FirebaseMessaging.podspec
-pod repo push cpdc-internal-spec FirebaseStorage.podspec
+#pod repo push cpdc-internal-spec FirebaseFunctions.podspec
+#pod repo push cpdc-internal-spec FirebaseMessaging.podspec
+#pod repo push cpdc-internal-spec FirebaseStorage.podspec
 
 # FirebaseFirestore warning (no plan to fix)
 #    https://github.com/firebase/firebase-ios-sdk/issues/1143
diff --git a/scripts/update-tags.sh b/scripts/update-tags.sh
index 64cf1ce..0c018c3 100755
--- a/scripts/update-tags.sh
+++ b/scripts/update-tags.sh
@@ -27,35 +27,35 @@
 
 # Delete any existing tags at origin
 
-git push --delete origin '5.0.0'
-git push --delete origin 'Core-5.0.0'
-git push --delete origin 'Auth-5.0.0'
-git push --delete origin 'Database-5.0.0'
-git push --delete origin 'Firestore-0.12.0'
-git push --delete origin 'Functions-2.0.0'
-git push --delete origin 'Messaging-3.0.0'
-git push --delete origin 'Storage-3.0.0'
+git push --delete origin '5.0.1'
+git push --delete origin 'Core-5.0.1'
+#git push --delete origin 'Auth-5.0.0'
+#git push --delete origin 'Database-5.0.0'
+git push --delete origin 'Firestore-0.12.1'
+#git push --delete origin 'Functions-2.0.0'
+#git push --delete origin 'Messaging-3.0.0'
+#git push --delete origin 'Storage-3.0.0'
 
 # Delete local tags
 
-git tag --delete '5.0.0'
-git tag --delete 'Core-5.0.0'
-git tag --delete 'Auth-5.0.0'
-git tag --delete 'Database-5.0.0'
-git tag --delete 'Firestore-0.12.0'
-git tag --delete 'Functions-2.0.0'
-git tag --delete 'Messaging-3.0.0'
-git tag --delete 'Storage-3.0.0'
+git tag --delete '5.0.1'
+git tag --delete 'Core-5.0.1'
+#git tag --delete 'Auth-5.0.0'
+#git tag --delete 'Database-5.0.0'
+git tag --delete 'Firestore-0.12.1'
+#git tag --delete 'Functions-2.0.0'
+#git tag --delete 'Messaging-3.0.0'
+#git tag --delete 'Storage-3.0.0'
 
 # Add and push the tags
 
-git tag '5.0.0'
-git tag 'Core-5.0.0'
-git tag 'Auth-5.0.0'
-git tag 'Database-5.0.0'
-git tag 'Firestore-0.12.0'
-git tag 'Functions-2.0.0'
-git tag 'Messaging-3.0.0'
-git tag 'Storage-3.0.0'
+git tag '5.0.1'
+git tag 'Core-5.0.1'
+#git tag 'Auth-5.0.0'
+#git tag 'Database-5.0.0'
+git tag 'Firestore-0.12.1'
+#git tag 'Functions-2.0.0'
+#git tag 'Messaging-3.0.0'
+#git tag 'Storage-3.0.0'
 
 git push origin --tags
-- 
cgit v1.2.3


From 4484deff39e69039c7b2684a4d8730b25bf741eb Mon Sep 17 00:00:00 2001
From: Ryan Wilson <wilsonryan@google.com>
Date: Fri, 11 May 2018 11:28:30 -0700
Subject: Add MLKit to FIRLogger constants. (#1263)

---
 Example/Core/Tests/FIRLoggerTest.m | 1 +
 Firebase/Core/FIRLogger.m          | 1 +
 Firebase/Core/Private/FIRLogger.h  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/Example/Core/Tests/FIRLoggerTest.m b/Example/Core/Tests/FIRLoggerTest.m
index 7da62db..0d6d4e2 100644
--- a/Example/Core/Tests/FIRLoggerTest.m
+++ b/Example/Core/Tests/FIRLoggerTest.m
@@ -86,6 +86,7 @@ static NSString *const kMessageCode = @"I-COR000001";
   XCTAssertEqualObjects(kFIRLoggerDynamicLinks, @"[Firebase/DynamicLinks]");
   XCTAssertEqualObjects(kFIRLoggerInstanceID, @"[Firebase/InstanceID]");
   XCTAssertEqualObjects(kFIRLoggerInvites, @"[Firebase/Invites]");
+  XCTAssertEqualObjects(kFIRLoggerMLKit, @"[Firebase/MLKit]");
   XCTAssertEqualObjects(kFIRLoggerMessaging, @"[Firebase/Messaging]");
   XCTAssertEqualObjects(kFIRLoggerRemoteConfig, @"[Firebase/RemoteConfig]");
   XCTAssertEqualObjects(kFIRLoggerStorage, @"[Firebase/Storage]");
diff --git a/Firebase/Core/FIRLogger.m b/Firebase/Core/FIRLogger.m
index eca9a49..7abac19 100644
--- a/Firebase/Core/FIRLogger.m
+++ b/Firebase/Core/FIRLogger.m
@@ -36,6 +36,7 @@ FIRLoggerService kFIRLoggerDynamicLinks = @"[Firebase/DynamicLinks]";
 FIRLoggerService kFIRLoggerFirestore = @"[Firebase/Firestore]";
 FIRLoggerService kFIRLoggerInstanceID = @"[Firebase/InstanceID]";
 FIRLoggerService kFIRLoggerInvites = @"[Firebase/Invites]";
+FIRLoggerService kFIRLoggerMLKit = @"[Firebase/MLKit]";
 FIRLoggerService kFIRLoggerMessaging = @"[Firebase/Messaging]";
 FIRLoggerService kFIRLoggerPerf = @"[Firebase/Performance]";
 FIRLoggerService kFIRLoggerRemoteConfig = @"[Firebase/RemoteConfig]";
diff --git a/Firebase/Core/Private/FIRLogger.h b/Firebase/Core/Private/FIRLogger.h
index cbb62e2..a538199 100644
--- a/Firebase/Core/Private/FIRLogger.h
+++ b/Firebase/Core/Private/FIRLogger.h
@@ -36,6 +36,7 @@ extern FIRLoggerService kFIRLoggerDynamicLinks;
 extern FIRLoggerService kFIRLoggerFirestore;
 extern FIRLoggerService kFIRLoggerInstanceID;
 extern FIRLoggerService kFIRLoggerInvites;
+extern FIRLoggerService kFIRLoggerMLKit;
 extern FIRLoggerService kFIRLoggerMessaging;
 extern FIRLoggerService kFIRLoggerPerf;
 extern FIRLoggerService kFIRLoggerRemoteConfig;
-- 
cgit v1.2.3