Skip to content

Commit 67834c3

Browse files
paulb777paulb777
authored
Fix module build issues (#13797)
1 parent 3c754ed commit 67834c3

File tree

6 files changed

+138
-34
lines changed

6 files changed

+138
-34
lines changed

‎FirebaseAppDistribution/Sources/FIRFADLogger.m‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
#import "FirebaseAppDistribution/Sources/FIRFADLogger.h"
1616
#import "FirebaseCore/Extension/FIRLogger.h"
17-
#import "FirebaseCore/Sources/Public/FirebaseCore/FIRLoggerLevel.h"
1817

1918
FIRLoggerService kFIRLoggerAppDistribution = @"[FirebaseAppDistribution]";
2019

@@ -23,31 +22,27 @@
2322
void FIRFADDebugLog(NSString *message, ...) {
2423
va_list args_ptr;
2524
va_start(args_ptr, message);
26-
FIRLogBasic(FIRLoggerLevelDebug, kFIRLoggerAppDistribution, AppDistributionMessageCode, message,
27-
args_ptr);
25+
FIRLogBasicDebug(kFIRLoggerAppDistribution, AppDistributionMessageCode, message, args_ptr);
2826
va_end(args_ptr);
2927
}
3028

3129
void FIRFADInfoLog(NSString *message, ...) {
3230
va_list args_ptr;
3331
va_start(args_ptr, message);
34-
FIRLogBasic(FIRLoggerLevelInfo, kFIRLoggerAppDistribution, AppDistributionMessageCode, message,
35-
args_ptr);
32+
FIRLogBasicInfo(kFIRLoggerAppDistribution, AppDistributionMessageCode, message, args_ptr);
3633
va_end(args_ptr);
3734
}
3835

3936
void FIRFADWarningLog(NSString *message, ...) {
4037
va_list args_ptr;
4138
va_start(args_ptr, message);
42-
FIRLogBasic(FIRLoggerLevelWarning, kFIRLoggerAppDistribution, AppDistributionMessageCode, message,
43-
args_ptr);
39+
FIRLogBasicWarning(kFIRLoggerAppDistribution, AppDistributionMessageCode, message, args_ptr);
4440
va_end(args_ptr);
4541
}
4642

4743
void FIRFADErrorLog(NSString *message, ...) {
4844
va_list args_ptr;
4945
va_start(args_ptr, message);
50-
FIRLogBasic(FIRLoggerLevelError, kFIRLoggerAppDistribution, AppDistributionMessageCode, message,
51-
args_ptr);
46+
FIRLogBasicError(kFIRLoggerAppDistribution, AppDistributionMessageCode, message, args_ptr);
5247
va_end(args_ptr);
5348
}

‎FirebaseCore/Extension/FIRLogger.h‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,23 @@ FIRLoggerLevel FIRGetLoggerLevel(void);
6464
*/
6565
void FIRSetLoggerLevel(FIRLoggerLevel loggerLevel);
6666

67+
void FIRSetLoggerLevelNotice(void);
68+
void FIRSetLoggerLevelWarning(void);
69+
void FIRSetLoggerLevelError(void);
70+
void FIRSetLoggerLevelDebug(void);
71+
6772
/**
6873
* Checks if the specified logger level is loggable given the current settings.
6974
* (required) log level (one of the FirebaseLoggerLevel enum values).
7075
* (required) whether or not this function is called from the Analytics component.
7176
*/
7277
BOOL FIRIsLoggableLevel(FIRLoggerLevel loggerLevel, BOOL analyticsComponent);
7378

79+
BOOL FIRIsLoggableLevelNotice(void);
80+
BOOL FIRIsLoggableLevelWarning(void);
81+
BOOL FIRIsLoggableLevelError(void);
82+
BOOL FIRIsLoggableLevelDebug(void);
83+
7484
/**
7585
* Logs a message to the Xcode console and the device log. If running from AppStore, will
7686
* not log any messages with a level higher than FirebaseLoggerLevelNotice to avoid log spamming.
@@ -121,6 +131,41 @@ extern void FIRLogInfo(NSString *category, NSString *messageCode, NSString *mess
121131
extern void FIRLogDebug(NSString *category, NSString *messageCode, NSString *message, ...)
122132
NS_FORMAT_FUNCTION(3, 4);
123133

134+
/**
135+
* This function is similar to the one above, except it takes a `va_list` instead of the listed
136+
* variables.
137+
*
138+
* The following functions accept the following parameters in order: (required) service
139+
* name of type FirebaseLoggerService.
140+
*
141+
* (required) message code starting from "I-" which means iOS,
142+
* followed by a capitalized three-character service identifier and a six digit integer message
143+
* ID that is unique within the service. An example of the message code is @"I-COR000001".
144+
* See go/firebase-log-proposal for details.
145+
* (required) message string which can be a format string.
146+
* (optional) A va_list
147+
*/
148+
extern void FIRLogBasicError(NSString *category,
149+
NSString *messageCode,
150+
NSString *message,
151+
va_list args_ptr);
152+
extern void FIRLogBasicWarning(NSString *category,
153+
NSString *messageCode,
154+
NSString *message,
155+
va_list args_ptr);
156+
extern void FIRLogBasicNotice(NSString *category,
157+
NSString *messageCode,
158+
NSString *message,
159+
va_list args_ptr);
160+
extern void FIRLogBasicInfo(NSString *category,
161+
NSString *messageCode,
162+
NSString *message,
163+
va_list args_ptr);
164+
extern void FIRLogBasicDebug(NSString *category,
165+
NSString *messageCode,
166+
NSString *message,
167+
va_list args_ptr);
168+
124169
#ifdef __cplusplus
125170
} // extern "C"
126171
#endif // __cplusplus

