Skip to content

Commit 9c41c87

Browse files
authored
Fix GoogleUtilities regression for Firestore builds (firebase#2431)
1 parent 82fd4b9 commit 9c41c87

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

GoogleUtilities/Logger/GULLogger.m

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,11 @@ @implementation GULLogger
113113
// first get.
114114
@synchronized(self) {
115115
if (!sGULLogger) {
116-
if (@available(iOS 9.0, macOS 10.11, *)) {
116+
#if __has_builtin(__builtin_available)
117+
if (@available(iOS 9.0, *)) {
118+
#else
119+
if ([[UIDevice currentDevice].systemVersion integerValue] >= 9) {
120+
#endif
117121
sGULLogger = [[GULOSLogger alloc] init];
118122
} else {
119123
sGULLogger = [[GULASLLogger alloc] init];

GoogleUtilities/Logger/Private/GULOSLogger.m

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,11 @@
2929
// and the va_list should only contain one argument, a full message with format substitutions
3030
// already filled.
3131
static void GULLOSLogWithType(os_log_t log, os_log_type_t type, char *s, ...) {
32-
if (@available(iOS 9.0, macOS 10.11, *)) {
32+
#if __has_builtin(__builtin_available)
33+
if (@available(iOS 9.0, *)) {
34+
#else
35+
if ([[UIDevice currentDevice].systemVersion integerValue] >= 9) {
36+
#endif
3337
va_list args;
3438
va_start(args, s);
3539
#if TARGET_OS_TV
@@ -160,7 +164,11 @@ - (void)logWithLevel:(GULLoggerLevel)level
160164
dispatch_async(self.dispatchQueue, ^{
161165
os_log_t osLog = self.categoryLoggers[service];
162166
if (!osLog) {
163-
if (@available(iOS 9.0, macOS 10.11, *)) {
167+
#if __has_builtin(__builtin_available)
168+
if (@available(iOS 9.0, *)) {
169+
#else
170+
if ([[UIDevice currentDevice].systemVersion integerValue] >= 9) {
171+
#endif
164172
osLog = os_log_create(kGULLoggerClientFacilityName, service.UTF8String);
165173
self.categoryLoggers[service] = osLog;
166174
} else {

0 commit comments

Comments
 (0)