diff options
author | Paul Beusterien <paulbeusterien@google.com> | 2018-05-14 07:14:51 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-14 07:14:51 -0700 |
commit | fd80ca1afe3674148ba78d68c685339eac8dd051 (patch) | |
tree | b8a0a7bf63b439afc50da07a2bc1ca7dd9f7faf2 | |
parent | 8bdafd9f143c5334dc81fe4fce80735138a62811 (diff) | |
parent | 2349d3e41b57b96fee1055e4d35a34606aa6b726 (diff) |
Merge pull request #1271 from firebase/pb-cp-all_load-fix
Eliminate duplicate symbol in CocoaPods -all_load build (#1223)
-rw-r--r-- | Firebase/Core/FIRLogger.m | 4 | ||||
-rw-r--r-- | Firebase/Core/FIRVersion.m | 7 | ||||
-rw-r--r-- | Firebase/Core/Private/FIRVersion.h | 4 | ||||
-rw-r--r-- | Firestore/Source/API/FIRFirestoreVersion.h | 2 | ||||
-rw-r--r-- | Firestore/Source/API/FIRFirestoreVersion.mm | 2 | ||||
-rw-r--r-- | 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. */ |