‎FirebaseCore/Sources/FIRLogger.m‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,26 @@ void FIRSetLoggerLevel(FIRLoggerLevel loggerLevel) {
9595
GULSetLoggerLevel((GULLoggerLevel)loggerLevel);
9696
}
9797

98+
void FIRSetLoggerLevelNotice(void) {
99+
FIRLoggerInitialize();
100+
GULSetLoggerLevel(GULLoggerLevelNotice);
101+
}
102+
103+
void FIRSetLoggerLevelWarning(void) {
104+
FIRLoggerInitialize();
105+
GULSetLoggerLevel(GULLoggerLevelWarning);
106+
}
107+
108+
void FIRSetLoggerLevelError(void) {
109+
FIRLoggerInitialize();
110+
GULSetLoggerLevel(GULLoggerLevelError);
111+
}
112+
113+
void FIRSetLoggerLevelDebug(void) {
114+
FIRLoggerInitialize();
115+
GULSetLoggerLevel(GULLoggerLevelDebug);
116+
}
117+
98118
#ifdef DEBUG
99119
void FIRResetLogger(void) {
100120
extern void GULResetLogger(void);
@@ -124,6 +144,22 @@ void FIRSetLoggerUserDefaults(NSUserDefaults *defaults) {
124144
return GULIsLoggableLevel((GULLoggerLevel)loggerLevel);
125145
}
126146

147+
BOOL FIRIsLoggableLevelNotice(void) {
148+
return FIRIsLoggableLevel(FIRLoggerLevelNotice, NO);
149+
}
150+
151+
BOOL FIRIsLoggableLevelWarning(void) {
152+
return FIRIsLoggableLevel(FIRLoggerLevelWarning, NO);
153+
}
154+
155+
BOOL FIRIsLoggableLevelError(void) {
156+
return FIRIsLoggableLevel(FIRLoggerLevelError, NO);
157+
}
158+
159+
BOOL FIRIsLoggableLevelDebug(void) {
160+
return FIRIsLoggableLevel(FIRLoggerLevelDebug, NO);
161+
}
162+
127163
void FIRLogBasic(FIRLoggerLevel level,
128164
NSString *category,
129165
NSString *messageCode,
@@ -135,6 +171,18 @@ void FIRLogBasic(FIRLoggerLevel level,
135171
messageCode, message, args_ptr);
136172
}
137173

174+
#define FIR_LOGGING_FUNCTION_BASIC(level) \
175+
void FIRLogBasic##level(NSString *category, NSString *messageCode, NSString *message, \
176+
va_list args_ptr) { \
177+
FIRLogBasic(FIRLoggerLevel##level, category, messageCode, message, args_ptr); \
178+
}
179+
180+
FIR_LOGGING_FUNCTION_BASIC(Error)
181+
FIR_LOGGING_FUNCTION_BASIC(Warning)
182+
FIR_LOGGING_FUNCTION_BASIC(Notice)
183+
FIR_LOGGING_FUNCTION_BASIC(Info)
184+
FIR_LOGGING_FUNCTION_BASIC(Debug)
185+
138186
/**
139187
* Generates the logging functions using macros.
140188
*

‎Firestore/Source/API/FSTFirestoreComponent.mm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#import "FirebaseCore/Extension/FIRComponentContainer.h"
2929
#import "FirebaseCore/Extension/FIRComponentType.h"
3030
#import "FirebaseCore/Extension/FIRLibrary.h"
31-
#import "FirebaseCore/Sources/Public/FirebaseCore/FIROptions.h"
31+
#import "FirebaseCore/Sources/FIROptionsInternal.h"
3232
#import "Firestore/Source/API/FIRFirestore+Internal.h"
3333

3434
#include "Firestore/core/include/firebase/firestore/firestore_version.h"

‎Firestore/core/src/remote/firebase_metadata_provider_apple.mm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
#import "FirebaseCore/Extension/FIRAppInternal.h"
2020
#import "FirebaseCore/Extension/FIRHeartbeatLogger.h"
21-
#import "FirebaseCore/Sources/Public/FirebaseCore/FIROptions.h"
21+
#import "FirebaseCore/Sources/FIROptionsInternal.h"
2222

2323
#include "Firestore/core/src/util/string_apple.h"
2424

‎Firestore/core/src/util/log_apple.mm‎

Lines changed: 39 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include <string>
2525

2626
#import "FirebaseCore/Extension/FIRLogger.h"
27-
#import "FirebaseCore/Sources/Public/FirebaseCore/FIRLoggerLevel.h"
2827

2928
#include "Firestore/core/src/util/string_apple.h"
3029

@@ -36,39 +35,46 @@
3635

3736
const FIRLoggerService kFIRLoggerFirestore = @"[FirebaseFirestore]";
3837

39-
// Translates a C++ LogLevel to the equivalent Objective-C FIRLoggerLevel
40-
FIRLoggerLevel ToFIRLoggerLevel(LogLevel level) {
41-
switch (level) {
42-
case kLogLevelDebug:
43-
return FIRLoggerLevelDebug;
44-
case kLogLevelNotice:
45-
return FIRLoggerLevelNotice;
46-
case kLogLevelWarning:
47-
return FIRLoggerLevelWarning;
48-
case kLogLevelError:
49-
return FIRLoggerLevelError;
50-
default:
51-
// Unsupported log level. FIRSetLoggerLevel will deal with it.
52-
return static_cast<FIRLoggerLevel>(-1);
53-
}
54-
}
55-
5638
// Actually logs a message via FIRLogger. This must be a C varargs function
5739
// so that we can call FIRLogBasic which takes a `va_list`.
5840
void LogMessageV(LogLevel level, NSString* format, ...) {
5941
va_list list;
6042
va_start(list, format);
6143

62-
FIRLogBasic(ToFIRLoggerLevel(level), kFIRLoggerFirestore, @"I-FST000001",
63-
format, list);
64-
44+
switch (level) {
45+
case kLogLevelDebug:
46+
FIRLogBasicDebug(kFIRLoggerFirestore, @"I-FST000001", format, list);
47+
break;
48+
case kLogLevelNotice:
49+
FIRLogBasicNotice(kFIRLoggerFirestore, @"I-FST000001", format, list);
50+
break;
51+
case kLogLevelWarning:
52+
FIRLogBasicWarning(kFIRLoggerFirestore, @"I-FST000001", format, list);
53+
break;
54+
case kLogLevelError:
55+
FIRLogBasicError(kFIRLoggerFirestore, @"I-FST000001", format, list);
56+
break;
57+
}
6558
va_end(list);
6659
}
6760

6861
} // namespace
6962

7063
void LogSetLevel(LogLevel level) {
71-
FIRSetLoggerLevel(ToFIRLoggerLevel(level));
64+
switch (level) {
65+
case kLogLevelDebug:
66+
FIRSetLoggerLevelDebug();
67+
break;
68+
case kLogLevelNotice:
69+
FIRSetLoggerLevelNotice();
70+
break;
71+
case kLogLevelWarning:
72+
FIRSetLoggerLevelWarning();
73+
break;
74+
case kLogLevelError:
75+
FIRSetLoggerLevelError();
76+
break;
77+
}
7278
}
7379

7480
// Note that FIRLogger's default level can be changed by persisting a
@@ -82,7 +88,17 @@ void LogSetLevel(LogLevel level) {
8288
// defaults write firestore_util_test /google/firebase/debug_mode NO
8389

8490
bool LogIsLoggable(LogLevel level) {
85-
return FIRIsLoggableLevel(ToFIRLoggerLevel(level), false);
91+
switch (level) {
92+
case kLogLevelDebug:
93+
return FIRIsLoggableLevelDebug();
94+
case kLogLevelNotice:
95+
return FIRIsLoggableLevelNotice();
96+
case kLogLevelWarning:
97+
return FIRIsLoggableLevelWarning();
98+
case kLogLevelError:
99+
return FIRIsLoggableLevelError();
100+
}
101+
return false;
86102
}
87103

88104
void LogMessage(LogLevel level, const std::string& message) {

0 commit comments

Comments
 (0)