[Config] Port 'ConfigExperiment' to Swift (#14179)

firebase · Dec 11, 2024 · 4714175 · 4714175
1 parent 80286fe
commit 4714175
Show file tree

Hide file tree

Showing 10 changed files with 209 additions and 259 deletions.
diff --git a/FirebaseABTesting/Sources/ABTExperimentPayload.m b/FirebaseABTesting/Sources/ABTExperimentPayload.m
@@ -14,6 +14,8 @@
 
 #import "FirebaseABTesting/Sources/Private/ABTExperimentPayload.h"
 
+#import "FirebaseABTesting/Sources/Public/FirebaseABTesting/FIRExperimentController.h"
+
 static NSString *const kExperimentPayloadKeyExperimentID = @"experimentId";
 static NSString *const kExperimentPayloadKeyVariantID = @"variantId";
 

diff --git a/FirebaseABTesting/Sources/Private/ABTExperimentPayload.h b/FirebaseABTesting/Sources/Private/ABTExperimentPayload.h
@@ -14,16 +14,9 @@
 
 #import <Foundation/Foundation.h>
 
-NS_ASSUME_NONNULL_BEGIN
+#import "FirebaseABTesting/Sources/Public/FirebaseABTesting/FIRExperimentController.h"
 
-/// Policy for handling the case where there's an overflow of experiments for an installation
-/// instance.
-typedef NS_ENUM(int32_t, ABTExperimentPayloadExperimentOverflowPolicy) {
-  ABTExperimentPayloadExperimentOverflowPolicyUnrecognizedValue = 999,
-  ABTExperimentPayloadExperimentOverflowPolicyUnspecified = 0,
-  ABTExperimentPayloadExperimentOverflowPolicyDiscardOldest = 1,
-  ABTExperimentPayloadExperimentOverflowPolicyIgnoreNewest = 2,
-};
+NS_ASSUME_NONNULL_BEGIN
 
 @interface ABTExperimentLite : NSObject
 @property(nonatomic, readonly, copy) NSString *experimentId;

diff --git a/FirebaseABTesting/Sources/Public/FirebaseABTesting/FIRExperimentController.h b/FirebaseABTesting/Sources/Public/FirebaseABTesting/FIRExperimentController.h
@@ -14,15 +14,21 @@
 
 #import <Foundation/Foundation.h>
 
+#import "FIRLifecycleEvents.h"
+
 @class ABTExperimentPayload;
 
-// Forward declaration to avoid importing into the module header
-typedef NS_ENUM(int32_t, ABTExperimentPayloadExperimentOverflowPolicy);
+/// Policy for handling the case where there's an overflow of experiments for an installation
+/// instance.
+typedef NS_ENUM(int32_t, ABTExperimentPayloadExperimentOverflowPolicy) {
+  ABTExperimentPayloadExperimentOverflowPolicyUnrecognizedValue = 999,
+  ABTExperimentPayloadExperimentOverflowPolicyUnspecified = 0,
+  ABTExperimentPayloadExperimentOverflowPolicyDiscardOldest = 1,
+  ABTExperimentPayloadExperimentOverflowPolicyIgnoreNewest = 2,
+};
 
 NS_ASSUME_NONNULL_BEGIN
 
-@class FIRLifecycleEvents;
-
 /// The default experiment overflow policy, that is to discard the experiment with the oldest start
 /// time when users start the experiment on the web console.
 extern const ABTExperimentPayloadExperimentOverflowPolicy FIRDefaultExperimentOverflowPolicy;

diff --git a/FirebaseRemoteConfig/Sources/FIRRemoteConfig.m b/FirebaseRemoteConfig/Sources/FIRRemoteConfig.m
@@ -23,7 +23,6 @@
 #import "FirebaseRemoteConfig/Sources/Private/RCNConfigFetch.h"
 #import "FirebaseRemoteConfig/Sources/Private/RCNConfigSettings.h"
 #import "FirebaseRemoteConfig/Sources/RCNConfigConstants.h"
-#import "FirebaseRemoteConfig/Sources/RCNConfigExperiment.h"
 #import "FirebaseRemoteConfig/Sources/RCNConfigRealtime.h"
 #import "FirebaseRemoteConfig/Sources/RCNConfigValue_Internal.h"
 #import "FirebaseRemoteConfig/Sources/RCNPersonalization.h"

diff --git a/FirebaseRemoteConfig/Sources/RCNConfigExperiment.h b/FirebaseRemoteConfig/Sources/RCNConfigExperiment.h
diff --git a/FirebaseRemoteConfig/Sources/RCNConfigExperiment.m b/FirebaseRemoteConfig/Sources/RCNConfigExperiment.m
diff --git a/FirebaseRemoteConfig/Sources/RCNConfigFetch.m b/FirebaseRemoteConfig/Sources/RCNConfigFetch.m
@@ -22,7 +22,6 @@
 #import "FirebaseInstallations/Source/Library/Private/FirebaseInstallationsInternal.h"
 #import "FirebaseRemoteConfig/Sources/Private/RCNConfigSettings.h"
 #import "FirebaseRemoteConfig/Sources/RCNConfigConstants.h"
-#import "FirebaseRemoteConfig/Sources/RCNConfigExperiment.h"
 
 #import "FirebaseRemoteConfig/FirebaseRemoteConfig-Swift.h"