Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions FirebaseABTesting/Sources/ABTConstants.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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 changes: 3 additions & 0 deletions FirebaseABTesting/Sources/FIRExperimentController.m
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@
#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;
Expand Down
3 changes: 3 additions & 0 deletions FirebaseAuth/Sources/Auth/FIRAuth.m
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions FirebaseAuth/Sources/Auth/FIRAuth_Internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -149,4 +150,8 @@ NS_ASSUME_NONNULL_BEGIN

@end

/// Logger Service String

extern FIRLoggerService kFIRLoggerAuth;

NS_ASSUME_NONNULL_END
1 change: 1 addition & 0 deletions FirebaseAuth/Sources/Storage/FIRAuthKeychainServices.m
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 0 additions & 3 deletions FirebaseCore/Sources/FIRLogger.m
Original file line number Diff line number Diff line change
Expand Up @@ -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]";
Expand Down
3 changes: 0 additions & 3 deletions FirebaseCore/Sources/Private/FIRLogger.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 0 additions & 3 deletions FirebaseCore/Tests/Unit/FIRLoggerTest.m
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,9 @@ - (void)tearDown {
// 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 {
Expand Down