Update to latest version of FirebaseAnalyticsInterop (#3463)

Author: paulb777

Example/DynamicLinks/Tests/FIRDLScionLoggingTest.m

@@ -57,19 +57,10 @@ - (void)clearConditionalUserProperty:(nonnull NSString *)userPropertyName
                 clearEventParameters:(nonnull NSDictionary *)clearEventParameters {
 }
 
-- (nonnull NSArray<FIRAConditionalUserProperty *> *)
-    conditionalUserProperties:(nonnull NSString *)origin
-           propertyNamePrefix:(nonnull NSString *)propertyNamePrefix {
-  return @[];
-}
-
 - (NSInteger)maxUserProperties:(nonnull NSString *)origin {
   return -1;
 }
 
-- (void)setConditionalUserProperty:(nonnull FIRAConditionalUserProperty *)conditionalUserProperty {
-}
-
 - (void)setUserPropertyWithOrigin:(nonnull NSString *)origin
                              name:(nonnull NSString *)name
                             value:(nonnull id)value {
@@ -88,6 +79,22 @@ - (void)registerAnalyticsListener:(nonnull id<FIRAnalyticsInteropListener>)liste
 - (void)unregisterAnalyticsListenerWithOrigin:(nonnull NSString *)origin {
 }
 
+- (void)clearConditionalUserProperty:(nonnull NSString *)userPropertyName
+                           forOrigin:(nonnull NSString *)origin
+                      clearEventName:(nonnull NSString *)clearEventName
+                clearEventParameters:
+                    (nonnull NSDictionary<NSString *, NSString *> *)clearEventParameters {
+}
+
+- (nonnull NSArray<NSDictionary<NSString *, NSString *> *> *)
+    conditionalUserProperties:(nonnull NSString *)origin
+           propertyNamePrefix:(nonnull NSString *)propertyNamePrefix {
+  return nil;
+}
+
+- (void)setConditionalUserProperty:(nonnull NSDictionary<NSString *, id> *)conditionalUserProperty {
+}
+
 @end
 
 @interface FIRDLScionLoggingTest : XCTestCase

Example/Messaging/Tests/FIRMessagingAnalyticsTest.m

@@ -86,19 +86,10 @@ - (void)clearConditionalUserProperty:(nonnull NSString *)userPropertyName
                 clearEventParameters:(nonnull NSDictionary *)clearEventParameters {
 }
 
-- (nonnull NSArray<FIRAConditionalUserProperty *> *)
-conditionalUserProperties:(nonnull NSString *)origin
-propertyNamePrefix:(nonnull NSString *)propertyNamePrefix {
-  return @[];
-}
-
 - (NSInteger)maxUserProperties:(nonnull NSString *)origin {
   return -1;
 }
 
-- (void)setConditionalUserProperty:(nonnull FIRAConditionalUserProperty *)conditionalUserProperty {
-}
-
 - (void)checkLastNotificationForOrigin:(nonnull NSString *)origin
                                  queue:(nonnull dispatch_queue_t)queue
                               callback:(nonnull void (^)(NSString *_Nullable))
@@ -112,6 +103,16 @@ - (void)registerAnalyticsListener:(nonnull id<FIRAnalyticsInteropListener>)liste
 - (void)unregisterAnalyticsListenerWithOrigin:(nonnull NSString *)origin {
 }
 
+- (void)clearConditionalUserProperty:(nonnull NSString *)userPropertyName forOrigin:(nonnull NSString *)origin clearEventName:(nonnull NSString *)clearEventName clearEventParameters:(nonnull NSDictionary<NSString *,NSString *> *)clearEventParameters {
+}
+
+- (nonnull NSArray<NSDictionary<NSString *,NSString *> *> *)conditionalUserProperties:(nonnull NSString *)origin propertyNamePrefix:(nonnull NSString *)propertyNamePrefix {
+  return nil;
+}
+
+
+- (void)setConditionalUserProperty:(nonnull NSDictionary<NSString *,id> *)conditionalUserProperty {
+}
 
 @end
 

FirebaseAnalyticsInterop.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseAnalyticsInterop'
-  s.version          = '1.2.0'
+  s.version          = '1.3.0'
   s.summary          = 'Interfaces that allow other Firebase SDKs to use Analytics functionality.'
 
   s.description      = <<-DESC

InAppMessaging/Example/Tests/FIRIAMAnalyticsEventLoggerImplTests.m

@@ -103,25 +103,33 @@ - (void)clearConditionalUserProperty:(nonnull NSString *)userPropertyName
                 clearEventParameters:(nonnull NSDictionary *)clearEventParameters {
 }
 
-- (nonnull NSArray<FIRAConditionalUserProperty *> *)
-    conditionalUserProperties:(nonnull NSString *)origin
-           propertyNamePrefix:(nonnull NSString *)propertyNamePrefix {
-  return @[];
-}
-
 - (NSInteger)maxUserProperties:(nonnull NSString *)origin {
   return -1;
 }
 
-- (void)setConditionalUserProperty:(nonnull FIRAConditionalUserProperty *)conditionalUserProperty {
-}
-
 - (void)registerAnalyticsListener:(nonnull id<FIRAnalyticsInteropListener>)listener
                        withOrigin:(nonnull NSString *)origin {
 }
 
 - (void)unregisterAnalyticsListenerWithOrigin:(nonnull NSString *)origin {
 }
+
+- (void)clearConditionalUserProperty:(nonnull NSString *)userPropertyName
+                           forOrigin:(nonnull NSString *)origin
+                      clearEventName:(nonnull NSString *)clearEventName
+                clearEventParameters:
+                    (nonnull NSDictionary<NSString *, NSString *> *)clearEventParameters {
+}
+
+- (nonnull NSArray<NSDictionary<NSString *, NSString *> *> *)
+    conditionalUserProperties:(nonnull NSString *)origin
+           propertyNamePrefix:(nonnull NSString *)propertyNamePrefix {
+  return nil;
+}
+
+- (void)setConditionalUserProperty:(nonnull NSDictionary<NSString *, id> *)conditionalUserProperty {
+}
+
 @end
 
 @implementation FIRIAMAnalyticsEventLoggerImplTests

Interop/Analytics/Public/FIRAnalyticsInterop.h

@@ -16,7 +16,6 @@
 
 #import <Foundation/Foundation.h>
 
-@class FIRAConditionalUserProperty;
 @protocol FIRAnalyticsInteropListener;
 
 NS_ASSUME_NONNULL_BEGIN
@@ -25,17 +24,18 @@ NS_ASSUME_NONNULL_BEGIN
 @protocol FIRAnalyticsInterop
 
 /// Sets user property when trigger event is logged. This API is only available in the SDK.
-- (void)setConditionalUserProperty:(FIRAConditionalUserProperty *)conditionalUserProperty;
+- (void)setConditionalUserProperty:(NSDictionary<NSString *, id> *)conditionalUserProperty;
 
 /// Clears user property if set.
 - (void)clearConditionalUserProperty:(NSString *)userPropertyName
+                           forOrigin:(NSString *)origin
                       clearEventName:(NSString *)clearEventName
-                clearEventParameters:(NSDictionary *)clearEventParameters;
+                clearEventParameters:(NSDictionary<NSString *, NSString *> *)clearEventParameters;
 
 /// Returns currently set user properties.
-- (NSArray<FIRAConditionalUserProperty *> *)conditionalUserProperties:(NSString *)origin
-                                                   propertyNamePrefix:
-                                                       (NSString *)propertyNamePrefix;
+- (NSArray<NSDictionary<NSString *, NSString *> *> *)conditionalUserProperties:(NSString *)origin
+                                                            propertyNamePrefix:
+                                                                (NSString *)propertyNamePrefix;
 
 /// Returns the maximum number of user properties.
 - (NSInteger)maxUserProperties:(NSString *)origin;