[rc-swift] RemoteConfig.swift (#14309)

Author: paulb777

FirebaseRemoteConfig.podspec

@@ -105,15 +105,13 @@ app update.
     }
     swift_api.source_files = ['FirebaseRemoteConfig/Tests/Swift/SwiftAPI/*.swift',
                               'FirebaseRemoteConfig/Tests/Swift/FakeUtils/*.swift',
-                              'FirebaseRemoteConfig/Tests/Swift/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 polluting other tests' remote values.
     swift_api.exclude_files = ['FirebaseRemoteConfig/Tests/Swift/SwiftAPI/PropertyWrapperTests.swift']
     swift_api.resources = 'FirebaseRemoteConfig/Tests/Swift/Defaults-testInfo.plist'
     swift_api.requires_app_host = true
     swift_api.pod_target_xcconfig = {
-      'SWIFT_OBJC_BRIDGING_HEADER' => '$(PODS_TARGET_SRCROOT)/FirebaseRemoteConfig/Tests/Swift/ObjC/Bridging-Header.h',
       'OTHER_SWIFT_FLAGS' => "$(inherited) #{ENV.key?('USE_REAL_CONSOLE') ? '-D USE_REAL_CONSOLE' : ''}",
       'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"'
     }
@@ -131,12 +129,10 @@ app update.
     fake_console.source_files = ['FirebaseRemoteConfig/Tests/Swift/SwiftAPI/*.swift',
                                  'FirebaseRemoteConfig/Tests/Swift/FakeUtils/*.swift',
                                  'FirebaseRemoteConfig/Tests/Swift/FakeConsole/*.swift',
-                                 'FirebaseRemoteConfig/Tests/Swift/ObjC/*.[hm]',
                                 ]
     fake_console.resources = 'FirebaseRemoteConfig/Tests/Swift/Defaults-testInfo.plist'
     fake_console.requires_app_host = true
     fake_console.pod_target_xcconfig = {
-      'SWIFT_OBJC_BRIDGING_HEADER' => '$(PODS_TARGET_SRCROOT)/FirebaseRemoteConfig/Tests/Swift/ObjC/Bridging-Header.h',
       'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"'
     }
     fake_console.dependency 'OCMock'

FirebaseRemoteConfig/Sources/FIRRemoteConfig.m

@@ -23,6 +23,11 @@ enum ConfigConstants {
 
   static let remoteConfigQueueLabel = "com.google.GoogleConfigService.FIRRemoteConfig"
 
+  /// Remote Config Error Domain.
+  static let remoteConfigErrorDomain = "com.google.remoteconfig.ErrorDomain"
+  // Remote Config Realtime Error Domain
+  static let remoteConfigUpdateErrorDomain = "com.google.remoteconfig.update.ErrorDomain"
+
   // MARK: - Fetch Response Keys
 
   static let fetchResponseKeyEntries = "entries"

FirebaseRemoteConfig/Sources/Private/FIRRemoteConfig_Private.h

@@ -34,7 +34,7 @@ import Foundation
   private let experimentStartTimeDateFormatter: DateFormatter
 
   /// Designated initializer;
-  @objc public init(DBManager: ConfigDBManager,
+  @objc public init(dbManager: ConfigDBManager,
                     experimentController controller: ExperimentController?) {
     experimentPayloads = []
     experimentMetadata = [:]
@@ -48,7 +48,7 @@ import Foundation
       dateFormatter.timeZone = TimeZone(abbreviation: "UTC")
       return dateFormatter
     }()
-    dbManager = DBManager
+    self.dbManager = dbManager
     experimentController = controller
     super.init()
     loadExperimentFromTable()

FirebaseRemoteConfig/Sources/Public/FirebaseRemoteConfig/FIRRemoteConfig.h

@@ -83,7 +83,7 @@ extension URLSession: RCNConfigFetchSession {
 @objc(RCNConfigFetch) public class ConfigFetch: NSObject {
   private let content: ConfigContent
 
-  private let settings: ConfigSettings
+  let settings: ConfigSettings
 
   private let analytics: (any FIRAnalyticsInterop)?
 
@@ -241,11 +241,11 @@ extension URLSession: RCNConfigFetchSession {
       if strongSelf.settings.shouldThrottle() && !hasDeviceContextChanged {
         // Must set lastFetchStatus before FailReason.
         strongSelf.settings.lastFetchStatus = .throttled
-        strongSelf.settings.lastFetchError = .throttled
+        strongSelf.settings.lastFetchError = RemoteConfigError.throttled
         let throttledEndTime = strongSelf.settings.exponentialBackoffThrottleEndTime
 
         let error = NSError(
-          domain: RemoteConfigErrorDomain,
+          domain: ConfigConstants.remoteConfigErrorDomain,
           code: RemoteConfigError.throttled.rawValue,
           userInfo: [throttledEndTimeInSecondsKey: throttledEndTime]
         )
@@ -291,11 +291,11 @@ extension URLSession: RCNConfigFetchSession {
       if strongSelf.settings.shouldThrottle() && !hasDeviceContextChanged {
         // Must set lastFetchStatus before FailReason.
         strongSelf.settings.lastFetchStatus = .throttled
-        strongSelf.settings.lastFetchError = .throttled
+        strongSelf.settings.lastFetchError = RemoteConfigError.throttled
         let throttledEndTime = strongSelf.settings.exponentialBackoffThrottleEndTime
 
         let error = NSError(
-          domain: RemoteConfigErrorDomain,
+          domain: ConfigConstants.remoteConfigErrorDomain,
           code: RemoteConfigError.throttled.rawValue,
           userInfo: [throttledEndTimeInSecondsKey: throttledEndTime]
         )
@@ -339,7 +339,7 @@ extension URLSession: RCNConfigFetchSession {
         on: completionHandler,
         status: .failure,
         error: NSError(
-          domain: RemoteConfigErrorDomain,
+          domain: ConfigConstants.remoteConfigErrorDomain,
           code: RemoteConfigError.internalError.rawValue,
           userInfo: [NSLocalizedDescriptionKey: errorDescription]
         )
@@ -366,7 +366,7 @@ extension URLSession: RCNConfigFetchSession {
             on: completionHandler,
             status: .failure,
             error: NSError(
-              domain: RemoteConfigErrorDomain,
+              domain: ConfigConstants.remoteConfigErrorDomain,
               code: RemoteConfigError.internalError.rawValue,
               userInfo: userInfo
             )
@@ -400,7 +400,7 @@ extension URLSession: RCNConfigFetchSession {
                 on: completionHandler,
                 status: .failure,
                 error: NSError(
-                  domain: RemoteConfigErrorDomain,
+                  domain: ConfigConstants.remoteConfigErrorDomain,
                   code: RemoteConfigError.internalError.rawValue,
                   userInfo: userInfo
                 )
@@ -502,7 +502,7 @@ extension URLSession: RCNConfigFetchSession {
       let errorString = "Failed to compress the config request."
       RCLog.warning("I-RCN000033", errorString)
       let error = NSError(
-        domain: RemoteConfigErrorDomain,
+        domain: ConfigConstants.remoteConfigErrorDomain,
         code: RemoteConfigError.internalError.rawValue,
         userInfo: [NSLocalizedDescriptionKey: errorString]
       )
@@ -566,11 +566,11 @@ extension URLSession: RCNConfigFetchSession {
               if strongSelf.settings.shouldThrottle() {
                 // Must set lastFetchStatus before FailReason.
                 strongSelf.settings.lastFetchStatus = .throttled
-                strongSelf.settings.lastFetchError = .throttled
+                strongSelf.settings.lastFetchError = RemoteConfigError.throttled
                 let throttledEndTime = strongSelf.settings.exponentialBackoffThrottleEndTime
 
                 let error = NSError(
-                  domain: RemoteConfigErrorDomain,
+                  domain: ConfigConstants.remoteConfigErrorDomain,
                   code: RemoteConfigError.throttled.rawValue,
                   userInfo: [throttledEndTimeInSecondsKey: throttledEndTime]
                 )
@@ -600,7 +600,7 @@ extension URLSession: RCNConfigFetchSession {
             status: .failure,
             update: nil,
             error: NSError(
-              domain: RemoteConfigErrorDomain,
+              domain: ConfigConstants.remoteConfigErrorDomain,
               code: RemoteConfigError.internalError.rawValue,
               userInfo: userInfo
             ),
@@ -651,7 +651,7 @@ extension URLSession: RCNConfigFetchSession {
             }
             RCLog.error("I-RCN000044", errStr + ".")
             let error = NSError(
-              domain: RemoteConfigErrorDomain,
+              domain: ConfigConstants.remoteConfigErrorDomain,
               code: RemoteConfigError.internalError.rawValue,
               userInfo: [NSLocalizedDescriptionKey: errStr]
             )