diff options
Diffstat (limited to 'Firebase')
-rw-r--r-- | Firebase/Core/FIRApp.m | 4 | ||||
-rw-r--r-- | Firebase/Core/FIROptions.m | 13 | ||||
-rw-r--r-- | Firebase/Core/Private/FIRAppInternal.h | 6 | ||||
-rw-r--r-- | Firebase/Storage/FIRStorageObservableTask.m | 1 |
4 files changed, 13 insertions, 11 deletions
diff --git a/Firebase/Core/FIRApp.m b/Firebase/Core/FIRApp.m index 5a2ec78..c2ce28e 100644 --- a/Firebase/Core/FIRApp.m +++ b/Firebase/Core/FIRApp.m @@ -428,8 +428,8 @@ static NSMutableDictionary *sLibraryVersions; NSMutableArray<NSString *> *libraries = [[NSMutableArray<NSString *> alloc] initWithCapacity:sLibraryVersions.count]; for (NSString *libraryName in sLibraryVersions) { - [libraries addObject: - [NSString stringWithFormat:@"%@/%@", libraryName, sLibraryVersions[libraryName]]]; + [libraries + addObject:[NSString stringWithFormat:@"%@/%@", libraryName, sLibraryVersions[libraryName]]]; } [libraries sortUsingSelector:@selector(localizedCaseInsensitiveCompare:)]; return [libraries componentsJoinedByString:@" "]; diff --git a/Firebase/Core/FIROptions.m b/Firebase/Core/FIROptions.m index 8a11ae8..6f34f61 100644 --- a/Firebase/Core/FIROptions.m +++ b/Firebase/Core/FIROptions.m @@ -114,11 +114,14 @@ static NSDictionary *sDefaultOptionsDictionary = nil; NSRange major = NSMakeRange(0, 1); NSRange minor = NSMakeRange(1, 2); NSRange patch = NSMakeRange(3, 2); - [FIRApp registerLibrary:@"FirebaseCore" - withVersion:[NSString stringWithFormat:@"%@.%d.%d", - [kFIRLibraryVersionID substringWithRange:major], - [[kFIRLibraryVersionID substringWithRange:minor] intValue], - [[kFIRLibraryVersionID substringWithRange:patch] intValue]]]; + [FIRApp + registerLibrary:@"FirebaseCore" + withVersion:[NSString stringWithFormat:@"%@.%d.%d", + [kFIRLibraryVersionID substringWithRange:major], + [[kFIRLibraryVersionID substringWithRange:minor] + intValue], + [[kFIRLibraryVersionID substringWithRange:patch] + intValue]]]; } + (NSDictionary *)defaultOptionsDictionary { diff --git a/Firebase/Core/Private/FIRAppInternal.h b/Firebase/Core/Private/FIRAppInternal.h index 4b56728..20b608e 100644 --- a/Firebase/Core/Private/FIRAppInternal.h +++ b/Firebase/Core/Private/FIRAppInternal.h @@ -134,7 +134,6 @@ typedef NSString *_Nullable (^FIRAppGetUIDImplementation)(void); */ + (BOOL)isDefaultAppConfigured; - /** * Registers a given third-party library with the given version number to be reported for * analyitcs. @@ -142,8 +141,9 @@ typedef NSString *_Nullable (^FIRAppGetUIDImplementation)(void); * @param library Name of the library * @param version Version of the library */ -+ (void)registerLibrary:(nonnull NSString *)library withVersion:(nonnull NSString *)version - NS_SWIFT_NAME(registerLibrary(_:version:)); ++ (void)registerLibrary:(nonnull NSString *)library + withVersion:(nonnull NSString *)version NS_SWIFT_NAME(registerLibrary(_:version +:)); /** * A concatenated string representing all the third-party libraries and version numbers. diff --git a/Firebase/Storage/FIRStorageObservableTask.m b/Firebase/Storage/FIRStorageObservableTask.m index 7d7c61f..af82fa2 100644 --- a/Firebase/Storage/FIRStorageObservableTask.m +++ b/Firebase/Storage/FIRStorageObservableTask.m @@ -206,7 +206,6 @@ [handlersCopy enumerateKeysAndObjectsUsingBlock:^( NSString *_Nonnull key, FIRStorageVoidSnapshot _Nonnull handler, BOOL *_Nonnull stop) { - dispatch_async(callbackQueue, ^{ handler(snapshot); }); |