diff --git a/FirebaseDatabase.podspec b/FirebaseDatabase.podspec index f81e55c2ec6..62acdabf596 100644 --- a/FirebaseDatabase.podspec +++ b/FirebaseDatabase.podspec @@ -51,6 +51,7 @@ Simplify your iOS development, grow your user base, and monetize more effectivel s.dependency 'FirebaseCore', '~> 10.0' s.dependency 'FirebaseAppCheckInterop', '~> 10.17' s.dependency 'FirebaseSharedSwift', '~> 10.0' + s.dependency 'GoogleUtilities/UserDefaults', '~> 7.13' s.pod_target_xcconfig = { 'GCC_C_LANGUAGE_STANDARD' => 'c99', 'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"' diff --git a/FirebaseDatabase/Sources/Core/FRepoInfo.m b/FirebaseDatabase/Sources/Core/FRepoInfo.m index 82ca825aecc..f68bf38cd15 100644 --- a/FirebaseDatabase/Sources/Core/FRepoInfo.m +++ b/FirebaseDatabase/Sources/Core/FRepoInfo.m @@ -14,8 +14,10 @@ * limitations under the License. */ -#import "FirebaseDatabase/Sources/Core/FRepoInfo.h" +#import + #import "FirebaseDatabase/Sources/Constants/FConstants.h" +#import "FirebaseDatabase/Sources/Core/FRepoInfo.h" @interface FRepoInfo () @@ -52,7 +54,7 @@ - (instancetype)initWithHost:(NSString *)aHost // Get cached internal host if it exists NSString *internalHostKey = [NSString stringWithFormat:@"firebase:host:%@", _host]; - NSString *cachedInternalHost = [[NSUserDefaults standardUserDefaults] + NSString *cachedInternalHost = [[GULUserDefaults standardUserDefaults] stringForKey:internalHostKey]; if (cachedInternalHost != nil) { internalHost = cachedInternalHost; @@ -81,7 +83,7 @@ - (void)setInternalHost:(NSString *)newHost { // Cache the internal host so we don't need to redirect later on NSString *internalHostKey = [NSString stringWithFormat:@"firebase:host:%@", self.host]; - NSUserDefaults *cache = [NSUserDefaults standardUserDefaults]; + GULUserDefaults *cache = [GULUserDefaults standardUserDefaults]; [cache setObject:internalHost forKey:internalHostKey]; [cache synchronize]; } @@ -93,7 +95,7 @@ - (void)clearInternalHostCache { // Remove the cached entry NSString *internalHostKey = [NSString stringWithFormat:@"firebase:host:%@", self.host]; - NSUserDefaults *cache = [NSUserDefaults standardUserDefaults]; + GULUserDefaults *cache = [GULUserDefaults standardUserDefaults]; [cache removeObjectForKey:internalHostKey]; [cache synchronize]; } diff --git a/Package.swift b/Package.swift index 14eeb9fe54d..070b4ab0d36 100644 --- a/Package.swift +++ b/Package.swift @@ -590,6 +590,7 @@ let package = Package( "FirebaseAppCheckInterop", "FirebaseCore", "leveldb", + .product(name: "GULUserDefaults", package: "GoogleUtilities"), ], path: "FirebaseDatabase/Sources", exclude: [