firebase · ryanwilson · Mar 13, 2019 · Mar 11, 2019 · Mar 11, 2019 · Mar 13, 2019
diff --git a/Firebase/Core/CHANGELOG.md b/Firebase/Core/CHANGELOG.md
@@ -1,9 +1,11 @@
-# Unreleased
-
 # 2019-03-19 -- v5.4.0 -- M45
 - [changed] Allow Bundle IDs that have a valid prefix to enable richer extension support. (#2515)
 - [changed] Convert FIRLogger to use the recommended os_log for logging via GoogleUtilities.
   See https://developer.apple.com/documentation/os/logging?language=objc.
+- [changed] Deprecated `FIRAnalyticsConfiguration` API in favor of new methods on the Analytics SDK.
+  Please call the new APIs directly: Enable/disable Analytics with `Analytics.setAnalyticsEnabled(_)`
+  and modify the session timeout interval with `Analytics.setAnalyticsCollectionEnabled(_)`.
+
 
 # 2019-01-22 -- v5.2.0 -- M41
 - [changed] Added a registerInternalLibrary API. Now other Firebase libraries register with FirebaseCore

diff --git a/Firebase/Core/FIRAnalyticsConfiguration.m b/Firebase/Core/FIRAnalyticsConfiguration.m
@@ -16,7 +16,10 @@
 
 #import "Private/FIRAnalyticsConfiguration+Internal.h"
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-implementations"
 @implementation FIRAnalyticsConfiguration
+#pragma clang diagnostic pop
 
 + (FIRAnalyticsConfiguration *)sharedInstance {
   static FIRAnalyticsConfiguration *sharedInstance = nil;

diff --git a/Firebase/Core/FIRApp.m b/Firebase/Core/FIRApp.m
@@ -320,6 +320,7 @@ - (BOOL)configureCore {
       if ([firAnalyticsClass respondsToSelector:startWithConfigurationSelector]) {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
         [firAnalyticsClass performSelector:startWithConfigurationSelector
                                 withObject:[FIRConfiguration sharedInstance].analyticsConfiguration
                                 withObject:_options];
@@ -360,9 +361,12 @@ - (void)setDataCollectionDefaultEnabled:(BOOL)dataCollectionDefaultEnabled {
   }
 
   // The Analytics flag has not been explicitly set, so update with the value being set.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
   [[FIRAnalyticsConfiguration sharedInstance]
       setAnalyticsCollectionEnabled:dataCollectionDefaultEnabled
                      persistSetting:NO];
+#pragma clang diagnostic pop
 }
 
 - (BOOL)isDataCollectionDefaultEnabled {

diff --git a/Firebase/Core/FIRConfiguration.m b/Firebase/Core/FIRConfiguration.m
@@ -30,7 +30,10 @@ + (instancetype)sharedInstance {
 - (instancetype)init {
   self = [super init];
   if (self) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     _analyticsConfiguration = [FIRAnalyticsConfiguration sharedInstance];
+#pragma clang diagnostic pop
   }
   return self;
 }

diff --git a/Firebase/Core/Public/FIRAnalyticsConfiguration.h b/Firebase/Core/Public/FIRAnalyticsConfiguration.h
@@ -22,6 +22,7 @@ NS_ASSUME_NONNULL_BEGIN
  * This class provides configuration fields for Firebase Analytics.
  */
 NS_SWIFT_NAME(AnalyticsConfiguration)
+DEPRECATED_MSG_ATTRIBUTE("Use these methods directly on the `Analytics` class.")
 @interface FIRAnalyticsConfiguration : NSObject
 
 /**

diff --git a/Firebase/Core/Public/FIRConfiguration.h b/Firebase/Core/Public/FIRConfiguration.h
@@ -32,7 +32,9 @@ NS_SWIFT_NAME(FirebaseConfiguration)
 @property(class, nonatomic, readonly) FIRConfiguration *sharedInstance NS_SWIFT_NAME(shared);
 
 /** The configuration class for Firebase Analytics. */
-@property(nonatomic, readwrite) FIRAnalyticsConfiguration *analyticsConfiguration;
+@property(nonatomic, readwrite)
+    FIRAnalyticsConfiguration *analyticsConfiguration DEPRECATED_MSG_ATTRIBUTE(
+        "Use the methods available here directly on the `Analytics` class.");
 
 /**
  * Sets the logging level for internal Firebase logging. Firebase will only log messages