diff options
| author |  Paul Beusterien <paulbeusterien@google.com> | 2018-05-03 16:35:33 -0700 |
|---|---|---|
| committer | Paul Beusterien <paulbeusterien@google.com> | 2018-05-14 06:44:27 -0700 |
| commit | 2349d3e41b57b96fee1055e4d35a34606aa6b726 (patch) | |
| tree | f09c487ed02d172889e00a71fd716dc368af0dd2 /Firebase/Core | |
| parent | 56a529531b5ecd81a68c098ec8fbc5b8a6ec3fcf (diff) | |
Eliminate duplicate symbol in CocoaPods -all_load build (#1223)
Diffstat (limited to 'Firebase/Core')
| -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 |
3 files changed, 6 insertions, 9 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; |