Skip to content

Commit

Permalink
Begin migrating FIRLoggerService declarations to clients (#2720)
Browse files Browse the repository at this point in the history
  • Loading branch information
paulb777 committed Apr 8, 2019
1 parent 76a003f commit fd6f93d
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 24 deletions.
6 changes: 0 additions & 6 deletions Example/Core/Tests/FIRLoggerTest.m
Expand Up @@ -76,15 +76,9 @@ - (void)testStableVariables {
XCTAssertEqualObjects(kFIRLoggerABTesting, @"[Firebase/ABTesting]");
XCTAssertEqualObjects(kFIRLoggerAdMob, @"[Firebase/AdMob]");
XCTAssertEqualObjects(kFIRLoggerAnalytics, @"[Firebase/Analytics]");
XCTAssertEqualObjects(kFIRLoggerAuth, @"[Firebase/Auth]");
XCTAssertEqualObjects(kFIRLoggerCore, @"[Firebase/Core]");
XCTAssertEqualObjects(kFIRLoggerDatabase, @"[Firebase/Database]");
XCTAssertEqualObjects(kFIRLoggerDynamicLinks, @"[Firebase/DynamicLinks]");
XCTAssertEqualObjects(kFIRLoggerInstanceID, @"[Firebase/InstanceID]");
XCTAssertEqualObjects(kFIRLoggerMLKit, @"[Firebase/MLKit]");
XCTAssertEqualObjects(kFIRLoggerMessaging, @"[Firebase/Messaging]");
XCTAssertEqualObjects(kFIRLoggerRemoteConfig, @"[Firebase/RemoteConfig]");
XCTAssertEqualObjects(kFIRLoggerStorage, @"[Firebase/Storage]");
}

- (void)testInitializeASLForNonDebugMode {
Expand Down
2 changes: 1 addition & 1 deletion Example/Podfile
Expand Up @@ -19,7 +19,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/CoreOnly', '5.20.990'
pod 'Firebase/CoreOnly', '5.20.991'

target 'Core_Tests_iOS' do
inherit! :search_paths
Expand Down
11 changes: 3 additions & 8 deletions Firebase/Core/FIRLogger.m
Expand Up @@ -20,21 +20,16 @@

#import "Private/FIRVersion.h"

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 kFIRLoggerCore = @"[Firebase/Core]";
FIRLoggerService kFIRLoggerDatabase = @"[Firebase/Database]";
FIRLoggerService kFIRLoggerDynamicLinks = @"[Firebase/DynamicLinks]";
FIRLoggerService kFIRLoggerFirestore = @"[Firebase/Firestore]";
FIRLoggerService kFIRLoggerInstanceID = @"[Firebase/InstanceID]";
FIRLoggerService kFIRLoggerMLKit = @"[Firebase/MLKit]";
FIRLoggerService kFIRLoggerMessaging = @"[Firebase/Messaging]";
FIRLoggerService kFIRLoggerPerf = @"[Firebase/Performance]";
FIRLoggerService kFIRLoggerRemoteConfig = @"[Firebase/RemoteConfig]";
FIRLoggerService kFIRLoggerStorage = @"[Firebase/Storage]";
FIRLoggerService kFIRLoggerSwizzler = @"[FirebaseSwizzlingUtilities]";

/// Arguments passed on launch.
NSString *const kFIRDisableDebugModeApplicationArgument = @"-FIRDebugDisabled";
Expand Down
7 changes: 0 additions & 7 deletions Firebase/Core/Private/FIRLogger.h
Expand Up @@ -30,16 +30,9 @@ extern FIRLoggerService kFIRLoggerAdMob;
extern FIRLoggerService kFIRLoggerAnalytics;
extern FIRLoggerService kFIRLoggerAuth;
extern FIRLoggerService kFIRLoggerCore;
extern FIRLoggerService kFIRLoggerDatabase;
extern FIRLoggerService kFIRLoggerDynamicLinks;
extern FIRLoggerService kFIRLoggerFirestore;
extern FIRLoggerService kFIRLoggerInstanceID;
extern FIRLoggerService kFIRLoggerMLKit;
extern FIRLoggerService kFIRLoggerMessaging;
extern FIRLoggerService kFIRLoggerPerf;
extern FIRLoggerService kFIRLoggerRemoteConfig;
extern FIRLoggerService kFIRLoggerStorage;
extern FIRLoggerService kFIRLoggerSwizzler;

/**
* The key used to store the logger's error count.
Expand Down
3 changes: 3 additions & 0 deletions Firebase/Database/Utilities/FUtilities.h
Expand Up @@ -15,6 +15,8 @@
*/

#import <Foundation/Foundation.h>
#import <FirebaseCore/FIRLogger.h>

#import "FParsedUrl.h"

@interface FUtilities : NSObject
Expand Down Expand Up @@ -70,6 +72,7 @@ FOUNDATION_EXPORT NSString *const kFPersistenceLogTag;
} \
} while(0)

extern FIRLoggerService kFIRLoggerDatabase;
BOOL FFIsLoggingEnabled(FLogLevel logLevel);
void firebaseUncaughtExceptionHandler(NSException *exception);
void firebaseJobsTroll(void);
1 change: 1 addition & 0 deletions Firebase/Database/Utilities/FUtilities.m
Expand Up @@ -27,6 +27,7 @@
#pragma mark -
#pragma mark C functions

FIRLoggerService kFIRLoggerDatabase = @"[Firebase/Database]";
static FLogLevel logLevel = FLogLevelInfo; // Default log level is info
static NSMutableDictionary* options = nil;

Expand Down
2 changes: 2 additions & 0 deletions Firebase/DynamicLinks/Logging/FDLLogging.m
Expand Up @@ -18,6 +18,8 @@

#ifdef GIN_SCION_LOGGING
#import <FirebaseCore/FIRLogger.h>

FIRLoggerService kFIRLoggerDynamicLinks = @"[Firebase/DynamicLinks]";
#endif // GIN_SCION_LOGGING

#ifdef GIN_SCION_LOGGING
Expand Down
2 changes: 2 additions & 0 deletions Firebase/Messaging/FIRMessagingLogger.m
Expand Up @@ -18,6 +18,8 @@

#import <FirebaseCore/FIRLogger.h>

FIRLoggerService kFIRLoggerMessaging = @"[Firebase/Messaging]";

@implementation FIRMessagingLogger

+ (instancetype)standardLogger {
Expand Down
2 changes: 1 addition & 1 deletion FirebaseCore.podspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'FirebaseCore'
s.version = '5.4.90'
s.version = '5.4.91'
s.summary = 'Firebase Core for iOS (plus community support for macOS and tvOS)'

s.description = <<-DESC
Expand Down
2 changes: 1 addition & 1 deletion Firestore/Example/Podfile
Expand Up @@ -14,7 +14,7 @@ target 'Firestore_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/CoreOnly', '5.20.990'
pod 'Firebase/CoreOnly', '5.20.991'

pod 'FirebaseAuth', :path => '../../'
pod 'FirebaseAuthInterop', :path => '../../'
Expand Down
2 changes: 2 additions & 0 deletions Firestore/core/src/firebase/firestore/util/log_apple.mm
Expand Up @@ -32,6 +32,8 @@

namespace {

const FIRLoggerService kFIRLoggerFirestore = @"[Firebase/Firestore]";

// Translates a C++ LogLevel to the equivalent Objective-C FIRLoggerLevel
FIRLoggerLevel ToFIRLoggerLevel(LogLevel level) {
switch (level) {
Expand Down

0 comments on commit fd6f93d

Please sign in to comment.