[rc-swift] Start RC Swift implementation (#13931)

Author: paulb777

.github/workflows/remoteconfig.yml

@@ -59,8 +59,8 @@ jobs:
 
     strategy:
       matrix:
-        # TODO: macos tests are blocked by https://github.com/erikdoe/ocmock/pull/532
-        target: [ios, tvos, macos --skip-tests, watchos]
+        # TODO: add watchos back
+        target: [ios, tvos, macos --skip-tests]
         podspec: [FirebaseRemoteConfig.podspec]
         build-env:
           - os: macos-14

FirebaseRemoteConfig.podspec

@@ -41,6 +41,7 @@ app update.
     'FirebaseCore/Extension/*.h',
     'FirebaseInstallations/Source/Library/Private/*.h',
     'FirebaseRemoteConfig/Swift/**/*.swift',
+    'FirebaseRemoteConfig/SwiftNew/**/*.swift',
   ]
   s.public_header_files = base_dir + 'Public/FirebaseRemoteConfig/*.h'
   s.resource_bundles = {

FirebaseRemoteConfig/Sources/FIRRemoteConfig.m

@@ -28,9 +28,10 @@
 #import "FirebaseRemoteConfig/Sources/RCNConfigExperiment.h"
 #import "FirebaseRemoteConfig/Sources/RCNConfigRealtime.h"
 #import "FirebaseRemoteConfig/Sources/RCNConfigValue_Internal.h"
-#import "FirebaseRemoteConfig/Sources/RCNDevice.h"
 #import "FirebaseRemoteConfig/Sources/RCNPersonalization.h"
 
+#import "FirebaseRemoteConfig/FirebaseRemoteConfig-Swift.h"
+
 /// Remote Config Error Domain.
 /// TODO: Rename according to obj-c style for constants.
 NSString *const FIRRemoteConfigErrorDomain = @"com.google.remoteconfig.ErrorDomain";

FirebaseRemoteConfig/Sources/FIRRemoteConfigUpdate.m

@@ -29,12 +29,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @class RCNConfigSettings;
 
-@interface FIRRemoteConfigUpdate ()
-
-/// Designated initializer.
-- (instancetype)initWithUpdatedKeys:(NSSet<NSString *> *)updatedKeys;
-@end
-
 @interface FIRRemoteConfig () {
   NSString *_FIRNamespace;
 }

FirebaseRemoteConfig/Sources/Private/FIRRemoteConfig_Private.h

@@ -98,7 +98,7 @@
 /// for the Realtime service.
 @property(nonatomic, readonly, assign) NSTimeInterval realtimeExponentialBackoffThrottleEndTime;
 /// Realtime connection attempts.
-@property(nonatomic, readwrite, assign) int realtimeRetryCount;
+@property(nonatomic, readwrite, assign) NSInteger realtimeRetryCount;
 
 #pragma mark Throttling Methods
 

FirebaseRemoteConfig/Sources/Private/RCNConfigSettings.h

@@ -17,6 +17,7 @@
 #import <Foundation/Foundation.h>
 
 @class FIRApp;
+@class FIRRemoteConfigUpdate;
 
 /// The Firebase Remote Config service default namespace, to be used if the API method does not
 /// specify a different namespace. Use the default namespace if configuring from the Google Firebase
@@ -170,19 +171,6 @@ NS_SWIFT_NAME(RemoteConfigSettings)
 @property(nonatomic, assign) NSTimeInterval fetchTimeout;
 @end
 
-#pragma mark - FIRRemoteConfigUpdate
-/// Used by Remote Config real-time config update service, this class represents changes between the
-/// newly fetched config and the current one. An instance of this class is passed to
-/// `FIRRemoteConfigUpdateCompletion` when a new config version has been automatically fetched.
-NS_SWIFT_NAME(RemoteConfigUpdate)
-@interface FIRRemoteConfigUpdate : NSObject
-
-/// Parameter keys whose values have been updated from the currently activated values. Includes
-/// keys that are added, deleted, and whose value, value source, or metadata has changed.
-@property(nonatomic, readonly, nonnull) NSSet<NSString *> *updatedKeys;
-
-@end
-
 #pragma mark - FIRRemoteConfig
 /// Firebase Remote Config class. The class method `remoteConfig()` can be used
 /// to fetch, activate and read config results and set default config results on the default

FirebaseRemoteConfig/Sources/Public/FirebaseRemoteConfig/FIRRemoteConfig.h

@@ -16,6 +16,8 @@
 
 #import "FirebaseRemoteConfig/Sources/RCNConfigContent.h"
 
+#import "FirebaseRemoteConfig/FirebaseRemoteConfig-Swift.h"
+
 #import "FirebaseRemoteConfig/Sources/Private/FIRRemoteConfig_Private.h"
 #import "FirebaseRemoteConfig/Sources/Public/FirebaseRemoteConfig/FIRRemoteConfig.h"
 #import "FirebaseRemoteConfig/Sources/RCNConfigConstants.h"

FirebaseRemoteConfig/Sources/RCNConfigContent.m

@@ -24,7 +24,9 @@
 #import "FirebaseRemoteConfig/Sources/RCNConfigConstants.h"
 #import "FirebaseRemoteConfig/Sources/RCNConfigContent.h"
 #import "FirebaseRemoteConfig/Sources/RCNConfigExperiment.h"
-#import "FirebaseRemoteConfig/Sources/RCNDevice.h"
+
+#import "FirebaseRemoteConfig/FirebaseRemoteConfig-Swift.h"
+
 @import FirebaseRemoteConfigInterop;
 
 #ifdef RCN_STAGING_SERVER
@@ -134,8 +136,8 @@ - (void)fetchConfigWithExpirationDuration:(NSTimeInterval)expirationDuration
                         completionHandler:
                             (_Nullable FIRRemoteConfigFetchCompletion)completionHandler {
   // Note: We expect the googleAppID to always be available.
-  BOOL hasDeviceContextChanged =
-      FIRRemoteConfigHasDeviceContextChanged(_settings.deviceContext, _options.googleAppID);
+  BOOL hasDeviceContextChanged = [Device remoteConfigHasDeviceContextChanged:_settings.deviceContext
+                                                           projectIdentifier:_options.googleAppID];
 
   __weak RCNConfigFetch *weakSelf = self;
   dispatch_async(_lockQueue, ^{
@@ -201,8 +203,8 @@ - (void)fetchConfigWithExpirationDuration:(NSTimeInterval)expirationDuration
 - (void)realtimeFetchConfigWithNoExpirationDuration:(NSInteger)fetchAttemptNumber
                                   completionHandler:(RCNConfigFetchCompletion)completionHandler {
   // Note: We expect the googleAppID to always be available.
-  BOOL hasDeviceContextChanged =
-      FIRRemoteConfigHasDeviceContextChanged(_settings.deviceContext, _options.googleAppID);
+  BOOL hasDeviceContextChanged = [Device remoteConfigHasDeviceContextChanged:_settings.deviceContext
+                                                           projectIdentifier:_options.googleAppID];
 
   __weak RCNConfigFetch *weakSelf = self;
   dispatch_async(_lockQueue, ^{

FirebaseRemoteConfig/Sources/RCNConfigFetch.m

@@ -19,10 +19,10 @@
 #import <GoogleUtilities/GULNSData+zlib.h>
 #import "FirebaseCore/Extension/FirebaseCoreInternal.h"
 #import "FirebaseInstallations/Source/Library/Private/FirebaseInstallationsInternal.h"
+#import "FirebaseRemoteConfig/FirebaseRemoteConfig-Swift.h"
 #import "FirebaseRemoteConfig/Sources/Private/RCNConfigFetch.h"
 #import "FirebaseRemoteConfig/Sources/Private/RCNConfigSettings.h"
 #import "FirebaseRemoteConfig/Sources/RCNConfigConstants.h"
-#import "FirebaseRemoteConfig/Sources/RCNDevice.h"
 
 /// URL params
 static NSString *const kServerURLDomain = @"https://firebaseremoteconfigrealtime.googleapis.com";
@@ -167,7 +167,7 @@ - (void)propagateErrors:(NSError *)error {
 // TESTING ONLY
 - (void)triggerListenerForTesting:(void (^_Nonnull)(FIRRemoteConfigUpdate *configUpdate,
                                                     NSError *_Nullable error))listener {
-  listener([[FIRRemoteConfigUpdate alloc] init], nil);
+  listener([[FIRRemoteConfigUpdate alloc] initWithUpdatedKeys:[[NSSet alloc] init]], nil);
 }
 
 #pragma mark - Http Helpers
@@ -328,7 +328,7 @@ - (void)createRequestBodyWithCompletion:(void (^)(NSData *_Nonnull requestBody))
                          @"sdkVersion:'%@', appInstanceId:'%@'}",
                          [strongSelf->_options GCMSenderID], namespace,
                          strongSelf->_configFetch.templateVersionNumber,
-                         strongSelf->_options.googleAppID, FIRRemoteConfigPodVersion(),
+                         strongSelf->_options.googleAppID, Device.remoteConfigPodVersion,
                          strongSelf->_settings.configInstallationsIdentifier];
     NSData *postData = [postBody dataUsingEncoding:NSUTF8StringEncoding];
     NSError *compressionError;