From b8fdf488334da608d701117330692e60376e6fbd Mon Sep 17 00:00:00 2001 From: Ryan Wilson Date: Thu, 4 Jan 2018 14:21:01 -0500 Subject: Remove old FIROptions constructor. (#615) --- Firebase/Core/FIROptions.m | 39 --------------------------------------- Firebase/Core/Public/FIROptions.h | 19 ------------------- 2 files changed, 58 deletions(-) (limited to 'Firebase') diff --git a/Firebase/Core/FIROptions.m b/Firebase/Core/FIROptions.m index b53fa52..56a56ff 100644 --- a/Firebase/Core/FIROptions.m +++ b/Firebase/Core/FIROptions.m @@ -194,45 +194,6 @@ static NSDictionary *sDefaultOptionsDictionary = nil; #pragma mark - Public instance methods -- (instancetype)initWithGoogleAppID:(NSString *)googleAppID - bundleID:(NSString *)bundleID - GCMSenderID:(NSString *)GCMSenderID - APIKey:(NSString *)APIKey - clientID:(NSString *)clientID - trackingID:(NSString *)trackingID - androidClientID:(NSString *)androidClientID - databaseURL:(NSString *)databaseURL - storageBucket:(NSString *)storageBucket - deepLinkURLScheme:(NSString *)deepLinkURLScheme { - self = [super init]; - if (self) { - if (!googleAppID) { - [NSException raise:kFirebaseCoreErrorDomain format:@"Please specify a valid Google App ID."]; - } else if (!GCMSenderID) { - [NSException raise:kFirebaseCoreErrorDomain format:@"Please specify a valid GCM Sender ID."]; - } - - // `bundleID` is a required property, default to the main `bundleIdentifier` if it's `nil`. - if (!bundleID) { - bundleID = [[NSBundle mainBundle] bundleIdentifier]; - } - - NSMutableDictionary *mutableOptionsDict = [NSMutableDictionary dictionary]; - [mutableOptionsDict setValue:googleAppID forKey:kFIRGoogleAppID]; - [mutableOptionsDict setValue:bundleID forKey:kFIRBundleID]; - [mutableOptionsDict setValue:GCMSenderID forKey:kFIRGCMSenderID]; - [mutableOptionsDict setValue:APIKey forKey:kFIRAPIKey]; - [mutableOptionsDict setValue:clientID forKey:kFIRClientID]; - [mutableOptionsDict setValue:trackingID forKey:kFIRTrackingID]; - [mutableOptionsDict setValue:androidClientID forKey:kFIRAndroidClientID]; - [mutableOptionsDict setValue:databaseURL forKey:kFIRDatabaseURL]; - [mutableOptionsDict setValue:storageBucket forKey:kFIRStorageBucket]; - self.optionsDictionary = mutableOptionsDict; - self.deepLinkURLScheme = deepLinkURLScheme; - } - return self; -} - - (instancetype)initWithContentsOfFile:(NSString *)plistPath { self = [super init]; if (self) { diff --git a/Firebase/Core/Public/FIROptions.h b/Firebase/Core/Public/FIROptions.h index b4e3b3b..87a01dd 100644 --- a/Firebase/Core/Public/FIROptions.h +++ b/Firebase/Core/Public/FIROptions.h @@ -90,25 +90,6 @@ NS_SWIFT_NAME(FirebaseOptions) */ @property(nonatomic, copy, nullable) NSString *storageBucket; -/** - * Initializes a customized instance of FIROptions with keys. googleAppID, bundleID and GCMSenderID - * are required. Other keys may required for configuring specific services. - */ -- (instancetype)initWithGoogleAppID:(NSString *)googleAppID - bundleID:(NSString *)bundleID - GCMSenderID:(NSString *)GCMSenderID - APIKey:(NSString *)APIKey - clientID:(NSString *)clientID - trackingID:(NSString *)trackingID - androidClientID:(NSString *)androidClientID - databaseURL:(NSString *)databaseURL - storageBucket:(NSString *)storageBucket - deepLinkURLScheme:(NSString *)deepLinkURLScheme - DEPRECATED_MSG_ATTRIBUTE( - "Use `-[[FIROptions alloc] initWithGoogleAppID:GCMSenderID:]` " - "(`FirebaseOptions(googleAppID:gcmSenderID:)` in Swift)` and property " - "setters instead."); - /** * Initializes a customized instance of FIROptions from the file at the given plist file path. This * will read the file synchronously from disk. -- cgit v1.2.3 From d7e2e99f1bd368e1cad2d596bfe5b09273a19873 Mon Sep 17 00:00:00 2001 From: Ryan Wilson Date: Thu, 4 Jan 2018 14:21:23 -0500 Subject: Move to NSProcessInfo for systemVersion. (#614) When supporting iOS 8 and above, we can now safely use NSProcessInfo on iOS as well as the Mac. This removes a dependency on UIKit for Core. --- Firebase/Core/third_party/FIRAppEnvironmentUtil.m | 7 ------- 1 file changed, 7 deletions(-) (limited to 'Firebase') diff --git a/Firebase/Core/third_party/FIRAppEnvironmentUtil.m b/Firebase/Core/third_party/FIRAppEnvironmentUtil.m index 90e66f0..faee38b 100644 --- a/Firebase/Core/third_party/FIRAppEnvironmentUtil.m +++ b/Firebase/Core/third_party/FIRAppEnvironmentUtil.m @@ -13,9 +13,6 @@ // limitations under the License. #import -#if TARGET_OS_IOS || TARGET_OS_TV -#import -#endif #import "FIRAppEnvironmentUtil.h" @@ -207,11 +204,7 @@ static BOOL isAppEncrypted() { } + (NSString *)systemVersion { - #if TARGET_OS_IOS || TARGET_OS_TV - return [UIDevice currentDevice].systemVersion; - #elif TARGET_OS_OSX return [NSProcessInfo processInfo].operatingSystemVersionString; - #endif } + (BOOL)isAppExtension { -- cgit v1.2.3 From 835df05b731bdac04723570b4230cf381b6949f5 Mon Sep 17 00:00:00 2001 From: Ryan Wilson Date: Wed, 7 Feb 2018 12:42:57 -0500 Subject: Remove deprecations from FIRConfiguration. (#760) --- Firebase/Core/Public/FIRConfiguration.h | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'Firebase') diff --git a/Firebase/Core/Public/FIRConfiguration.h b/Firebase/Core/Public/FIRConfiguration.h index 05bd261..95bba5e 100644 --- a/Firebase/Core/Public/FIRConfiguration.h +++ b/Firebase/Core/Public/FIRConfiguration.h @@ -19,25 +19,6 @@ #import "FIRAnalyticsConfiguration.h" #import "FIRLoggerLevel.h" -/** - * The log levels used by FIRConfiguration. - */ -typedef NS_ENUM(NSInteger, FIRLogLevel) { - /** Error */ - kFIRLogLevelError __deprecated = 0, - /** Warning */ - kFIRLogLevelWarning __deprecated, - /** Info */ - kFIRLogLevelInfo __deprecated, - /** Debug */ - kFIRLogLevelDebug __deprecated, - /** Assert */ - kFIRLogLevelAssert __deprecated, - /** Max */ - kFIRLogLevelMax __deprecated = kFIRLogLevelAssert -} DEPRECATED_MSG_ATTRIBUTE( - "Use -FIRDebugEnabled and -FIRDebugDisabled or setLoggerLevel. See FIRApp.h for more details."); - NS_ASSUME_NONNULL_BEGIN /** @@ -47,21 +28,12 @@ NS_ASSUME_NONNULL_BEGIN NS_SWIFT_NAME(FirebaseConfiguration) @interface FIRConfiguration : NSObject -#if defined(__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0 /** Returns the shared configuration object. */ @property(class, nonatomic, readonly) FIRConfiguration *sharedInstance NS_SWIFT_NAME(shared); -#else -/** Returns the shared configuration object. */ -+ (FIRConfiguration *)sharedInstance NS_SWIFT_NAME(shared()); -#endif // defined(__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0 /** The configuration class for Firebase Analytics. */ @property(nonatomic, readwrite) FIRAnalyticsConfiguration *analyticsConfiguration; -/** Global log level. Defaults to kFIRLogLevelError. */ -@property(nonatomic, readwrite, assign) FIRLogLevel logLevel DEPRECATED_MSG_ATTRIBUTE( - "Use -FIRDebugEnabled and -FIRDebugDisabled or setLoggerLevel. See FIRApp.h for more details."); - /** * Sets the logging level for internal Firebase logging. Firebase will only log messages * that are logged at or below loggerLevel. The messages are logged both to the Xcode -- cgit v1.2.3 From 7f189b929f0825d44b1b20c8ae4d814aa72097ea Mon Sep 17 00:00:00 2001 From: Ryan Wilson Date: Tue, 13 Feb 2018 14:13:52 -0500 Subject: Remove compatibility shim for Xcode 7. (#785) --- Firebase/Core/Public/FIRApp.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'Firebase') diff --git a/Firebase/Core/Public/FIRApp.h b/Firebase/Core/Public/FIRApp.h index 9610455..6687eb0 100644 --- a/Firebase/Core/Public/FIRApp.h +++ b/Firebase/Core/Public/FIRApp.h @@ -90,19 +90,11 @@ NS_SWIFT_NAME(FirebaseApp) */ + (nullable FIRApp *)appNamed:(NSString *)name NS_SWIFT_NAME(app(name:)); -#if defined(__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0 /** * Returns the set of all extant FIRApp instances, or nil if there are no FIRApp instances. This * method is thread safe. */ @property(class, readonly, nullable) NSDictionary *allApps; -#else -/** - * Returns the set of all extant FIRApp instances, or nil if there are no FIRApp instances. This - * method is thread safe. - */ -+ (nullable NSDictionary *)allApps NS_SWIFT_NAME(allApps()); -#endif // defined(__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0 /** * Cleans up the current FIRApp, freeing associated data and returning its name to the pool for -- cgit v1.2.3 From 75d51e6f51c0fe3521e58a0188d1674437fa7f2c Mon Sep 17 00:00:00 2001 From: Ryan Wilson Date: Wed, 14 Feb 2018 11:40:10 -0500 Subject: Remove deprecated implementation - fixes build. (#794) --- Firebase/Core/FIRConfiguration.m | 6 ------ 1 file changed, 6 deletions(-) (limited to 'Firebase') diff --git a/Firebase/Core/FIRConfiguration.m b/Firebase/Core/FIRConfiguration.m index 02617ef..cd64862 100644 --- a/Firebase/Core/FIRConfiguration.m +++ b/Firebase/Core/FIRConfiguration.m @@ -35,12 +35,6 @@ extern void FIRSetLoggerLevel(FIRLoggerLevel loggerLevel); return self; } -// This is deprecated, use setLoggerLevel instead. -- (void)setLogLevel:(FIRLogLevel)logLevel { - NSAssert(logLevel <= kFIRLogLevelMax, @"Invalid log level, %ld", (long)logLevel); - _logLevel = logLevel; -} - - (void)setLoggerLevel:(FIRLoggerLevel)loggerLevel { NSAssert(loggerLevel <= FIRLoggerLevelMax && loggerLevel >= FIRLoggerLevelMin, @"Invalid logger level, %ld", (long)loggerLevel); -- cgit v1.2.3 From afbf4a41ff45421f776df0a3e0a3ff5e1d54bcac Mon Sep 17 00:00:00 2001 From: Ryan Wilson Date: Wed, 14 Feb 2018 12:47:13 -0500 Subject: Remove UIKit dependency on FIRApp. (#798) --- Firebase/Core/Public/FIRApp.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'Firebase') diff --git a/Firebase/Core/Public/FIRApp.h b/Firebase/Core/Public/FIRApp.h index 6687eb0..fb18b75 100644 --- a/Firebase/Core/Public/FIRApp.h +++ b/Firebase/Core/Public/FIRApp.h @@ -16,11 +16,6 @@ #import -#if TARGET_OS_IOS -// TODO: Remove UIKit import on next breaking change release -#import -#endif - @class FIROptions; NS_ASSUME_NONNULL_BEGIN -- cgit v1.2.3 From 94c2e70e2d7fbed28ef23a0c94f68fe2a38fc165 Mon Sep 17 00:00:00 2001 From: Ryan Wilson Date: Mon, 9 Apr 2018 12:49:14 -0400 Subject: Remove iOS 7 Deprecation message. --- Firebase/Core/FIRApp.m | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'Firebase') diff --git a/Firebase/Core/FIRApp.m b/Firebase/Core/FIRApp.m index c2ce28e..92163b1 100644 --- a/Firebase/Core/FIRApp.m +++ b/Firebase/Core/FIRApp.m @@ -133,23 +133,6 @@ static NSMutableDictionary *sLibraryVersions; [FIRApp sendNotificationsToSDKs:sDefaultApp]; sDefaultApp.alreadySentConfigureNotification = YES; } - - if (![FIRAppEnvironmentUtil isFromAppStore]) { - // Support for iOS 7 has been deprecated, but will continue to function for the time being. - // Log a notice for developers who are still targeting iOS 7 as the minimum OS version - // supported. - dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0), ^{ - NSDictionary *info = [[NSBundle mainBundle] infoDictionary]; - - NSString *minVersion = info[@"MinimumOSVersion"]; - if ([minVersion hasPrefix:@"7."]) { - FIRLogNotice(kFIRLoggerCore, @"I-COR000026", - @"Support for iOS 7 is deprecated and will " - @"stop working in the future. Please upgrade your app to target iOS 8 or " - @"above."); - } - }); - } } } -- cgit v1.2.3 From d7c3d71bc7cd7584242a81b89a21f7d827e4cc22 Mon Sep 17 00:00:00 2001 From: Ryan Wilson Date: Mon, 9 Apr 2018 12:55:43 -0400 Subject: Remove App Indexing deprecation message. --- Firebase/Core/FIRApp.m | 7 ------- 1 file changed, 7 deletions(-) (limited to 'Firebase') diff --git a/Firebase/Core/FIRApp.m b/Firebase/Core/FIRApp.m index 92163b1..c43db6e 100644 --- a/Firebase/Core/FIRApp.m +++ b/Firebase/Core/FIRApp.m @@ -298,13 +298,6 @@ static NSMutableDictionary *sLibraryVersions; return NO; } - if (NSClassFromString(@"FIRAppIndexing") != nil) { - FIRLogDebug(kFIRLoggerCore, @"I-COR000024", - @"Firebase App Indexing on iOS is deprecated. " - @"You don't need to take any action at this time. Learn more about Firebase App " - @"Indexing at https://firebase.google.com/docs/app-indexing/."); - } - // Initialize the Analytics once there is a valid options under default app. Analytics should // always initialize first by itself before the other SDKs. if ([self.name isEqualToString:kFIRDefaultAppName]) { -- cgit v1.2.3 From af20b65753db06da3cda476181820003b90645b1 Mon Sep 17 00:00:00 2001 From: Ryan Wilson Date: Mon, 9 Apr 2018 15:13:22 -0400 Subject: Updated CHANGELOG.md --- Firebase/Core/CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Firebase') diff --git a/Firebase/Core/CHANGELOG.md b/Firebase/Core/CHANGELOG.md index 4289cae..19a09ea 100644 --- a/Firebase/Core/CHANGELOG.md +++ b/Firebase/Core/CHANGELOG.md @@ -1,4 +1,6 @@ # Unreleased +- [changed] Removed dependency on UIKit. +- [changed] Removed deprecated methods. # 2018-03-06 -- v4.0.16 -- M22 - [changed] Addresses CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF warnings that surface in newer versions of Xcode and CocoaPods. -- cgit v1.2.3 From 8a06fcb5f99d0a3bd0c7fdc6424e18edbdd367d3 Mon Sep 17 00:00:00 2001 From: Ryan Wilson Date: Tue, 10 Apr 2018 10:45:47 -0400 Subject: Updated changelog. --- Firebase/Core/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Firebase') diff --git a/Firebase/Core/CHANGELOG.md b/Firebase/Core/CHANGELOG.md index 19a09ea..f4707ea 100644 --- a/Firebase/Core/CHANGELOG.md +++ b/Firebase/Core/CHANGELOG.md @@ -1,5 +1,5 @@ # Unreleased -- [changed] Removed dependency on UIKit. +- [changed] Removed `UIKit` import from `FIRApp.h`. - [changed] Removed deprecated methods. # 2018-03-06 -- v4.0.16 -- M22 -- cgit v1.2.3