From 6aba8188937fd246d11cc8acc88fc95666154dd2 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Wed, 5 Jun 2024 15:01:28 -0700 Subject: [PATCH 1/2] [v11] Replace GULUserDefaults usage with NSUserDefaults --- FirebaseAppCheck.podspec | 1 - FirebaseAppCheck/Sources/Core/FIRAppCheck.m | 3 +- .../Sources/Core/FIRAppCheckSettings.h | 4 +- .../Sources/Core/FIRAppCheckSettings.m | 7 +- .../Unit/Core/FIRAppCheckSettingsTests.m | 3 +- FirebaseAppDistribution.podspec | 1 - .../Sources/FIRAppDistribution.m | 7 +- .../Tests/Unit/FIRAppDistributionTests.m | 7 +- FirebaseDatabase.podspec | 1 - FirebaseDatabase/Sources/Core/FRepoInfo.m | 10 ++- FirebaseInAppMessaging.podspec | 1 - .../FIRIAMAnalyticsEventLoggerImpl.h | 6 +- .../FIRIAMAnalyticsEventLoggerImpl.m | 8 +-- .../Analytics/FIRIAMClearcutUploader.m | 7 +- .../Sources/Flows/FIRIAMBookKeeper.m | 6 +- .../Analytics/FIRIAMClearcutUploader.h | 6 +- .../Sources/Private/Flows/FIRIAMBookKeeper.h | 4 +- .../Private/Runtime/FIRIAMSDKModeManager.h | 6 +- .../Sources/Runtime/FIRIAMRuntimeManager.m | 12 ++-- .../Sources/Runtime/FIRIAMSDKModeManager.m | 6 +- .../FIRIAMAnalyticsEventLoggerImplTests.m | 5 +- .../FIRIAMBookKeeperViaUserDefaultsTests.m | 5 +- .../Tests/Unit/FIRIAMClearcutUploaderTests.m | 5 +- .../Tests/Unit/FIRIAMSDKModeManagerTests.m | 5 +- FirebaseInstallations.podspec | 1 - .../FIRInstallationsStore.m | 6 +- .../Tests/Unit/FIRInstallationsStoreTests.m | 5 +- FirebaseMLModelDownloader.podspec | 1 - .../Sources/DownloaderUserDefaults.swift | 9 +-- .../Sources/LocalModelInfo.swift | 21 +++--- .../Sources/ModelDownloadTask.swift | 9 +-- .../Sources/ModelDownloader.swift | 11 +-- .../ModelDownloaderIntegrationTests.swift | 19 ++--- .../Tests/Unit/ModelDownloaderUnitTests.swift | 11 ++- FirebaseMessaging.podspec | 1 - FirebaseMessaging/CHANGELOG.md | 2 +- FirebaseMessaging/Sources/FIRMessaging.m | 9 ++- .../Sources/FIRMessagingPubSub.m | 5 +- .../Sources/FIRMessagingUtilities.h | 2 +- .../Sources/FIRMessagingUtilities.m | 5 +- .../Token/FIRMessagingCheckinPreferences.m | 11 ++- .../UnitTests/FIRMessagingHandlingTest.m | 1 - .../UnitTests/FIRMessagingLinkHandlingTest.m | 1 - .../Tests/UnitTests/FIRMessagingServiceTest.m | 1 - .../Tests/UnitTests/FIRMessagingTest.m | 1 - .../UnitTests/FIRMessagingTestUtilities.h | 2 +- .../UnitTests/FIRMessagingTestUtilities.m | 5 +- FirebasePerformance.podspec | 1 - .../FPRConfigurations+Private.h | 4 +- .../Configurations/FPRConfigurations.m | 18 +++-- .../FPRRemoteConfigFlags+Private.h | 4 +- .../Configurations/FPRRemoteConfigFlags.m | 4 +- .../Configurations/FPRRemoteConfigFlagsTest.m | 69 +++++++++---------- FirebaseSessions.podspec | 1 - .../Settings/SettingsCacheClient.swift | 16 ++--- Package.swift | 9 --- SwiftPMTests/swift-test/all-imports.swift | 1 - 57 files changed, 151 insertions(+), 241 deletions(-) diff --git a/FirebaseAppCheck.podspec b/FirebaseAppCheck.podspec index e04fdfd976b..7122bc6ceb2 100644 --- a/FirebaseAppCheck.podspec +++ b/FirebaseAppCheck.podspec @@ -49,7 +49,6 @@ Pod::Spec.new do |s| s.dependency 'FirebaseCore', '~> 11.0' s.dependency 'PromisesObjC', '~> 2.1' s.dependency 'GoogleUtilities/Environment', '~> 8.0' - s.dependency 'GoogleUtilities/UserDefaults', '~> 8.0' s.pod_target_xcconfig = { 'GCC_C_LANGUAGE_STANDARD' => 'c99', diff --git a/FirebaseAppCheck/Sources/Core/FIRAppCheck.m b/FirebaseAppCheck/Sources/Core/FIRAppCheck.m index d13b4d36d7f..3c6001ecdf1 100644 --- a/FirebaseAppCheck/Sources/Core/FIRAppCheck.m +++ b/FirebaseAppCheck/Sources/Core/FIRAppCheck.m @@ -18,7 +18,6 @@ #import #import -#import #import "FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckErrors.h" #import "FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckProvider.h" @@ -93,7 +92,7 @@ - (nullable instancetype)initWithApp:(FIRApp *)app { [[FIRInternalAppCheckProvider alloc] initWithAppCheckProvider:appCheckProvider]; FIRAppCheckSettings *settings = [[FIRAppCheckSettings alloc] initWithApp:app - userDefault:[GULUserDefaults standardUserDefaults] + userDefault:[NSUserDefaults standardUserDefaults] mainBundle:[NSBundle mainBundle]]; GACAppCheck *appCheckCore = [[GACAppCheck alloc] initWithServiceName:serviceName diff --git a/FirebaseAppCheck/Sources/Core/FIRAppCheckSettings.h b/FirebaseAppCheck/Sources/Core/FIRAppCheckSettings.h index 60bf31eaf0e..f866a8b0ca4 100644 --- a/FirebaseAppCheck/Sources/Core/FIRAppCheckSettings.h +++ b/FirebaseAppCheck/Sources/Core/FIRAppCheckSettings.h @@ -19,7 +19,7 @@ #import @class FIRApp; -@class GULUserDefaults; +@class NSUserDefaults; NS_ASSUME_NONNULL_BEGIN @@ -33,7 +33,7 @@ FOUNDATION_EXPORT NSString *const kFIRAppCheckTokenAutoRefreshEnabledInfoPlistKe @property(nonatomic, assign) BOOL isTokenAutoRefreshEnabled; - (instancetype)initWithApp:(FIRApp *)firebaseApp - userDefault:(GULUserDefaults *)userDefaults + userDefault:(NSUserDefaults *)userDefaults mainBundle:(NSBundle *)mainBundle NS_DESIGNATED_INITIALIZER; - (instancetype)init NS_UNAVAILABLE; diff --git a/FirebaseAppCheck/Sources/Core/FIRAppCheckSettings.m b/FirebaseAppCheck/Sources/Core/FIRAppCheckSettings.m index a9486925304..bb803a0ecad 100644 --- a/FirebaseAppCheck/Sources/Core/FIRAppCheckSettings.m +++ b/FirebaseAppCheck/Sources/Core/FIRAppCheckSettings.m @@ -15,9 +15,6 @@ */ #import "FirebaseAppCheck/Sources/Core/FIRAppCheckSettings.h" - -#import - #import "FirebaseCore/Extension/FirebaseCoreInternal.h" NS_ASSUME_NONNULL_BEGIN @@ -30,7 +27,7 @@ @interface FIRAppCheckSettings () @property(nonatomic, weak, readonly) FIRApp *firebaseApp; -@property(nonatomic, readonly) GULUserDefaults *userDefaults; +@property(nonatomic, readonly) NSUserDefaults *userDefaults; @property(nonatomic, readonly) NSBundle *mainBundle; @property(nonatomic, readonly) NSString *userDefaultKey; @property(nonatomic, assign) BOOL isTokenAutoRefreshConfigured; @@ -40,7 +37,7 @@ @interface FIRAppCheckSettings () @implementation FIRAppCheckSettings - (instancetype)initWithApp:(FIRApp *)firebaseApp - userDefault:(GULUserDefaults *)userDefaults + userDefault:(NSUserDefaults *)userDefaults mainBundle:(NSBundle *)mainBundle { self = [super init]; if (self) { diff --git a/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckSettingsTests.m b/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckSettingsTests.m index 621d6d94e4a..6704fc62759 100644 --- a/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckSettingsTests.m +++ b/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckSettingsTests.m @@ -16,7 +16,6 @@ #import -#import #import #import "FirebaseAppCheck/Sources/Core/FIRAppCheckSettings.h" @@ -47,7 +46,7 @@ - (void)setUp { self.mockApp = OCMClassMock([FIRApp class]); OCMStub([self.mockApp name]).andReturn(self.appName); - self.mockUserDefaults = OCMClassMock([GULUserDefaults class]); + self.mockUserDefaults = OCMClassMock([NSUserDefaults class]); self.bundleMock = OCMClassMock([NSBundle class]); self.settings = [[FIRAppCheckSettings alloc] initWithApp:self.mockApp diff --git a/FirebaseAppDistribution.podspec b/FirebaseAppDistribution.podspec index fdfbd788c3c..829224871ca 100644 --- a/FirebaseAppDistribution.podspec +++ b/FirebaseAppDistribution.podspec @@ -32,7 +32,6 @@ iOS SDK for App Distribution for Firebase. s.dependency 'FirebaseCore', '~> 11.0' s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 8.0' - s.dependency 'GoogleUtilities/UserDefaults', '~> 8.0' s.dependency 'FirebaseInstallations', '~> 11.0' s.pod_target_xcconfig = { diff --git a/FirebaseAppDistribution/Sources/FIRAppDistribution.m b/FirebaseAppDistribution/Sources/FIRAppDistribution.m index 6b406b09e34..92f9b354e29 100644 --- a/FirebaseAppDistribution/Sources/FIRAppDistribution.m +++ b/FirebaseAppDistribution/Sources/FIRAppDistribution.m @@ -14,7 +14,6 @@ #import #import -#import #import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "FirebaseInstallations/Source/Library/Private/FirebaseInstallationsInternal.h" @@ -60,7 +59,7 @@ @implementation FIRAppDistribution @synthesize isTesterSignedIn = _isTesterSignedIn; - (BOOL)isTesterSignedIn { - BOOL signInState = [[GULUserDefaults standardUserDefaults] boolForKey:kFIRFADSignInStateKey]; + BOOL signInState = [[NSUserDefaults standardUserDefaults] boolForKey:kFIRFADSignInStateKey]; FIRFADInfoLog(@"Tester is %@signed in.", signInState ? @"" : @"not "); return signInState; } @@ -176,7 +175,7 @@ - (void)persistTesterSignInStateAndHandleCompletion:(void (^)(NSError *_Nullable return; } - [[GULUserDefaults standardUserDefaults] setBool:YES forKey:kFIRFADSignInStateKey]; + [[NSUserDefaults standardUserDefaults] setBool:YES forKey:kFIRFADSignInStateKey]; completion(nil); }]; } @@ -207,7 +206,7 @@ - (NSString *)getAppBuild { - (void)signOutTester { FIRFADDebugLog(@"Tester is signed out."); - [[GULUserDefaults standardUserDefaults] setBool:NO forKey:kFIRFADSignInStateKey]; + [[NSUserDefaults standardUserDefaults] setBool:NO forKey:kFIRFADSignInStateKey]; } - (NSError *)NSErrorForErrorCodeAndMessage:(FIRAppDistributionError)errorCode diff --git a/FirebaseAppDistribution/Tests/Unit/FIRAppDistributionTests.m b/FirebaseAppDistribution/Tests/Unit/FIRAppDistributionTests.m index 1a61b1f8aa3..a283c5e9c97 100644 --- a/FirebaseAppDistribution/Tests/Unit/FIRAppDistributionTests.m +++ b/FirebaseAppDistribution/Tests/Unit/FIRAppDistributionTests.m @@ -17,7 +17,6 @@ #import #import -#import #import "FirebaseAppDistribution/Sources/FIRAppDistributionMachO.h" #import "FirebaseAppDistribution/Sources/FIRAppDistributionUIService.h" #import "FirebaseAppDistribution/Sources/FIRFADApiService.h" @@ -112,7 +111,7 @@ - (void)setUp { - (void)tearDown { [super tearDown]; - [[GULUserDefaults standardUserDefaults] removeObjectForKey:@"FIRFADSignInState"]; + [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"FIRFADSignInState"]; [_mockFIRAppClass stopMocking]; [_mockFIRFADApiService stopMocking]; [_mockFIRAppDistributionUIService stopMocking]; @@ -368,7 +367,7 @@ - (void)testFetchNewLatestReleaseUnauthenticatedFailure { userInfo:@{NSLocalizedDescriptionKey : @"This is unfortunate."}]; [self mockFetchReleasesCompletion:nil error:mockError]; OCMStub([_mockMachO codeHash]).andReturn(@"this-is-old"); - [[GULUserDefaults standardUserDefaults] setBool:YES forKey:@"FIRFADSignInState"]; + [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"FIRFADSignInState"]; XCTAssertTrue([[self appDistribution] isTesterSignedIn]); XCTestExpectation *expectation = [self expectationWithDescription:@"Fetch latest release fails."]; @@ -395,7 +394,7 @@ - (void)testFetchNewLatestReleaseUnauthorizedFailure { userInfo:@{NSLocalizedDescriptionKey : @"This is unfortunate."}]; [self mockFetchReleasesCompletion:nil error:mockError]; OCMStub([_mockMachO codeHash]).andReturn(@"this-is-old"); - [[GULUserDefaults standardUserDefaults] setBool:YES forKey:@"FIRFADSignInState"]; + [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"FIRFADSignInState"]; XCTAssertTrue([[self appDistribution] isTesterSignedIn]); XCTestExpectation *expectation = [self expectationWithDescription:@"Fetch latest release fails."]; diff --git a/FirebaseDatabase.podspec b/FirebaseDatabase.podspec index 6884a7a5539..8218ac90872 100644 --- a/FirebaseDatabase.podspec +++ b/FirebaseDatabase.podspec @@ -51,7 +51,6 @@ Simplify your iOS development, grow your user base, and monetize more effectivel s.dependency 'FirebaseCore', '~> 11.0' s.dependency 'FirebaseAppCheckInterop', '~> 11.0' s.dependency 'FirebaseSharedSwift', '~> 11.0' - s.dependency 'GoogleUtilities/UserDefaults', '~> 8.0' 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 f68bf38cd15..82ca825aecc 100644 --- a/FirebaseDatabase/Sources/Core/FRepoInfo.m +++ b/FirebaseDatabase/Sources/Core/FRepoInfo.m @@ -14,10 +14,8 @@ * limitations under the License. */ -#import - -#import "FirebaseDatabase/Sources/Constants/FConstants.h" #import "FirebaseDatabase/Sources/Core/FRepoInfo.h" +#import "FirebaseDatabase/Sources/Constants/FConstants.h" @interface FRepoInfo () @@ -54,7 +52,7 @@ - (instancetype)initWithHost:(NSString *)aHost // Get cached internal host if it exists NSString *internalHostKey = [NSString stringWithFormat:@"firebase:host:%@", _host]; - NSString *cachedInternalHost = [[GULUserDefaults standardUserDefaults] + NSString *cachedInternalHost = [[NSUserDefaults standardUserDefaults] stringForKey:internalHostKey]; if (cachedInternalHost != nil) { internalHost = cachedInternalHost; @@ -83,7 +81,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]; - GULUserDefaults *cache = [GULUserDefaults standardUserDefaults]; + NSUserDefaults *cache = [NSUserDefaults standardUserDefaults]; [cache setObject:internalHost forKey:internalHostKey]; [cache synchronize]; } @@ -95,7 +93,7 @@ - (void)clearInternalHostCache { // Remove the cached entry NSString *internalHostKey = [NSString stringWithFormat:@"firebase:host:%@", self.host]; - GULUserDefaults *cache = [GULUserDefaults standardUserDefaults]; + NSUserDefaults *cache = [NSUserDefaults standardUserDefaults]; [cache removeObjectForKey:internalHostKey]; [cache synchronize]; } diff --git a/FirebaseInAppMessaging.podspec b/FirebaseInAppMessaging.podspec index 42eaf9ecb84..2c13fe82b5f 100644 --- a/FirebaseInAppMessaging.podspec +++ b/FirebaseInAppMessaging.podspec @@ -84,7 +84,6 @@ See more product details at https://firebase.google.com/products/in-app-messagin s.dependency 'FirebaseInstallations', '~> 11.0' s.dependency 'FirebaseABTesting', '~> 11.0' s.dependency 'GoogleUtilities/Environment', '~> 8.0' - s.dependency 'GoogleUtilities/UserDefaults', '~> 8.0' s.dependency 'nanopb', '>= 2.30908.0', '< 2.30911.0' s.test_spec 'unit' do |unit_tests| diff --git a/FirebaseInAppMessaging/Sources/Analytics/FIRIAMAnalyticsEventLoggerImpl.h b/FirebaseInAppMessaging/Sources/Analytics/FIRIAMAnalyticsEventLoggerImpl.h index cb406b0098e..417d942030d 100644 --- a/FirebaseInAppMessaging/Sources/Analytics/FIRIAMAnalyticsEventLoggerImpl.h +++ b/FirebaseInAppMessaging/Sources/Analytics/FIRIAMAnalyticsEventLoggerImpl.h @@ -19,7 +19,7 @@ #import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMAnalyticsEventLogger.h" @class FIRIAMClearcutLogger; -@class GULUserDefaults; +@class NSUserDefaults; @protocol FIRIAMTimeFetcher; @protocol FIRAnalyticsInterop; @@ -35,12 +35,12 @@ NS_ASSUME_NONNULL_BEGIN /** * * @param userDefaults needed for tracking upload timing info persistently.If nil, using - * GULUserDefaults standardUserDefaults. It's defined as a parameter to help with + * NSUserDefaults standardUserDefaults. It's defined as a parameter to help with * unit testing mocking */ - (instancetype)initWithClearcutLogger:(FIRIAMClearcutLogger *)ctLogger usingTimeFetcher:(id)timeFetcher - usingUserDefaults:(nullable GULUserDefaults *)userDefaults + usingUserDefaults:(nullable NSUserDefaults *)userDefaults analytics:(nullable id)analytics; @end NS_ASSUME_NONNULL_END diff --git a/FirebaseInAppMessaging/Sources/Analytics/FIRIAMAnalyticsEventLoggerImpl.m b/FirebaseInAppMessaging/Sources/Analytics/FIRIAMAnalyticsEventLoggerImpl.m index f4f8a8bc577..fb28a315737 100644 --- a/FirebaseInAppMessaging/Sources/Analytics/FIRIAMAnalyticsEventLoggerImpl.m +++ b/FirebaseInAppMessaging/Sources/Analytics/FIRIAMAnalyticsEventLoggerImpl.m @@ -17,8 +17,6 @@ #import #if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION -#import - #import "FirebaseInAppMessaging/Sources/Analytics/FIRIAMAnalyticsEventLoggerImpl.h" #import "FirebaseCore/Extension/FirebaseCoreInternal.h" @@ -31,7 +29,7 @@ @interface FIRIAMAnalyticsEventLoggerImpl () @property(readonly, nonatomic) FIRIAMClearcutLogger *clearCutLogger; @property(readonly, nonatomic) id timeFetcher; -@property(nonatomic, readonly) GULUserDefaults *userDefaults; +@property(nonatomic, readonly) NSUserDefaults *userDefaults; @end // in these kFAXX constants, FA represents FirebaseAnalytics @@ -62,13 +60,13 @@ @implementation FIRIAMAnalyticsEventLoggerImpl { - (instancetype)initWithClearcutLogger:(FIRIAMClearcutLogger *)ctLogger usingTimeFetcher:(id)timeFetcher - usingUserDefaults:(nullable GULUserDefaults *)userDefaults + usingUserDefaults:(nullable NSUserDefaults *)userDefaults analytics:(nullable id)analytics { if (self = [super init]) { _clearCutLogger = ctLogger; _timeFetcher = timeFetcher; _analytics = analytics; - _userDefaults = userDefaults ? userDefaults : [GULUserDefaults standardUserDefaults]; + _userDefaults = userDefaults ? userDefaults : [NSUserDefaults standardUserDefaults]; if (!_analytics) { FIRLogWarning(kFIRLoggerInAppMessaging, @"I-IAM280002", diff --git a/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutUploader.m b/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutUploader.m index f424f51f878..dafb1003b87 100644 --- a/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutUploader.m +++ b/FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutUploader.m @@ -17,7 +17,6 @@ #import #if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION -#import #import #import "FirebaseCore/Extension/FirebaseCoreInternal.h" @@ -67,7 +66,7 @@ @interface FIRIAMClearcutUploader () { @property(nonatomic, readonly) FIRIAMClearcutLogStorage *logStorage; @property(nonatomic, readonly) FIRIAMClearcutStrategy *strategy; -@property(nonatomic, readonly) GULUserDefaults *userDefaults; +@property(nonatomic, readonly) NSUserDefaults *userDefaults; @end static NSString *FIRIAM_UserDefaultsKeyForNextValidClearcutUploadTimeInMills = @@ -90,7 +89,7 @@ - (instancetype)initWithRequestSender:(FIRIAMClearcutHttpRequestSender *)request timeFetcher:(id)timeFetcher logStorage:(FIRIAMClearcutLogStorage *)logStorage usingStrategy:(FIRIAMClearcutStrategy *)strategy - usingUserDefaults:(nullable GULUserDefaults *)userDefaults { + usingUserDefaults:(nullable NSUserDefaults *)userDefaults { if (self = [super init]) { _nextSendScheduled = NO; _timeFetcher = timeFetcher; @@ -108,7 +107,7 @@ - (instancetype)initWithRequestSender:(FIRIAMClearcutHttpRequestSender *)request name:UISceneWillEnterForegroundNotification object:nil]; } - _userDefaults = userDefaults ? userDefaults : [GULUserDefaults standardUserDefaults]; + _userDefaults = userDefaults ? userDefaults : [NSUserDefaults standardUserDefaults]; // it would be 0 if it does not exist, which is equvilent to saying that // you can send now _nextValidSendTimeInMills = (int64_t) diff --git a/FirebaseInAppMessaging/Sources/Flows/FIRIAMBookKeeper.m b/FirebaseInAppMessaging/Sources/Flows/FIRIAMBookKeeper.m index 5e17566b4cc..10b25a77716 100644 --- a/FirebaseInAppMessaging/Sources/Flows/FIRIAMBookKeeper.m +++ b/FirebaseInAppMessaging/Sources/Flows/FIRIAMBookKeeper.m @@ -17,8 +17,6 @@ #import #if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION -#import - #import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h" @@ -46,7 +44,7 @@ @interface FIRIAMBookKeeperViaUserDefaults () @property(nonatomic) double lastDisplayTime; @property(nonatomic) double lastFetchTime; @property(nonatomic) double nextFetchWaitTime; -@property(nonatomic, nonnull) GULUserDefaults *defaults; +@property(nonatomic, nonnull) NSUserDefaults *defaults; @end @interface FIRIAMImpressionRecord () @@ -87,7 +85,7 @@ - (NSString *)description { @implementation FIRIAMBookKeeperViaUserDefaults -- (instancetype)initWithUserDefaults:(GULUserDefaults *)userDefaults { +- (instancetype)initWithUserDefaults:(NSUserDefaults *)userDefaults { if (self = [super init]) { _defaults = userDefaults; diff --git a/FirebaseInAppMessaging/Sources/Private/Analytics/FIRIAMClearcutUploader.h b/FirebaseInAppMessaging/Sources/Private/Analytics/FIRIAMClearcutUploader.h index a349c13d8f4..c827f78a615 100644 --- a/FirebaseInAppMessaging/Sources/Private/Analytics/FIRIAMClearcutUploader.h +++ b/FirebaseInAppMessaging/Sources/Private/Analytics/FIRIAMClearcutUploader.h @@ -19,7 +19,7 @@ @class FIRIAMClearcutLogRecord; @class FIRIAMClearcutHttpRequestSender; @class FIRIAMClearcutLogStorage; -@class GULUserDefaults; +@class NSUserDefaults; @protocol FIRIAMTimeFetcher; @@ -59,14 +59,14 @@ NS_ASSUME_NONNULL_BEGIN /** * * @param userDefaults needed for tracking upload timing info persistently.If nil, using - * GULUserDefaults standardUserDefaults. It's defined as a parameter to help with + * NSUserDefaults standardUserDefaults. It's defined as a parameter to help with * unit testing mocking */ - (instancetype)initWithRequestSender:(FIRIAMClearcutHttpRequestSender *)requestSender timeFetcher:(id)timeFetcher logStorage:(FIRIAMClearcutLogStorage *)retryStorage usingStrategy:(FIRIAMClearcutStrategy *)strategy - usingUserDefaults:(nullable GULUserDefaults *)userDefaults; + usingUserDefaults:(nullable NSUserDefaults *)userDefaults; /** * This should return very quickly without blocking on and actual log uploading to * clearcut server, which is done asynchronously diff --git a/FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMBookKeeper.h b/FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMBookKeeper.h index 9f4bca0e8dc..c6778dd4c90 100644 --- a/FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMBookKeeper.h +++ b/FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMBookKeeper.h @@ -18,7 +18,7 @@ NS_ASSUME_NONNULL_BEGIN -@class GULUserDefaults; +@class NSUserDefaults; @interface FIRIAMImpressionRecord : NSObject @property(nonatomic, readonly, copy) NSString *messageID; @@ -67,7 +67,7 @@ NS_ASSUME_NONNULL_BEGIN @interface FIRIAMBookKeeperViaUserDefaults : NSObject - (instancetype)init NS_UNAVAILABLE; -- (instancetype)initWithUserDefaults:(GULUserDefaults *)userDefaults NS_DESIGNATED_INITIALIZER; +- (instancetype)initWithUserDefaults:(NSUserDefaults *)userDefaults NS_DESIGNATED_INITIALIZER; // for testing, don't use them for production purpose - (void)cleanupImpressions; diff --git a/FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMSDKModeManager.h b/FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMSDKModeManager.h index f67db3b91e1..6a205c0b558 100644 --- a/FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMSDKModeManager.h +++ b/FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMSDKModeManager.h @@ -18,7 +18,7 @@ NS_ASSUME_NONNULL_BEGIN -@class GULUserDefaults; +@class NSUserDefaults; extern NSInteger const kFIRIAMMaxFetchInNewlyInstalledMode; @@ -58,8 +58,8 @@ extern NSInteger const kFIRIAMMaxFetchInNewlyInstalledMode; - (instancetype)init NS_UNAVAILABLE; -// having GULUserDefaults as passed-in to help with unit testing -- (instancetype)initWithUserDefaults:(GULUserDefaults *)userDefaults +// having NSUserDefaults as passed-in to help with unit testing +- (instancetype)initWithUserDefaults:(NSUserDefaults *)userDefaults testingModeListener:(id)testingModeListener; // returns the current SDK mode diff --git a/FirebaseInAppMessaging/Sources/Runtime/FIRIAMRuntimeManager.m b/FirebaseInAppMessaging/Sources/Runtime/FIRIAMRuntimeManager.m index b3fb094c67b..2cb0b6daa98 100644 --- a/FirebaseInAppMessaging/Sources/Runtime/FIRIAMRuntimeManager.m +++ b/FirebaseInAppMessaging/Sources/Runtime/FIRIAMRuntimeManager.m @@ -17,8 +17,6 @@ #import #if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION -#import - #import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "FirebaseInAppMessaging/Sources/Analytics/FIRIAMAnalyticsEventLoggerImpl.h" @@ -96,7 +94,7 @@ - (void)testingModeSwitchedOn { } - (FIRIAMAutoDataCollectionSetting)FIAMProgrammaticAutoDataCollectionSetting { - id settingEntry = [[GULUserDefaults standardUserDefaults] + id settingEntry = [[NSUserDefaults standardUserDefaults] objectForKey:_userDefaultsKeyForFIAMProgammaticAutoDataCollectionSetting]; if (![settingEntry isKindOfClass:[NSNumber class]]) { @@ -190,7 +188,7 @@ - (BOOL)shouldRunSDKFlowsOnStartup { - (void)resume { // persist the setting - [[GULUserDefaults standardUserDefaults] + [[NSUserDefaults standardUserDefaults] setObject:@(YES) forKey:_userDefaultsKeyForFIAMProgammaticAutoDataCollectionSetting]; @@ -211,7 +209,7 @@ - (void)resume { - (void)pause { // persist the setting - [[GULUserDefaults standardUserDefaults] + [[NSUserDefaults standardUserDefaults] setObject:@(NO) forKey:_userDefaultsKeyForFIAMProgammaticAutoDataCollectionSetting]; @@ -264,7 +262,7 @@ - (void)internalStartRuntimeWithSDKSettings:(FIRIAMSDKSettings *)settings { self.responseParser = [[FIRIAMFetchResponseParser alloc] initWithTimeFetcher:timeFetcher]; self.bookKeeper = [[FIRIAMBookKeeperViaUserDefaults alloc] - initWithUserDefaults:[GULUserDefaults standardUserDefaults]]; + initWithUserDefaults:[NSUserDefaults standardUserDefaults]]; self.messageCache = [[FIRIAMMessageClientCache alloc] initWithBookkeeper:self.bookKeeper usingResponseParser:self.responseParser]; @@ -326,7 +324,7 @@ - (void)internalStartRuntimeWithSDKSettings:(FIRIAMSDKSettings *)settings { analytics:[FIRInAppMessaging inAppMessaging].analytics]; FIRIAMSDKModeManager *sdkModeManager = - [[FIRIAMSDKModeManager alloc] initWithUserDefaults:GULUserDefaults.standardUserDefaults + [[FIRIAMSDKModeManager alloc] initWithUserDefaults:NSUserDefaults.standardUserDefaults testingModeListener:self]; FIRIAMActionURLFollower *actionFollower = [FIRIAMActionURLFollower actionURLFollower]; diff --git a/FirebaseInAppMessaging/Sources/Runtime/FIRIAMSDKModeManager.m b/FirebaseInAppMessaging/Sources/Runtime/FIRIAMSDKModeManager.m index 39d51af13ca..f20fd9730ec 100644 --- a/FirebaseInAppMessaging/Sources/Runtime/FIRIAMSDKModeManager.m +++ b/FirebaseInAppMessaging/Sources/Runtime/FIRIAMSDKModeManager.m @@ -17,8 +17,6 @@ #import #if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_VISION -#import - #import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h" @@ -40,7 +38,7 @@ } @interface FIRIAMSDKModeManager () -@property(nonatomic, nonnull, readonly) GULUserDefaults *userDefaults; +@property(nonatomic, nonnull, readonly) NSUserDefaults *userDefaults; // Make it weak so that we don't depend on its existence to avoid circular reference. @property(nonatomic, readonly, weak) id testingModeListener; @end @@ -54,7 +52,7 @@ @implementation FIRIAMSDKModeManager { NSInteger _fetchCount; } -- (instancetype)initWithUserDefaults:(GULUserDefaults *)userDefaults +- (instancetype)initWithUserDefaults:(NSUserDefaults *)userDefaults testingModeListener:(id)testingModeListener { if (self = [super init]) { _userDefaults = userDefaults; diff --git a/FirebaseInAppMessaging/Tests/Unit/FIRIAMAnalyticsEventLoggerImplTests.m b/FirebaseInAppMessaging/Tests/Unit/FIRIAMAnalyticsEventLoggerImplTests.m index 6ca6590f0f4..9f8d1e41796 100644 --- a/FirebaseInAppMessaging/Tests/Unit/FIRIAMAnalyticsEventLoggerImplTests.m +++ b/FirebaseInAppMessaging/Tests/Unit/FIRIAMAnalyticsEventLoggerImplTests.m @@ -14,7 +14,6 @@ * limitations under the License. */ -#import #import #import @@ -29,7 +28,7 @@ @interface FIRIAMAnalyticsEventLoggerImplTests : XCTestCase @property(nonatomic) FIRIAMClearcutLogger *mockClearcutLogger; @property(nonatomic) id mockTimeFetcher; @property(nonatomic) id mockFirebaseAnalytics; -@property(nonatomic) GULUserDefaults *mockUserDefaults; +@property(nonatomic) NSUserDefaults *mockUserDefaults; @end @@ -141,7 +140,7 @@ - (void)setUp { [super setUp]; self.mockClearcutLogger = OCMClassMock(FIRIAMClearcutLogger.class); self.mockTimeFetcher = OCMProtocolMock(@protocol(FIRIAMTimeFetcher)); - self.mockUserDefaults = OCMClassMock(GULUserDefaults.class); + self.mockUserDefaults = OCMClassMock(NSUserDefaults.class); } - (void)tearDown { diff --git a/FirebaseInAppMessaging/Tests/Unit/FIRIAMBookKeeperViaUserDefaultsTests.m b/FirebaseInAppMessaging/Tests/Unit/FIRIAMBookKeeperViaUserDefaultsTests.m index 499f4228609..4a31447d98f 100644 --- a/FirebaseInAppMessaging/Tests/Unit/FIRIAMBookKeeperViaUserDefaultsTests.m +++ b/FirebaseInAppMessaging/Tests/Unit/FIRIAMBookKeeperViaUserDefaultsTests.m @@ -14,14 +14,13 @@ * limitations under the License. */ -#import #import #import #import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMBookKeeper.h" @interface FIRIAMBookKeeperViaUserDefaultsTests : XCTestCase -@property(nonatomic) GULUserDefaults *userDefaultsForTesting; +@property(nonatomic) NSUserDefaults *userDefaultsForTesting; @end extern NSString *FIRIAM_UserDefaultsKeyForImpressions; @@ -35,7 +34,7 @@ @interface FIRIAMBookKeeperViaUserDefaultsTests : XCTestCase @implementation FIRIAMBookKeeperViaUserDefaultsTests - (void)setUp { [super setUp]; - self.userDefaultsForTesting = [[GULUserDefaults alloc] initWithSuiteName:kSuiteName]; + self.userDefaultsForTesting = [[NSUserDefaults alloc] initWithSuiteName:kSuiteName]; } - (void)tearDown { diff --git a/FirebaseInAppMessaging/Tests/Unit/FIRIAMClearcutUploaderTests.m b/FirebaseInAppMessaging/Tests/Unit/FIRIAMClearcutUploaderTests.m index 5e891c4ee45..573f8ec9fbd 100644 --- a/FirebaseInAppMessaging/Tests/Unit/FIRIAMClearcutUploaderTests.m +++ b/FirebaseInAppMessaging/Tests/Unit/FIRIAMClearcutUploaderTests.m @@ -14,7 +14,6 @@ * limitations under the License. */ -#import #import #import @@ -28,7 +27,7 @@ @interface FIRIAMClearcutUploaderTests : XCTestCase @property(nonatomic) FIRIAMClearcutHttpRequestSender *mockRequestSender; @property(nonatomic) FIRIAMClearcutLogStorage *mockLogStorage; @property(nonatomic) FIRIAMClearcutStrategy *defaultStrategy; -@property(nonatomic) GULUserDefaults *mockUserDefaults; +@property(nonatomic) NSUserDefaults *mockUserDefaults; @property(nonatomic) NSString *cachePath; @end @@ -66,7 +65,7 @@ - (void)setUp { failureBackoffTimeInMills:1000 batchSendSize:10]; - self.mockUserDefaults = OCMClassMock(GULUserDefaults.class); + self.mockUserDefaults = OCMClassMock(NSUserDefaults.class); self.cachePath = [self generatedCachePath]; OCMStub([self.mockUserDefaults integerForKey:[OCMArg any]]).andReturn(0); } diff --git a/FirebaseInAppMessaging/Tests/Unit/FIRIAMSDKModeManagerTests.m b/FirebaseInAppMessaging/Tests/Unit/FIRIAMSDKModeManagerTests.m index 0be81b2a01c..f7d1b384b74 100644 --- a/FirebaseInAppMessaging/Tests/Unit/FIRIAMSDKModeManagerTests.m +++ b/FirebaseInAppMessaging/Tests/Unit/FIRIAMSDKModeManagerTests.m @@ -14,14 +14,13 @@ * limitations under the License. */ -#import #import #import #import "FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMSDKModeManager.h" @interface FIRIAMSDKModeManagerTests : XCTestCase -@property(nonatomic) GULUserDefaults *mockUserDefaults; +@property(nonatomic) NSUserDefaults *mockUserDefaults; @property(nonatomic) id mockTestingModeListener; @end @@ -29,7 +28,7 @@ @implementation FIRIAMSDKModeManagerTests - (void)setUp { [super setUp]; - self.mockUserDefaults = OCMClassMock(GULUserDefaults.class); + self.mockUserDefaults = OCMClassMock(NSUserDefaults.class); self.mockTestingModeListener = OCMStrictProtocolMock(@protocol(FIRIAMTestingModeListener)); } diff --git a/FirebaseInstallations.podspec b/FirebaseInstallations.podspec index 990dd505411..b1c1d758eaf 100644 --- a/FirebaseInstallations.podspec +++ b/FirebaseInstallations.podspec @@ -48,7 +48,6 @@ Pod::Spec.new do |s| s.dependency 'FirebaseCore', '~> 11.0' s.dependency 'PromisesObjC', '~> 2.1' s.dependency 'GoogleUtilities/Environment', '~> 8.0' - s.dependency 'GoogleUtilities/UserDefaults', '~> 8.0' preprocessor_definitions = '' s.pod_target_xcconfig = { diff --git a/FirebaseInstallations/Source/Library/InstallationsStore/FIRInstallationsStore.m b/FirebaseInstallations/Source/Library/InstallationsStore/FIRInstallationsStore.m index 40cd5fb31ed..9eaf9856e08 100644 --- a/FirebaseInstallations/Source/Library/InstallationsStore/FIRInstallationsStore.m +++ b/FirebaseInstallations/Source/Library/InstallationsStore/FIRInstallationsStore.m @@ -16,8 +16,6 @@ #import "FirebaseInstallations/Source/Library/InstallationsStore/FIRInstallationsStore.h" -#import - #if __has_include() #import #else @@ -36,7 +34,7 @@ @interface FIRInstallationsStore () @property(nonatomic, readonly) GULKeychainStorage *secureStorage; @property(nonatomic, readonly, nullable) NSString *accessGroup; @property(nonatomic, readonly) dispatch_queue_t queue; -@property(nonatomic, readonly) GULUserDefaults *userDefaults; +@property(nonatomic, readonly) NSUserDefaults *userDefaults; @end @implementation FIRInstallationsStore @@ -50,7 +48,7 @@ - (instancetype)initWithSecureStorage:(GULKeychainStorage *)storage _queue = dispatch_queue_create("com.firebase.FIRInstallationsStore", DISPATCH_QUEUE_SERIAL); NSString *userDefaultsSuiteName = _accessGroup ?: kFIRInstallationsStoreUserDefaultsID; - _userDefaults = [[GULUserDefaults alloc] initWithSuiteName:userDefaultsSuiteName]; + _userDefaults = [[NSUserDefaults alloc] initWithSuiteName:userDefaultsSuiteName]; } return self; } diff --git a/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsStoreTests.m b/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsStoreTests.m index 16c20c48950..908be1aef54 100644 --- a/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsStoreTests.m +++ b/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsStoreTests.m @@ -19,7 +19,6 @@ #import #import -#import #import "FBLPromise+Testing.h" #import "FirebaseInstallations/Source/Library/Errors/FIRInstallationsErrorUtil.h" @@ -32,7 +31,7 @@ @interface FIRInstallationsStoreTests : XCTestCase @property(nonatomic) NSString *accessGroup; @property(nonatomic) FIRInstallationsStore *store; @property(nonatomic) id mockSecureStorage; -@property(nonatomic) GULUserDefaults *userDefaults; +@property(nonatomic) NSUserDefaults *userDefaults; @end @implementation FIRInstallationsStoreTests @@ -45,7 +44,7 @@ - (void)setUp { // TODO: Replace real user defaults by an injected mock or a test specific user defaults instance // with a specific suite name. - self.userDefaults = [[GULUserDefaults alloc] initWithSuiteName:self.accessGroup]; + self.userDefaults = [[NSUserDefaults alloc] initWithSuiteName:self.accessGroup]; } - (void)tearDown { diff --git a/FirebaseMLModelDownloader.podspec b/FirebaseMLModelDownloader.podspec index a45f5b93216..4779a4da503 100644 --- a/FirebaseMLModelDownloader.podspec +++ b/FirebaseMLModelDownloader.podspec @@ -41,7 +41,6 @@ Pod::Spec.new do |s| s.dependency 'GoogleDataTransport', '~> 10.0' # TODO: Revisit this dependency s.dependency 'GoogleUtilities/Logger', '~> 8.0' - s.dependency 'GoogleUtilities/UserDefaults', '~> 8.0' s.dependency 'SwiftProtobuf', '~> 1.19' s.pod_target_xcconfig = { diff --git a/FirebaseMLModelDownloader/Sources/DownloaderUserDefaults.swift b/FirebaseMLModelDownloader/Sources/DownloaderUserDefaults.swift index 1f66bf8a0b2..0f7453de364 100644 --- a/FirebaseMLModelDownloader/Sources/DownloaderUserDefaults.swift +++ b/FirebaseMLModelDownloader/Sources/DownloaderUserDefaults.swift @@ -13,14 +13,9 @@ // limitations under the License. import Foundation -#if SWIFT_PACKAGE - @_implementationOnly import GoogleUtilities_UserDefaults -#else - @_implementationOnly import GoogleUtilities -#endif // SWIFT_PACKAGE /// Protocol to save or delete model info in user defaults. protocol DownloaderUserDefaultsWriteable { - func writeToDefaults(_ defaults: GULUserDefaults, appName: String) - func removeFromDefaults(_ defaults: GULUserDefaults, appName: String) + func writeToDefaults(_ defaults: UserDefaults, appName: String) + func removeFromDefaults(_ defaults: UserDefaults, appName: String) } diff --git a/FirebaseMLModelDownloader/Sources/LocalModelInfo.swift b/FirebaseMLModelDownloader/Sources/LocalModelInfo.swift index 5c51c5fded8..236940b2f7f 100644 --- a/FirebaseMLModelDownloader/Sources/LocalModelInfo.swift +++ b/FirebaseMLModelDownloader/Sources/LocalModelInfo.swift @@ -13,11 +13,6 @@ // limitations under the License. import Foundation -#if SWIFT_PACKAGE - @_implementationOnly import GoogleUtilities_UserDefaults -#else - @_implementationOnly import GoogleUtilities -#endif // SWIFT_PACKAGE /// Model info object with details about downloaded and locally available model. class LocalModelInfo { @@ -46,7 +41,7 @@ class LocalModelInfo { } /// Convenience init to create local model info from stored info in user defaults. - convenience init?(fromDefaults defaults: GULUserDefaults, name: String, appName: String) { + convenience init?(fromDefaults defaults: UserDefaults, name: String, appName: String) { let defaultsPrefix = LocalModelInfo.getUserDefaultsKeyPrefix(appName: appName, modelName: name) guard let modelHash = defaults.string(forKey: "\(defaultsPrefix).model-hash") else { return nil @@ -65,13 +60,13 @@ extension LocalModelInfo: DownloaderUserDefaultsWriteable { } /// Write local model info to user defaults. - func writeToDefaults(_ defaults: GULUserDefaults, appName: String) { + func writeToDefaults(_ defaults: UserDefaults, appName: String) { let defaultsPrefix = LocalModelInfo.getUserDefaultsKeyPrefix(appName: appName, modelName: name) - defaults.setObject(modelHash, forKey: "\(defaultsPrefix).model-hash") - defaults.setObject(size, forKey: "\(defaultsPrefix).model-size") + defaults.set(modelHash, forKey: "\(defaultsPrefix).model-hash") + defaults.set(size, forKey: "\(defaultsPrefix).model-size") } - func removeFromDefaults(_ defaults: GULUserDefaults, appName: String) { + func removeFromDefaults(_ defaults: UserDefaults, appName: String) { let defaultsPrefix = LocalModelInfo.getUserDefaultsKeyPrefix(appName: appName, modelName: name) defaults.removeObject(forKey: "\(defaultsPrefix).model-hash") defaults.removeObject(forKey: "\(defaultsPrefix).model-size") @@ -79,8 +74,8 @@ extension LocalModelInfo: DownloaderUserDefaultsWriteable { } /// Named user defaults for FirebaseML. -extension GULUserDefaults { - static var firebaseMLDefaults: GULUserDefaults { - return GULUserDefaults(suiteName: "com.google.firebase.ml") +extension UserDefaults { + static var firebaseMLDefaults: UserDefaults { + return UserDefaults(suiteName: "com.google.firebase.ml") ?? UserDefaults.standard } } diff --git a/FirebaseMLModelDownloader/Sources/ModelDownloadTask.swift b/FirebaseMLModelDownloader/Sources/ModelDownloadTask.swift index c0f218bfd9e..05256933f29 100644 --- a/FirebaseMLModelDownloader/Sources/ModelDownloadTask.swift +++ b/FirebaseMLModelDownloader/Sources/ModelDownloadTask.swift @@ -13,11 +13,6 @@ // limitations under the License. import Foundation -#if SWIFT_PACKAGE - @_implementationOnly import GoogleUtilities_UserDefaults -#else - @_implementationOnly import GoogleUtilities -#endif // SWIFT_PACKAGE /// Task to download model file to device. class ModelDownloadTask { @@ -28,7 +23,7 @@ class ModelDownloadTask { private(set) var remoteModelInfo: RemoteModelInfo /// User defaults to which local model info should ultimately be written. - private let defaults: GULUserDefaults + private let defaults: UserDefaults /// Keeps track of download associated with this model download task. private(set) var downloadStatus: ModelDownloadStatus = .ready @@ -49,7 +44,7 @@ class ModelDownloadTask { init(remoteModelInfo: RemoteModelInfo, appName: String, - defaults: GULUserDefaults, + defaults: UserDefaults, downloader: FileDownloader, progressHandler: ProgressHandler? = nil, completion: @escaping Completion, diff --git a/FirebaseMLModelDownloader/Sources/ModelDownloader.swift b/FirebaseMLModelDownloader/Sources/ModelDownloader.swift index fb99d831209..d5752a66cdb 100644 --- a/FirebaseMLModelDownloader/Sources/ModelDownloader.swift +++ b/FirebaseMLModelDownloader/Sources/ModelDownloader.swift @@ -15,11 +15,6 @@ import FirebaseCore import FirebaseInstallations import Foundation -#if SWIFT_PACKAGE - @_implementationOnly import GoogleUtilities_UserDefaults -#else - @_implementationOnly import GoogleUtilities -#endif // SWIFT_PACKAGE /// Possible ways to get a custom model. public enum ModelDownloadType { @@ -46,7 +41,7 @@ public class ModelDownloader { private let installations: Installations /// User defaults for model info. - private let userDefaults: GULUserDefaults + private let userDefaults: UserDefaults /// Telemetry logger tied to this instance of model downloader. let telemetryLogger: TelemetryLogger? @@ -72,7 +67,7 @@ public class ModelDownloader { } /// Private init for model downloader. - private init(app: FirebaseApp, defaults: GULUserDefaults = .firebaseMLDefaults) { + private init(app: FirebaseApp, defaults: UserDefaults = .firebaseMLDefaults) { appName = app.name options = app.options installations = Installations.installations(app: app) @@ -646,7 +641,7 @@ extension ModelDownloader { /// Model downloader extension for testing. extension ModelDownloader { /// Model downloader instance for testing. - static func modelDownloaderWithDefaults(_ defaults: GULUserDefaults, + static func modelDownloaderWithDefaults(_ defaults: UserDefaults, app: FirebaseApp) -> ModelDownloader { let downloader = ModelDownloader(app: app, defaults: defaults) return downloader diff --git a/FirebaseMLModelDownloader/Tests/Integration/ModelDownloaderIntegrationTests.swift b/FirebaseMLModelDownloader/Tests/Integration/ModelDownloaderIntegrationTests.swift index 6d5a9a83893..4a1b2658bc7 100644 --- a/FirebaseMLModelDownloader/Tests/Integration/ModelDownloaderIntegrationTests.swift +++ b/FirebaseMLModelDownloader/Tests/Integration/ModelDownloaderIntegrationTests.swift @@ -22,26 +22,21 @@ @testable import FirebaseInstallations @testable import FirebaseMLModelDownloader import XCTest - #if SWIFT_PACKAGE - @_implementationOnly import GoogleUtilities_UserDefaults - #else - @_implementationOnly import GoogleUtilities - #endif // SWIFT_PACKAGE - extension GULUserDefaults { + extension NSUserDefaults { /// Returns an instance of user defaults. - static func createTestInstance(testName: String) -> GULUserDefaults { + static func createTestInstance(testName: String) -> NSUserDefaults { let suiteName = "com.google.firebase.ml.test.\(testName)" - // Clear the suite (`UserDefaults` and `GULUserDefaults` map to the same - // storage space and `GULUserDefaults` doesn't offer API to do this.) + // Clear the suite (`UserDefaults` and `NSUserDefaults` map to the same + // storage space and `NSUserDefaults` doesn't offer API to do this.) UserDefaults(suiteName: suiteName)!.removePersistentDomain(forName: suiteName) - return GULUserDefaults(suiteName: suiteName) + return NSUserDefaults(suiteName: suiteName) } /// Returns the existing user defaults instance. - static func getTestInstance(testName: String) -> GULUserDefaults { + static func getTestInstance(testName: String) -> NSUserDefaults { let suiteName = "com.google.firebase.ml.test.\(testName)" - return GULUserDefaults(suiteName: suiteName) + return NSUserDefaults(suiteName: suiteName) } } diff --git a/FirebaseMLModelDownloader/Tests/Unit/ModelDownloaderUnitTests.swift b/FirebaseMLModelDownloader/Tests/Unit/ModelDownloaderUnitTests.swift index b7bec11c323..ca4d0558a62 100644 --- a/FirebaseMLModelDownloader/Tests/Unit/ModelDownloaderUnitTests.swift +++ b/FirebaseMLModelDownloader/Tests/Unit/ModelDownloaderUnitTests.swift @@ -24,7 +24,6 @@ import XCTest #if SWIFT_PACKAGE @_implementationOnly import GoogleUtilities_Logger - @_implementationOnly import GoogleUtilities_UserDefaults #else @_implementationOnly import GoogleUtilities #endif // SWIFT_PACKAGE @@ -1331,18 +1330,18 @@ } } - extension GULUserDefaults { + extension NSUserDefaults { /// Returns a new instance of user defaults. - static func createUnitTestInstance(testName: String) -> GULUserDefaults { + static func createUnitTestInstance(testName: String) -> NSUserDefaults { let suiteName = "com.google.firebase.ml.test.\(testName)" - let defaults = GULUserDefaults(suiteName: suiteName) + let defaults = NSUserDefaults(suiteName: suiteName) return defaults } /// Returns the existing user defaults instance. - static func getUnitTestInstance(testName: String) -> GULUserDefaults { + static func getUnitTestInstance(testName: String) -> NSUserDefaults { let suiteName = "com.google.firebase.ml.test.\(testName)" - return GULUserDefaults(suiteName: suiteName) + return NSUserDefaults(suiteName: suiteName) } } diff --git a/FirebaseMessaging.podspec b/FirebaseMessaging.podspec index 0e056c8a17a..7918964092f 100644 --- a/FirebaseMessaging.podspec +++ b/FirebaseMessaging.podspec @@ -66,7 +66,6 @@ device, and it is completely free. s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 8.0' s.dependency 'GoogleUtilities/Reachability', '~> 8.0' s.dependency 'GoogleUtilities/Environment', '~> 8.0' - s.dependency 'GoogleUtilities/UserDefaults', '~> 8.0' s.dependency 'GoogleDataTransport', '~> 10.0' s.dependency 'nanopb', '>= 2.30908.0', '< 2.30911.0' diff --git a/FirebaseMessaging/CHANGELOG.md b/FirebaseMessaging/CHANGELOG.md index a89c89decfa..7127beeceb9 100644 --- a/FirebaseMessaging/CHANGELOG.md +++ b/FirebaseMessaging/CHANGELOG.md @@ -171,7 +171,7 @@ - [added] Adding community support for tvOS. (#2428) # 3.3.2 -- [fixed] Replaced `NSUserDefaults` with `GULUserDefaults` to avoid potential crashes. (#2443) +- [fixed] Replaced `NSUserDefaults` with `NSUserDefaults` to avoid potential crashes. (#2443) # 3.3.1 - [changed] Internal code cleanup. diff --git a/FirebaseMessaging/Sources/FIRMessaging.m b/FirebaseMessaging/Sources/FIRMessaging.m index c9665ebd06f..d3340fd4454 100644 --- a/FirebaseMessaging/Sources/FIRMessaging.m +++ b/FirebaseMessaging/Sources/FIRMessaging.m @@ -23,7 +23,6 @@ #import #import #import -#import #import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "FirebaseInstallations/Source/Library/Private/FirebaseInstallationsInternal.h" #import "FirebaseMessaging/Interop/FIRMessagingInterop.h" @@ -105,7 +104,7 @@ @interface FIRMessaging () @property(nonatomic, readwrite, strong) FIRMessagingPubSub *pubsub; @property(nonatomic, readwrite, strong) FIRMessagingRmqManager *rmq2Manager; @property(nonatomic, readwrite, strong) FIRMessagingSyncMessageManager *syncMessageManager; -@property(nonatomic, readwrite, strong) GULUserDefaults *messagingUserDefaults; +@property(nonatomic, readwrite, strong) NSUserDefaults *messagingUserDefaults; @property(nonatomic, readwrite, strong) FIRInstallations *installations; @property(nonatomic, readwrite, strong) FIRMessagingTokenManager *tokenManager; @property(nonatomic, readwrite, strong) FIRHeartbeatLogger *heartbeatLogger; @@ -140,7 +139,7 @@ + (FIRMessagingExtensionHelper *)extensionHelper { return extensionHelper; } - (instancetype)initWithAnalytics:(nullable id)analytics - userDefaults:(GULUserDefaults *)defaults + userDefaults:(NSUserDefaults *)defaults heartbeatLogger:(FIRHeartbeatLogger *)heartbeatLogger { self = [super init]; if (self != nil) { @@ -179,7 +178,7 @@ + (void)load { id analytics = FIR_COMPONENT(FIRAnalyticsInterop, container); FIRMessaging *messaging = [[FIRMessaging alloc] initWithAnalytics:analytics - userDefaults:[GULUserDefaults standardUserDefaults] + userDefaults:[NSUserDefaults standardUserDefaults] heartbeatLogger:container.app.heartbeatLogger]; [messaging start]; [messaging configureMessagingWithOptions:container.app.options]; @@ -473,7 +472,7 @@ - (BOOL)isAutoInitEnabled { /// entry without context of which FIRApp instance is being used. /// ** THIS METHOD IS DEPENDED ON INTERNALLY BY IID USING REFLECTION. PLEASE DO NOT CHANGE THE /// SIGNATURE, AS IT WOULD BREAK AUTOINIT FUNCTIONALITY WITHIN IID. ** -+ (BOOL)isAutoInitEnabledWithUserDefaults:(GULUserDefaults *)userDefaults { ++ (BOOL)isAutoInitEnabledWithUserDefaults:(NSUserDefaults *)userDefaults { // Check storage id isAutoInitEnabledObject = [userDefaults objectForKey:kFIRMessagingUserDefaultsKeyAutoInitEnabled]; diff --git a/FirebaseMessaging/Sources/FIRMessagingPubSub.m b/FirebaseMessaging/Sources/FIRMessagingPubSub.m index 6f2db561553..32d46adeead 100644 --- a/FirebaseMessaging/Sources/FIRMessagingPubSub.m +++ b/FirebaseMessaging/Sources/FIRMessagingPubSub.m @@ -16,7 +16,6 @@ #import "FirebaseMessaging/Sources/FIRMessagingPubSub.h" -#import #import "FirebaseMessaging/Sources/FIRMessagingDefines.h" #import "FirebaseMessaging/Sources/FIRMessagingLogger.h" #import "FirebaseMessaging/Sources/FIRMessagingPendingTopicsList.h" @@ -223,7 +222,7 @@ - (BOOL)pendingTopicsListCanRequestTopicUpdates:(FIRMessagingPendingTopicsList * #pragma mark - Storing Pending Topics - (void)archivePendingTopicsList:(FIRMessagingPendingTopicsList *)topicsList { - GULUserDefaults *defaults = [GULUserDefaults standardUserDefaults]; + NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; NSError *error; NSData *pendingData = [NSKeyedArchiver archivedDataWithRootObject:topicsList requiringSecureCoding:YES @@ -238,7 +237,7 @@ - (void)archivePendingTopicsList:(FIRMessagingPendingTopicsList *)topicsList { } - (void)restorePendingTopicsList { - GULUserDefaults *defaults = [GULUserDefaults standardUserDefaults]; + NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; NSData *pendingData = [defaults objectForKey:kPendingSubscriptionsListKey]; FIRMessagingPendingTopicsList *subscriptions; if (pendingData) { diff --git a/FirebaseMessaging/Sources/FIRMessagingUtilities.h b/FirebaseMessaging/Sources/FIRMessagingUtilities.h index f2b10d9f06d..6bcd5171b93 100644 --- a/FirebaseMessaging/Sources/FIRMessagingUtilities.h +++ b/FirebaseMessaging/Sources/FIRMessagingUtilities.h @@ -39,7 +39,7 @@ FOUNDATION_EXPORT NSSearchPathDirectory FIRMessagingSupportedDirectory(void); #pragma mark - Device Info FOUNDATION_EXPORT NSString *FIRMessagingCurrentLocale(void); FOUNDATION_EXPORT BOOL FIRMessagingHasLocaleChanged(void); -/// locale key stored in GULUserDefaults +/// locale key stored in NSUserDefaults FOUNDATION_EXPORT NSString *const kFIRMessagingInstanceIDUserDefaultsKeyLocale; FOUNDATION_EXPORT NSString *FIRMessagingStringForAPNSDeviceToken(NSData *deviceToken); diff --git a/FirebaseMessaging/Sources/FIRMessagingUtilities.m b/FirebaseMessaging/Sources/FIRMessagingUtilities.m index 2d9bddb5187..55264e9aa85 100644 --- a/FirebaseMessaging/Sources/FIRMessagingUtilities.m +++ b/FirebaseMessaging/Sources/FIRMessagingUtilities.m @@ -17,12 +17,11 @@ #import "FirebaseMessaging/Sources/FIRMessagingUtilities.h" #import -#import #import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "FirebaseMessaging/Sources/FIRMessagingLogger.h" NSString *const kFIRMessagingInstanceIDUserDefaultsKeyLocale = - @"com.firebase.instanceid.user_defaults.locale"; // locale key stored in GULUserDefaults + @"com.firebase.instanceid.user_defaults.locale"; // locale key stored in NSUserDefaults static NSString *const kFIRMessagingAPNSSandboxPrefix = @"s_"; static NSString *const kFIRMessagingAPNSProdPrefix = @"p_"; @@ -261,7 +260,7 @@ NSSearchPathDirectory FIRMessagingSupportedDirectory(void) { } BOOL FIRMessagingHasLocaleChanged(void) { - NSString *lastLocale = [[GULUserDefaults standardUserDefaults] + NSString *lastLocale = [[NSUserDefaults standardUserDefaults] stringForKey:kFIRMessagingInstanceIDUserDefaultsKeyLocale]; NSString *currentLocale = FIRMessagingCurrentLocale(); if (lastLocale) { diff --git a/FirebaseMessaging/Sources/Token/FIRMessagingCheckinPreferences.m b/FirebaseMessaging/Sources/Token/FIRMessagingCheckinPreferences.m index b9291428e0b..dd6b106b2ba 100644 --- a/FirebaseMessaging/Sources/Token/FIRMessagingCheckinPreferences.m +++ b/FirebaseMessaging/Sources/Token/FIRMessagingCheckinPreferences.m @@ -16,7 +16,6 @@ #import "FirebaseMessaging/Sources/Token/FIRMessagingCheckinPreferences.h" -#import #import "FirebaseMessaging/Sources/FIRMessagingUtilities.h" #import "FirebaseMessaging/Sources/Token/FIRMessagingCheckinService.h" @@ -92,15 +91,15 @@ - (BOOL)hasValidCheckinInfo { int64_t timeSinceLastCheckinInMillis = currentTimestampInMillis - self.lastCheckinTimestampMillis; BOOL hasCheckinInfo = [self hasCheckinInfo]; - NSString *lastLocale = [[GULUserDefaults standardUserDefaults] + NSString *lastLocale = [[NSUserDefaults standardUserDefaults] stringForKey:kFIRMessagingInstanceIDUserDefaultsKeyLocale]; // If it's app's first time open and checkin is already fetched and no locale information is // stored, then checkin info is valid. We should not checkin again because locale is considered // "changed". if (hasCheckinInfo && !lastLocale) { NSString *currentLocale = FIRMessagingCurrentLocale(); - [[GULUserDefaults standardUserDefaults] setObject:currentLocale - forKey:kFIRMessagingInstanceIDUserDefaultsKeyLocale]; + [[NSUserDefaults standardUserDefaults] setObject:currentLocale + forKey:kFIRMessagingInstanceIDUserDefaultsKeyLocale]; return YES; } @@ -108,8 +107,8 @@ - (BOOL)hasValidCheckinInfo { // Also update locale information if changed. (Only do it here not in token refresh) if (FIRMessagingHasLocaleChanged()) { NSString *currentLocale = FIRMessagingCurrentLocale(); - [[GULUserDefaults standardUserDefaults] setObject:currentLocale - forKey:kFIRMessagingInstanceIDUserDefaultsKeyLocale]; + [[NSUserDefaults standardUserDefaults] setObject:currentLocale + forKey:kFIRMessagingInstanceIDUserDefaultsKeyLocale]; return NO; } diff --git a/FirebaseMessaging/Tests/UnitTests/FIRMessagingHandlingTest.m b/FirebaseMessaging/Tests/UnitTests/FIRMessagingHandlingTest.m index 92509ec26a7..d3b73b6fa60 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRMessagingHandlingTest.m +++ b/FirebaseMessaging/Tests/UnitTests/FIRMessagingHandlingTest.m @@ -18,7 +18,6 @@ #import -#import #import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "FirebaseMessaging/Sources/Public/FirebaseMessaging/FIRMessaging.h" #import "Interop/Analytics/Public/FIRAnalyticsInterop.h" diff --git a/FirebaseMessaging/Tests/UnitTests/FIRMessagingLinkHandlingTest.m b/FirebaseMessaging/Tests/UnitTests/FIRMessagingLinkHandlingTest.m index 3abcbf069b6..d7594fcd0d0 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRMessagingLinkHandlingTest.m +++ b/FirebaseMessaging/Tests/UnitTests/FIRMessagingLinkHandlingTest.m @@ -17,7 +17,6 @@ #import #import -#import #import "FirebaseMessaging/Sources/FIRMessagingConstants.h" #import "FirebaseMessaging/Sources/Public/FirebaseMessaging/FIRMessaging.h" #import "FirebaseMessaging/Tests/UnitTests/FIRMessagingTestNotificationUtilities.h" diff --git a/FirebaseMessaging/Tests/UnitTests/FIRMessagingServiceTest.m b/FirebaseMessaging/Tests/UnitTests/FIRMessagingServiceTest.m index dd0b1103e64..e9fa47a67d2 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRMessagingServiceTest.m +++ b/FirebaseMessaging/Tests/UnitTests/FIRMessagingServiceTest.m @@ -17,7 +17,6 @@ #import #import -#import #import "FirebaseInstallations/Source/Library/Private/FirebaseInstallationsInternal.h" #import "FirebaseMessaging/Sources/FIRMessagingPubSub.h" #import "FirebaseMessaging/Sources/FIRMessagingTopicsCommon.h" diff --git a/FirebaseMessaging/Tests/UnitTests/FIRMessagingTest.m b/FirebaseMessaging/Tests/UnitTests/FIRMessagingTest.m index 8ef1952552e..f417d1be939 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRMessagingTest.m +++ b/FirebaseMessaging/Tests/UnitTests/FIRMessagingTest.m @@ -17,7 +17,6 @@ #import #import -#import #import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "FirebaseMessaging/Sources/FIRMessaging_Private.h" #import "FirebaseMessaging/Sources/Public/FirebaseMessaging/FIRMessaging.h" diff --git a/FirebaseMessaging/Tests/UnitTests/FIRMessagingTestUtilities.h b/FirebaseMessaging/Tests/UnitTests/FIRMessagingTestUtilities.h index 14f9146ec20..4d68041b029 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRMessagingTestUtilities.h +++ b/FirebaseMessaging/Tests/UnitTests/FIRMessagingTestUtilities.h @@ -21,7 +21,7 @@ #import "FirebaseMessaging/Sources/FIRMessagingPendingTopicsList.h" #import "FirebaseMessaging/Sources/FIRMessagingTopicsCommon.h" -@class GULUserDefaults; +@class NSUserDefaults; @class XCTestCase; NS_ASSUME_NONNULL_BEGIN diff --git a/FirebaseMessaging/Tests/UnitTests/FIRMessagingTestUtilities.m b/FirebaseMessaging/Tests/UnitTests/FIRMessagingTestUtilities.m index c653d111fc1..def7b7c7630 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRMessagingTestUtilities.m +++ b/FirebaseMessaging/Tests/UnitTests/FIRMessagingTestUtilities.m @@ -16,7 +16,6 @@ #import -#import #import "FirebaseCore/Extension/FirebaseCoreInternal.h" #import "FirebaseInstallations/Source/Library/Private/FirebaseInstallationsInternal.h" #import "FirebaseMessaging/Sources/FIRMessagingPubSub.h" @@ -41,7 +40,7 @@ @interface FIRMessaging (ExposedForTest) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" - (instancetype)initWithAnalytics:(nullable id)analytics - userDefaults:(GULUserDefaults *)defaults + userDefaults:(NSUserDefaults *)defaults heartbeatLogger:(nullable FIRHeartbeatLogger *)heartbeatLogger; #pragma clang diagnostic pop /// Kicks off required calls for some messaging tests. @@ -83,7 +82,7 @@ @implementation FIRMessagingTestUtilities { id _mockMessagingClass; } -- (instancetype)initWithUserDefaults:(GULUserDefaults *)userDefaults +- (instancetype)initWithUserDefaults:(NSUserDefaults *)userDefaults withRMQManager:(BOOL)withRMQManager { self = [super init]; if (self) { diff --git a/FirebasePerformance.podspec b/FirebasePerformance.podspec index 6bcf58249df..ddcff983859 100644 --- a/FirebasePerformance.podspec +++ b/FirebasePerformance.podspec @@ -67,7 +67,6 @@ Firebase Performance library to measure performance of Mobile and Web Apps. s.dependency 'GoogleUtilities/Environment', '~> 8.0' s.dependency 'GoogleUtilities/ISASwizzler', '~> 8.0' s.dependency 'GoogleUtilities/MethodSwizzler', '~> 8.0' - s.dependency 'GoogleUtilities/UserDefaults', '~> 8.0' s.dependency 'nanopb', '>= 2.30908.0', '< 2.30911.0' s.test_spec 'unit' do |unit_tests| diff --git a/FirebasePerformance/Sources/Configurations/FPRConfigurations+Private.h b/FirebasePerformance/Sources/Configurations/FPRConfigurations+Private.h index 80533634df9..72d0864a3db 100644 --- a/FirebasePerformance/Sources/Configurations/FPRConfigurations+Private.h +++ b/FirebasePerformance/Sources/Configurations/FPRConfigurations+Private.h @@ -17,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN -@class GULUserDefaults; +@class NSUserDefaults; /** List of gauges the gauge manager controls. */ typedef NS_OPTIONS(NSUInteger, FPRConfigurationSource) { @@ -38,7 +38,7 @@ typedef NS_OPTIONS(NSUInteger, FPRConfigurationSource) { @property(nonatomic) Class FIRAppClass; /** @brief User defaults used for user preference config fetches . */ -@property(nonatomic) GULUserDefaults *userDefaults; +@property(nonatomic) NSUserDefaults *userDefaults; /** @brief The main bundle identifier used by config system. */ @property(nonatomic) NSString *mainBundleIdentifier; diff --git a/FirebasePerformance/Sources/Configurations/FPRConfigurations.m b/FirebasePerformance/Sources/Configurations/FPRConfigurations.m index 614a6f783b9..9eae801c39c 100644 --- a/FirebasePerformance/Sources/Configurations/FPRConfigurations.m +++ b/FirebasePerformance/Sources/Configurations/FPRConfigurations.m @@ -14,8 +14,6 @@ #import -#import - #import "FirebasePerformance/Sources/Common/FPRConstants.h" #import "FirebasePerformance/Sources/Configurations/FPRConfigurations+Private.h" #import "FirebasePerformance/Sources/Configurations/FPRConfigurations.h" @@ -60,9 +58,9 @@ + (instancetype)sharedInstance { + (void)reset { // TODO(b/120032990): Reset the singletons that this singleton uses. gSharedInstanceToken = 0; - [[GULUserDefaults standardUserDefaults] + [[NSUserDefaults standardUserDefaults] removeObjectForKey:kFPRConfigInstrumentationUserPreference]; - [[GULUserDefaults standardUserDefaults] removeObjectForKey:kFPRConfigCollectionUserPreference]; + [[NSUserDefaults standardUserDefaults] removeObjectForKey:kFPRConfigCollectionUserPreference]; } - (instancetype)initWithSources:(FPRConfigurationSource)source { @@ -75,7 +73,7 @@ - (instancetype)initWithSources:(FPRConfigurationSource)source { [self registerForNotifications]; self.FIRAppClass = [FIRApp class]; - self.userDefaults = [GULUserDefaults standardUserDefaults]; + self.userDefaults = [NSUserDefaults standardUserDefaults]; self.infoDictionary = [NSBundle mainBundle].infoDictionary; self.mainBundleIdentifier = [NSBundle mainBundle].bundleIdentifier; self.updateQueue = dispatch_queue_create("com.google.perf.configUpdate", DISPATCH_QUEUE_SERIAL); @@ -143,7 +141,7 @@ - (void)setDataCollectionEnabled:(BOOL)dataCollectionEnabled { // The data collection flag is determined by this order: // 1. A plist flag for permanently disabling data collection -// 2. The runtime flag (GULUserDefaults) +// 2. The runtime flag (NSUserDefaults) // 3. A plist flag for enabling/disabling (overrideable) // 4. The global data collection switch from Core. - (BOOL)isDataCollectionEnabled { @@ -167,7 +165,7 @@ - (BOOL)isDataCollectionEnabled { } } /** - * Check if the performance collection preference key is available in GULUserDefaults. + * Check if the performance collection preference key is available in NSUserDefaults. * If it exists - Just honor that and return that value. * If it does not exist - Check if firebase_performance_collection_enabled exists in Info.plist. * If it exists - honor that and return that value. @@ -198,7 +196,7 @@ - (BOOL)isInstrumentationEnabled { [self.userDefaults objectForKey:kFPRConfigInstrumentationUserPreference]; /** - * Check if the performance instrumentation preference key is available in GULUserDefaults. + * Check if the performance instrumentation preference key is available in NSUserDefaults. * If it exists - Just honor that and return that value. * If not - Check if firebase_performance_instrumentation_enabled exists in Info.plist. * If it exists - honor that and return that value. @@ -244,7 +242,7 @@ - (BOOL)diagnosticsEnabled { BOOL enabled = NO; /** - * Check if the diagnostics preference key is available in GULUserDefaults. + * Check if the diagnostics preference key is available in NSUserDefaults. * If it exists - Just honor that and return that value. * If not - Check if firebase_performance_instrumentation_enabled exists in Info.plist. * If it exists - honor that and return that value. @@ -284,7 +282,7 @@ - (int)logSource { * Order of preference of returning the log source. * If it is an autopush build (based on environment variable), always return * LogRequest_LogSource_FireperfAutopush (461). If there is a recent value of remote config fetch, - * honor that value. If logSource cached value (GULUserDefaults value) exists, honor that. + * honor that value. If logSource cached value (NSUserDefaults value) exists, honor that. * Fallback to the default value LogRequest_LogSource_Fireperf (462). */ int logSource = 462; diff --git a/FirebasePerformance/Sources/Configurations/FPRRemoteConfigFlags+Private.h b/FirebasePerformance/Sources/Configurations/FPRRemoteConfigFlags+Private.h index 9279d457f07..ef6e20bd6b8 100644 --- a/FirebasePerformance/Sources/Configurations/FPRRemoteConfigFlags+Private.h +++ b/FirebasePerformance/Sources/Configurations/FPRRemoteConfigFlags+Private.h @@ -18,7 +18,7 @@ NS_ASSUME_NONNULL_BEGIN -@class GULUserDefaults; +@class NSUserDefaults; static NSString *const kFPRConfigPrefix = @"com.fireperf"; @@ -38,7 +38,7 @@ static NSInteger const kFPRMinAppStartConfigFetchDelayInSeconds = 5; @property(atomic, nullable) NSDate *lastFetchedTime; /** @brief User defaults used for caching. */ -@property(nonatomic) GULUserDefaults *userDefaults; +@property(nonatomic) NSUserDefaults *userDefaults; /** @brief Last activated time of the configurations. */ @property(nonatomic) NSDate *applicationStartTime; diff --git a/FirebasePerformance/Sources/Configurations/FPRRemoteConfigFlags.m b/FirebasePerformance/Sources/Configurations/FPRRemoteConfigFlags.m index 86f1280b812..f7aece09467 100644 --- a/FirebasePerformance/Sources/Configurations/FPRRemoteConfigFlags.m +++ b/FirebasePerformance/Sources/Configurations/FPRRemoteConfigFlags.m @@ -12,12 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import - +#import "FirebasePerformance/Sources/Configurations/FPRRemoteConfigFlags.h" #import "FirebasePerformance/Sources/Configurations/FPRConfigurations+Private.h" #import "FirebasePerformance/Sources/Configurations/FPRConfigurations.h" #import "FirebasePerformance/Sources/Configurations/FPRRemoteConfigFlags+Private.h" -#import "FirebasePerformance/Sources/Configurations/FPRRemoteConfigFlags.h" #import "FirebasePerformance/Sources/FPRConsoleLogger.h" diff --git a/FirebasePerformance/Tests/Unit/Configurations/FPRRemoteConfigFlagsTest.m b/FirebasePerformance/Tests/Unit/Configurations/FPRRemoteConfigFlagsTest.m index d0dc48d9a73..91068e887dc 100644 --- a/FirebasePerformance/Tests/Unit/Configurations/FPRRemoteConfigFlagsTest.m +++ b/FirebasePerformance/Tests/Unit/Configurations/FPRRemoteConfigFlagsTest.m @@ -12,7 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import #import #import "FirebasePerformance/Sources/Configurations/FPRConfigurations+Private.h" @@ -50,7 +49,7 @@ - (void)testCacheResetAfterEverySuccessfulFetch { FPRFakeRemoteConfig *remoteConfig = [[FPRFakeRemoteConfig alloc] init]; FPRRemoteConfigFlags *configFlags = [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig]; - configFlags.userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil]; + configFlags.userDefaults = [[NSUserDefaults alloc] initWithSuiteName:nil]; // Provide expected remote config values FIRRemoteConfigValue *boolRCValueFromRemote = @@ -265,7 +264,7 @@ - (void)testConfigFetchForSDKEnabledFromCache { FPRRemoteConfigFlags *configFlags = [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig]; - GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil]; + NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:nil]; configFlags.userDefaults = userDefaults; NSString *configKey = [NSString stringWithFormat:@"%@.%@", kFPRConfigPrefix, @"fpr_enabled"]; @@ -282,7 +281,7 @@ - (void)testConfigCacheForSDKEnabled { FPRRemoteConfigFlags *configFlags = [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig]; - GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil]; + NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:nil]; configFlags.userDefaults = userDefaults; [configFlags resetCache]; @@ -317,7 +316,7 @@ - (void)testConfigFetchForLogSourceFromCache { FPRRemoteConfigFlags *configFlags = [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig]; - GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil]; + NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:nil]; configFlags.userDefaults = userDefaults; NSString *configKey = [NSString stringWithFormat:@"%@.%@", kFPRConfigPrefix, @"fpr_log_source"]; @@ -334,7 +333,7 @@ - (void)testConfigCacheForLogSource { FPRRemoteConfigFlags *configFlags = [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig]; - GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil]; + NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:nil]; configFlags.userDefaults = userDefaults; [configFlags resetCache]; @@ -371,7 +370,7 @@ - (void)testConfigFetchForRateLimitDurationFromCache { FPRRemoteConfigFlags *configFlags = [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig]; - GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil]; + NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:nil]; configFlags.userDefaults = userDefaults; NSString *configKey = @@ -389,7 +388,7 @@ - (void)testConfigCacheForRateLimitDuration { FPRRemoteConfigFlags *configFlags = [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig]; - GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil]; + NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:nil]; configFlags.userDefaults = userDefaults; [configFlags resetCache]; @@ -424,7 +423,7 @@ - (void)testConfigFetchForTraceEventCountInForegroundFromCache { FPRRemoteConfigFlags *configFlags = [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig]; - GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil]; + NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:nil]; configFlags.userDefaults = userDefaults; NSString *configKey = @@ -442,7 +441,7 @@ - (void)testConfigCacheForTraceEventCountInForeground { FPRRemoteConfigFlags *configFlags = [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig]; - GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil]; + NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:nil]; configFlags.userDefaults = userDefaults; [configFlags resetCache]; @@ -477,7 +476,7 @@ - (void)testConfigFetchForTraceEventCountInBackgroundFromCache { FPRRemoteConfigFlags *configFlags = [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig]; - GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil]; + NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:nil]; configFlags.userDefaults = userDefaults; NSString *configKey = @@ -495,7 +494,7 @@ - (void)testConfigCacheForTraceEventCountInBackground { FPRRemoteConfigFlags *configFlags = [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig]; - GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil]; + NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:nil]; configFlags.userDefaults = userDefaults; [configFlags resetCache]; @@ -530,7 +529,7 @@ - (void)testConfigFetchForNetworkTraceEventCountInForegroundFromCache { FPRRemoteConfigFlags *configFlags = [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig]; - GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil]; + NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:nil]; configFlags.userDefaults = userDefaults; NSString *configKey = [NSString @@ -548,7 +547,7 @@ - (void)testConfigCacheForNetworkTraceEventCountInForeground { FPRRemoteConfigFlags *configFlags = [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig]; - GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil]; + NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:nil]; configFlags.userDefaults = userDefaults; [configFlags resetCache]; @@ -583,7 +582,7 @@ - (void)testConfigFetchForNetworkTraceEventCountInBackgroundFromCache { FPRRemoteConfigFlags *configFlags = [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig]; - GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil]; + NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:nil]; configFlags.userDefaults = userDefaults; NSString *configKey = [NSString @@ -601,7 +600,7 @@ - (void)testConfigCacheForNetworkTraceEventCountInBackground { FPRRemoteConfigFlags *configFlags = [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig]; - GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil]; + NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:nil]; configFlags.userDefaults = userDefaults; [configFlags resetCache]; @@ -638,7 +637,7 @@ - (void)testConfigFetchForTraceSamplingRateFromCache { FPRRemoteConfigFlags *configFlags = [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig]; - GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil]; + NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:nil]; configFlags.userDefaults = userDefaults; NSString *configKey = @@ -656,7 +655,7 @@ - (void)testConfigCacheForTraceSamplingRate { FPRRemoteConfigFlags *configFlags = [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig]; - GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil]; + NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:nil]; configFlags.userDefaults = userDefaults; [configFlags resetCache]; @@ -691,7 +690,7 @@ - (void)testConfigFetchForNetworkSamplingRateFromCache { FPRRemoteConfigFlags *configFlags = [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig]; - GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil]; + NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:nil]; configFlags.userDefaults = userDefaults; NSString *configKey = [NSString @@ -709,7 +708,7 @@ - (void)testConfigCacheForNetworkSamplingRate { FPRRemoteConfigFlags *configFlags = [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig]; - GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil]; + NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:nil]; configFlags.userDefaults = userDefaults; [configFlags resetCache]; @@ -746,7 +745,7 @@ - (void)testConfigFetchForSessionSamplingRateFromCache { FPRRemoteConfigFlags *configFlags = [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig]; - GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil]; + NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:nil]; configFlags.userDefaults = userDefaults; NSString *configKey = @@ -764,7 +763,7 @@ - (void)testConfigCacheForSessionSamplingRate { FPRRemoteConfigFlags *configFlags = [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig]; - GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil]; + NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:nil]; configFlags.userDefaults = userDefaults; [configFlags resetCache]; @@ -799,7 +798,7 @@ - (void)testConfigFetchForCPUGaugeCollectionFrequencyInForegroundFromCache { FPRRemoteConfigFlags *configFlags = [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig]; - GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil]; + NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:nil]; configFlags.userDefaults = userDefaults; NSString *configKey = @@ -819,7 +818,7 @@ - (void)testConfigCacheForCPUGaugeCollectionFrequencyInForeground { FPRRemoteConfigFlags *configFlags = [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig]; - GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil]; + NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:nil]; configFlags.userDefaults = userDefaults; [configFlags resetCache]; @@ -859,7 +858,7 @@ - (void)testConfigFetchForCPUGaugeCollectionFrequencyInBackgroundFromCache { FPRRemoteConfigFlags *configFlags = [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig]; - GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil]; + NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:nil]; configFlags.userDefaults = userDefaults; NSString *configKey = @@ -879,7 +878,7 @@ - (void)testConfigCacheForCPUGaugeCollectionFrequencyInBackground { FPRRemoteConfigFlags *configFlags = [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig]; - GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil]; + NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:nil]; configFlags.userDefaults = userDefaults; [configFlags resetCache]; @@ -919,7 +918,7 @@ - (void)testConfigFetchForMemoryGaugeCollectionFrequencyInForegroundFromCache { FPRRemoteConfigFlags *configFlags = [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig]; - GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil]; + NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:nil]; configFlags.userDefaults = userDefaults; NSString *configKey = @@ -940,7 +939,7 @@ - (void)testConfigCacheForMemoryGaugeCollectionFrequencyInForeground { FPRRemoteConfigFlags *configFlags = [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig]; - GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil]; + NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:nil]; configFlags.userDefaults = userDefaults; [configFlags resetCache]; @@ -981,7 +980,7 @@ - (void)testConfigFetchForMemoryGaugeCollectionFrequencyInBackgroundFromCache { FPRRemoteConfigFlags *configFlags = [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig]; - GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil]; + NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:nil]; configFlags.userDefaults = userDefaults; NSString *configKey = @@ -1002,7 +1001,7 @@ - (void)testConfigCacheForMemoryGaugeCollectionFrequencyInBackground { FPRRemoteConfigFlags *configFlags = [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig]; - GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil]; + NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:nil]; configFlags.userDefaults = userDefaults; [configFlags resetCache]; @@ -1043,7 +1042,7 @@ - (void)testConfigFetchForSessionMaxDurationFromCache { FPRRemoteConfigFlags *configFlags = [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig]; - GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil]; + NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:nil]; configFlags.userDefaults = userDefaults; NSString *configKey = @@ -1061,7 +1060,7 @@ - (void)testConfigCacheForSessionMaxDuration { FPRRemoteConfigFlags *configFlags = [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig]; - GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil]; + NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:nil]; configFlags.userDefaults = userDefaults; [configFlags resetCache]; @@ -1096,7 +1095,7 @@ - (void)testConfigFetchForSDKDisabledVersionsFromCache { FPRRemoteConfigFlags *configFlags = [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig]; - GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil]; + NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:nil]; configFlags.userDefaults = userDefaults; NSSet *versionSet = @@ -1118,7 +1117,7 @@ - (void)testConfigCacheForSDKDisabledVersions { FPRRemoteConfigFlags *configFlags = [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig]; - GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil]; + NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:nil]; configFlags.userDefaults = userDefaults; NSString *sdkVersions = @"1.0.2;1.0.3"; @@ -1155,7 +1154,7 @@ - (void)testConfigFetchForPerformanceDisabledVersionsWithWildcard { FPRRemoteConfigFlags *configFlags = [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig]; - GULUserDefaults *userDefaults = [[GULUserDefaults alloc] initWithSuiteName:nil]; + NSUserDefaults *userDefaults = [[NSUserDefaults alloc] initWithSuiteName:nil]; configFlags.userDefaults = userDefaults; NSString *sdkVersions = @" 1.0.2 ; 1.0.3 "; diff --git a/FirebaseSessions.podspec b/FirebaseSessions.podspec index 8685d6c61af..44f72f7361f 100644 --- a/FirebaseSessions.podspec +++ b/FirebaseSessions.podspec @@ -44,7 +44,6 @@ Pod::Spec.new do |s| s.dependency 'FirebaseInstallations', '~> 11.0' s.dependency 'GoogleDataTransport', '~> 10.0' s.dependency 'GoogleUtilities/Environment', '~> 8.0' - s.dependency 'GoogleUtilities/UserDefaults', '~> 8.0' s.dependency 'nanopb', '>= 2.30908.0', '< 2.30911.0' s.dependency 'PromisesSwift', '~> 2.1' diff --git a/FirebaseSessions/Sources/Settings/SettingsCacheClient.swift b/FirebaseSessions/Sources/Settings/SettingsCacheClient.swift index f02b4dd17a6..fc3b7b31c9d 100644 --- a/FirebaseSessions/Sources/Settings/SettingsCacheClient.swift +++ b/FirebaseSessions/Sources/Settings/SettingsCacheClient.swift @@ -15,12 +15,6 @@ import Foundation -#if SWIFT_PACKAGE - @_implementationOnly import GoogleUtilities_UserDefaults -#else - @_implementationOnly import GoogleUtilities -#endif // SWIFT_PACKAGE - /// CacheKey is like a "key" to a "safe". It provides necessary metadata about the current cache to /// know if it should be expired. struct CacheKey: Codable { @@ -54,7 +48,7 @@ class SettingsCache: SettingsCacheClient { /// UserDefaults holds values in memory, making access O(1) and synchronous within the app, while /// abstracting away async disk IO. - private let cache: GULUserDefaults = .standard() + private let cache: UserDefaults = .standard /// Converting to dictionary is O(1) because object conversion is O(1) var cacheContent: [String: Any] { @@ -62,7 +56,7 @@ class SettingsCache: SettingsCacheClient { return (cache.object(forKey: UserDefaultsKeys.forContent) as? [String: Any]) ?? [:] } set { - cache.setObject(newValue, forKey: UserDefaultsKeys.forContent) + cache.set(newValue, forKey: UserDefaultsKeys.forContent) } } @@ -80,7 +74,7 @@ class SettingsCache: SettingsCacheClient { } set { do { - try cache.setObject(JSONEncoder().encode(newValue), forKey: UserDefaultsKeys.forCacheKey) + try cache.set(JSONEncoder().encode(newValue), forKey: UserDefaultsKeys.forCacheKey) } catch { Logger.logError("[Settings] Encoding CacheKey failed with error: \(error)") } @@ -89,7 +83,7 @@ class SettingsCache: SettingsCacheClient { /// Removes stored cache func removeCache() { - cache.setObject(nil, forKey: UserDefaultsKeys.forContent) - cache.setObject(nil, forKey: UserDefaultsKeys.forCacheKey) + cache.set(nil, forKey: UserDefaultsKeys.forContent) + cache.set(nil, forKey: UserDefaultsKeys.forCacheKey) } } diff --git a/Package.swift b/Package.swift index e0a352ad5c1..30301b41e58 100644 --- a/Package.swift +++ b/Package.swift @@ -385,7 +385,6 @@ let package = Package( "FirebaseCore", "FirebaseInstallations", .product(name: "GULAppDelegateSwizzler", package: "GoogleUtilities"), - .product(name: "GULUserDefaults", package: "GoogleUtilities"), ], path: "FirebaseAppDistribution/Sources", publicHeadersPath: "Public", @@ -584,7 +583,6 @@ let package = Package( "FirebaseAppCheckInterop", "FirebaseCore", "leveldb", - .product(name: "GULUserDefaults", package: "GoogleUtilities"), ], path: "FirebaseDatabase/Sources", exclude: [ @@ -763,7 +761,6 @@ let package = Package( "FirebaseInstallations", "FirebaseABTesting", .product(name: "GULEnvironment", package: "GoogleUtilities"), - .product(name: "GULUserDefaults", package: "GoogleUtilities"), .product(name: "nanopb", package: "nanopb"), .target(name: "FirebaseInAppMessaging_iOS", condition: .when(platforms: [.iOS])), ], @@ -799,7 +796,6 @@ let package = Package( "FirebaseCore", .product(name: "FBLPromises", package: "Promises"), .product(name: "GULEnvironment", package: "GoogleUtilities"), - .product(name: "GULUserDefaults", package: "GoogleUtilities"), ], path: "FirebaseInstallations/Source/Library", resources: [.process("Resources/PrivacyInfo.xcprivacy")], @@ -819,7 +815,6 @@ let package = Package( "FirebaseInstallations", .product(name: "GoogleDataTransport", package: "GoogleDataTransport"), .product(name: "GULLogger", package: "GoogleUtilities"), - .product(name: "GULUserDefaults", package: "GoogleUtilities"), .product(name: "SwiftProtobuf", package: "swift-protobuf"), ], path: "FirebaseMLModelDownloader/Sources", @@ -844,7 +839,6 @@ let package = Package( .product(name: "GULAppDelegateSwizzler", package: "GoogleUtilities"), .product(name: "GULEnvironment", package: "GoogleUtilities"), .product(name: "GULReachability", package: "GoogleUtilities"), - .product(name: "GULUserDefaults", package: "GoogleUtilities"), .product(name: "GoogleDataTransport", package: "GoogleDataTransport"), .product(name: "nanopb", package: "nanopb"), ], @@ -906,7 +900,6 @@ let package = Package( .product(name: "GULEnvironment", package: "GoogleUtilities"), .product(name: "GULISASwizzler", package: "GoogleUtilities"), .product(name: "GULMethodSwizzler", package: "GoogleUtilities"), - .product(name: "GULUserDefaults", package: "GoogleUtilities"), .product(name: "nanopb", package: "nanopb"), ], path: "FirebasePerformance/Sources", @@ -1072,7 +1065,6 @@ let package = Package( .product(name: "Promises", package: "Promises"), .product(name: "GoogleDataTransport", package: "GoogleDataTransport"), .product(name: "GULEnvironment", package: "GoogleUtilities"), - .product(name: "GULUserDefaults", package: "GoogleUtilities"), ], path: "FirebaseSessions/Sources", cSettings: [ @@ -1259,7 +1251,6 @@ let package = Package( .product(name: "AppCheckCore", package: "app-check"), .product(name: "FBLPromises", package: "Promises"), .product(name: "GULEnvironment", package: "GoogleUtilities"), - .product(name: "GULUserDefaults", package: "GoogleUtilities"), ], path: "FirebaseAppCheck/Sources", publicHeadersPath: "Public", diff --git a/SwiftPMTests/swift-test/all-imports.swift b/SwiftPMTests/swift-test/all-imports.swift index 0ef088ed520..678a3d9c7eb 100644 --- a/SwiftPMTests/swift-test/all-imports.swift +++ b/SwiftPMTests/swift-test/all-imports.swift @@ -45,7 +45,6 @@ import GoogleUtilities_Logger import GoogleUtilities_Network import GoogleUtilities_NSData import GoogleUtilities_Reachability -import GoogleUtilities_UserDefaults import nanopb import XCTest From 1fe1b1ebc0f5b44f2f8833aa22d7df72f6f27dff Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Wed, 5 Jun 2024 15:42:21 -0700 Subject: [PATCH 2/2] fixes --- .../Tests/Unit/ModelDownloaderUnitTests.swift | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/FirebaseMLModelDownloader/Tests/Unit/ModelDownloaderUnitTests.swift b/FirebaseMLModelDownloader/Tests/Unit/ModelDownloaderUnitTests.swift index ca4d0558a62..5cb03e153bf 100644 --- a/FirebaseMLModelDownloader/Tests/Unit/ModelDownloaderUnitTests.swift +++ b/FirebaseMLModelDownloader/Tests/Unit/ModelDownloaderUnitTests.swift @@ -1330,18 +1330,18 @@ } } - extension NSUserDefaults { + extension UserDefaults { /// Returns a new instance of user defaults. - static func createUnitTestInstance(testName: String) -> NSUserDefaults { + static func createUnitTestInstance(testName: String) -> UserDefaults { let suiteName = "com.google.firebase.ml.test.\(testName)" - let defaults = NSUserDefaults(suiteName: suiteName) - return defaults + let defaults = UserDefaults(suiteName: suiteName) + return defaults ?? UserDefaults.standard } /// Returns the existing user defaults instance. - static func getUnitTestInstance(testName: String) -> NSUserDefaults { + static func getUnitTestInstance(testName: String) -> UserDefaults { let suiteName = "com.google.firebase.ml.test.\(testName)" - return NSUserDefaults(suiteName: suiteName) + return UserDefaults(suiteName: suiteName) ?? UserDefaults.standard } }