瀏覽代碼

Migrate FIRLoggerServices strings from Core to clients (#6608)

Paul Beusterien 5 年之前
父節點
當前提交
aea0e862f1

+ 6 - 0
FirebaseABTesting/Sources/ABTConstants.h

@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#import "FirebaseCore/Sources/Private/FIRLogger.h"
+
 #define ABT_MSEC_PER_SEC 1000ull
 
 #pragma mark - Keys for experiment dictionaries.
@@ -41,3 +43,7 @@ static NSString *const kABTErrorDomain = @"com.google.abtesting";
 typedef NS_ENUM(NSUInteger, ABTInternalErrorCode) {
   kABTInternalErrorFailedToFetchConditionalUserProperties = 1
 };
+
+#pragma mark - Logger Service String
+
+extern FIRLoggerService kFIRLoggerABTesting;

+ 3 - 0
FirebaseABTesting/Sources/FIRExperimentController.m

@@ -34,6 +34,9 @@ add -DFIRABTesting_VERSION=... to the build invocation"
 #define STR(x) STR_EXPAND(x)
 #define STR_EXPAND(x) #x
 
+/// Logger Service String.
+FIRLoggerService kFIRLoggerABTesting = @"[Firebase/ABTesting]";
+
 /// Default experiment overflow policy.
 const ABTExperimentPayloadExperimentOverflowPolicy FIRDefaultExperimentOverflowPolicy =
     ABTExperimentPayloadExperimentOverflowPolicyDiscardOldest;

+ 3 - 0
FirebaseAuth/Sources/Auth/FIRAuth.m

@@ -81,6 +81,9 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+#pragma mark-- Logger Service String.
+FIRLoggerService kFIRLoggerAuth = @"[Firebase/Auth]";
+
 #pragma mark - Constants
 
 #if defined(__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0

+ 5 - 0
FirebaseAuth/Sources/Auth/FIRAuth_Internal.h

@@ -16,6 +16,7 @@
 
 #import <Foundation/Foundation.h>
 #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRAuth.h"
+#import "FirebaseCore/Sources/Private/FIRLogger.h"
 #import "Interop/Auth/Public/FIRAuthInterop.h"
 
 @class FIRAuthRequestConfiguration;
@@ -149,4 +150,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+/// Logger Service String
+
+extern FIRLoggerService kFIRLoggerAuth;
+
 NS_ASSUME_NONNULL_END

+ 1 - 0
FirebaseAuth/Sources/Storage/FIRAuthKeychainServices.m

@@ -20,6 +20,7 @@
 
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
+#import "FirebaseAuth/Sources/Auth/FIRAuth_Internal.h"
 #import "FirebaseAuth/Sources/Storage/FIRAuthUserDefaults.h"
 #import "FirebaseAuth/Sources/Utilities/FIRAuthErrorUtils.h"
 

+ 1 - 0
FirebaseAuth/Sources/SystemService/FIRAuthAPNSTokenManager.m

@@ -21,6 +21,7 @@
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 #import "FirebaseAuth/Sources/Auth/FIRAuthGlobalWorkQueue.h"
+#import "FirebaseAuth/Sources/Auth/FIRAuth_Internal.h"
 #import "FirebaseAuth/Sources/SystemService/FIRAuthAPNSToken.h"
 #import "FirebaseAuth/Sources/SystemService/FIRAuthAPNSTokenManager.h"
 

+ 1 - 0
FirebaseAuth/Sources/SystemService/FIRAuthNotificationManager.m

@@ -20,6 +20,7 @@
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 #import "FirebaseAuth/Sources/Auth/FIRAuthGlobalWorkQueue.h"
+#import "FirebaseAuth/Sources/Auth/FIRAuth_Internal.h"
 #import "FirebaseAuth/Sources/SystemService/FIRAuthAppCredential.h"
 #import "FirebaseAuth/Sources/SystemService/FIRAuthAppCredentialManager.h"
 #import "FirebaseAuth/Sources/SystemService/FIRAuthNotificationManager.h"

+ 0 - 3
FirebaseCore/Sources/FIRLogger.m

@@ -23,10 +23,7 @@
 FIRLoggerService kFIRLoggerCore = @"[Firebase/Core]";
 
 // All the FIRLoggerService definitions should be migrated to clients. Do not add new ones!
-FIRLoggerService kFIRLoggerABTesting = @"[Firebase/ABTesting]";
-FIRLoggerService kFIRLoggerAdMob = @"[Firebase/AdMob]";
 FIRLoggerService kFIRLoggerAnalytics = @"[Firebase/Analytics]";
-FIRLoggerService kFIRLoggerAuth = @"[Firebase/Auth]";
 FIRLoggerService kFIRLoggerCrash = @"[Firebase/Crash]";
 FIRLoggerService kFIRLoggerMLKit = @"[Firebase/MLKit]";
 FIRLoggerService kFIRLoggerPerf = @"[Firebase/Performance]";

+ 0 - 3
FirebaseCore/Sources/Private/FIRLogger.h

@@ -25,10 +25,7 @@ NS_ASSUME_NONNULL_BEGIN
  */
 typedef NSString *const FIRLoggerService;
 
-extern FIRLoggerService kFIRLoggerABTesting;
-extern FIRLoggerService kFIRLoggerAdMob;
 extern FIRLoggerService kFIRLoggerAnalytics;
-extern FIRLoggerService kFIRLoggerAuth;
 extern FIRLoggerService kFIRLoggerCrash;
 extern FIRLoggerService kFIRLoggerCore;
 extern FIRLoggerService kFIRLoggerMLKit;

+ 0 - 3
FirebaseCore/Tests/Unit/FIRLoggerTest.m

@@ -73,12 +73,9 @@ static NSString *const kMessageCode = @"I-COR000001";
 // Test some stable variables to make sure they weren't accidently changed.
 - (void)testStableVariables {
   // Strings of type FIRLoggerServices.
-  XCTAssertEqualObjects(kFIRLoggerABTesting, @"[Firebase/ABTesting]");
-  XCTAssertEqualObjects(kFIRLoggerAdMob, @"[Firebase/AdMob]");
   XCTAssertEqualObjects(kFIRLoggerAnalytics, @"[Firebase/Analytics]");
   XCTAssertEqualObjects(kFIRLoggerCore, @"[Firebase/Core]");
   XCTAssertEqualObjects(kFIRLoggerMLKit, @"[Firebase/MLKit]");
-  XCTAssertEqualObjects(kFIRLoggerRemoteConfig, @"[Firebase/RemoteConfig]");
 }
 
 - (void)testInitializeASLForNonDebugMode {