Merge e8e11a7 into a97a5be

.gitignore

@@ -9,6 +9,7 @@ FirebaseAuth/Tests/Sample/SwiftApiTests/Credentials.swift
 FirebaseDatabase/Tests/Resources/GoogleService-Info.plist
 
 FirebaseRemoteConfig/Tests/Sample/GoogleService-Info.plist
+FirebaseRemoteConfigSwift/Apps/SwiftUISample/SwiftUISample/GoogleService-Info.plist
 
 # FirebaseStorage integration tests GoogleService-Info.plist
 FirebaseStorage/Tests/Integration/Resources/GoogleService-Info.plist

FirebaseRemoteConfig/Sources/FIRRemoteConfig.m

@@ -39,6 +39,9 @@
 static NSString *const kRemoteConfigMinimumFetchIntervalKey = @"_rcn_minimum_fetch_interval";
 /// Timeout value for waiting on a fetch response.
 static NSString *const kRemoteConfigFetchTimeoutKey = @"_rcn_fetch_timeout";
+/// Notification when config is successfully activated
+const NSNotificationName FIRRemoteConfigActivateNotification =
+    @"FIRRemoteConfigActivateNotification";
 
 /// Listener for the get methods.
 typedef void (^FIRRemoteConfigListener)(NSString *_Nonnull, NSDictionary *_Nonnull);
@@ -277,7 +280,7 @@ - (void)fetchAndActivateWithCompletionHandler:
   [self fetchWithCompletionHandler:fetchCompletion];
 }
 
-#pragma mark - apply
+#pragma mark - activate
 
 typedef void (^FIRRemoteConfigActivateChangeCompletion)(BOOL changed, NSError *_Nullable error);
 
@@ -314,13 +317,16 @@ - (void)activateWithCompletion:(FIRRemoteConfigActivateChangeCompletion)completi
                                           toSource:RCNDBSourceActive
                                       forNamespace:self->_FIRNamespace];
     strongSelf->_settings.lastApplyTimeInterval = [[NSDate date] timeIntervalSince1970];
+    // New config has been activated at this point
     FIRLogDebug(kFIRLoggerRemoteConfig, @"I-RCN000069", @"Config activated.");
     [strongSelf->_configContent activatePersonalization];
-
     // Update experiments only for 3p namespace
     NSString *namespace = [strongSelf->_FIRNamespace
         substringToIndex:[strongSelf->_FIRNamespace rangeOfString:@":"].location];
     if ([namespace isEqualToString:FIRNamespaceGoogleMobilePlatform]) {
+      dispatch_async(dispatch_get_main_queue(), ^{
+        [self notifyConfigHasActivated];
+      });
       [strongSelf->_configExperiment updateExperimentsWithHandler:^(NSError *_Nullable error) {
         if (completion) {
           dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
@@ -339,6 +345,19 @@ - (void)activateWithCompletion:(FIRRemoteConfigActivateChangeCompletion)completi
   dispatch_async(_queue, applyBlock);
 }
 
+- (void)notifyConfigHasActivated {
+  // Need a valid google app name.
+  if (!_appName) {
+    return;
+  }
+  // The Remote Config Swift SDK will be listening for this notification so it can tell SwiftUI to
+  // update the UI.
+  NSDictionary *appInfoDict = @{kFIRAppNameKey : _appName};
+  [[NSNotificationCenter defaultCenter] postNotificationName:FIRRemoteConfigActivateNotification
+                                                      object:self
+                                                    userInfo:appInfoDict];
+}
+
 #pragma mark - helpers
 - (NSString *)fullyQualifiedNamespace:(NSString *)namespace {
   // If this is already a fully qualified namespace, return.

FirebaseRemoteConfig/Sources/Private/RCNConfigSettings.h

@@ -31,7 +31,8 @@
 
 /// The timeout to set for outgoing fetch requests.
 @property(nonatomic, readwrite, assign) NSTimeInterval fetchTimeout;
-
+// The Google App ID of the configured FIRApp.
+@property(nonatomic, readwrite, copy) NSString *googleAppID;
 #pragma mark - Data required by config request.
 /// Device authentication ID required by config request.
 @property(nonatomic, copy) NSString *deviceAuthID;

FirebaseRemoteConfigSwift.podspec

@@ -35,7 +35,7 @@ app update.
   s.prefix_header_file      = false
 
   s.source_files = [
-    'FirebaseRemoteConfigSwift/Sources/*.swift',
+    'FirebaseRemoteConfigSwift/Sources/**/*.swift',
   ]
 
   s.dependency 'FirebaseRemoteConfig', '~> 9.0'
@@ -53,6 +53,9 @@ app update.
                               'FirebaseRemoteConfigSwift/Tests/FakeUtils/*.swift',
                               'FirebaseRemoteConfigSwift/Tests/ObjC/*.[hm]',
                              ]
+    # Excludes tests that cannot be include in API tests because it requires fetch remote values from
+    # a real console but only one test can be run without poluting other tests' remote values.
+    swift_api.exclude_files = ['FirebaseRemoteConfigSwift/Tests/SwiftAPI/PropertyWrapperTests.swift']
     swift_api.resources = 'FirebaseRemoteConfigSwift/Tests/Defaults-testInfo.plist'
     swift_api.requires_app_host = true
     swift_api.pod_target_xcconfig = {

FirebaseRemoteConfigSwift/Apps/SwiftUISample/Podfile

@@ -0,0 +1,21 @@
+# Uncomment the next line to define a global platform for your project
+# platform :ios, '14.0'
+
+source 'https://github.com/firebase/SpecsDev.git'
+source 'https://github.com/firebase/SpecsStaging.git'
+source 'https://cdn.cocoapods.org/'
+
+target 'SwiftUISample' do
+  # Comment the next line if you don't want to use dynamic frameworks
+  use_frameworks!
+  pod 'FirebaseAnalytics'
+  pod 'FirebaseCore', :path => '../../../'
+  pod 'FirebaseCoreInternal', :path => '../../../'
+  pod 'FirebaseCoreDiagnostics', :path => '../../../'
+  pod 'FirebaseInstallations', :path => '../../../'
+  pod 'FirebaseRemoteConfig', :path => '../../../'
+  pod 'FirebaseRemoteConfigSwift', :path => '../../../'
+  pod 'FirebaseSharedSwift', :path => '../../..'
+  pod 'FirebaseABTesting', :path => '../../..'
+
+end