fixes

firebase · Jan 9, 2025 · 8d373c7 · 8d373c7
1 parent d4e5be3
commit 8d373c7
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 66 deletions.
diff --git a/FirebaseRemoteConfig.podspec b/FirebaseRemoteConfig.podspec
@@ -129,7 +129,6 @@ 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

diff --git a/FirebaseRemoteConfig/Sources/Private/FIRRemoteConfig_Private.h b/FirebaseRemoteConfig/Sources/Private/FIRRemoteConfig_Private.h
diff --git a/FirebaseRemoteConfig/SwiftNew/RemoteConfig.swift b/FirebaseRemoteConfig/SwiftNew/RemoteConfig.swift
@@ -861,8 +861,9 @@ open class RemoteConfig: NSObject, NSFastEnumeration {
   /// - Returns              Returns a registration representing the listener. The registration
   /// contains a remove method, which can be used to stop receiving updates for the provided
   /// listener.
-  @objc public func addOnConfigUpdateListener(remoteConfigUpdateCompletion listener: @Sendable @escaping (RemoteConfigUpdate?,
-                                                                                                          Error?)
+  @discardableResult
+  @objc(addOnConfigUpdateListener:) public func addOnConfigUpdateListener(remoteConfigUpdateCompletion listener: @Sendable @escaping (RemoteConfigUpdate?,
+                                                                                                                                      Error?)
       -> Void)
     -> ConfigUpdateListenerRegistration {
     return configRealtime.addConfigUpdateListener(listener)

diff --git a/FirebaseRemoteConfig/Tests/Sample/RemoteConfigSampleApp/ViewController.m b/FirebaseRemoteConfig/Tests/Sample/RemoteConfigSampleApp/ViewController.m
@@ -18,13 +18,20 @@
 #import <FirebaseCore/FIROptions.h>
 #import <FirebaseCore/FirebaseCore.h>
 #import <FirebaseInstallations/FirebaseInstallations.h>
-#import <FirebaseRemoteConfig/FirebaseRemoteConfig.h>
-#import "../../../Sources/Private/FIRRemoteConfig_Private.h"
+@import FirebaseRemoteConfig;
 #import "FRCLog.h"
 
-@import FirebaseRemoteConfig;
 @import FirebaseRemoteConfigInterop;
 
+typedef void (^FIRRemoteConfigFetchCompletion)(FIRRemoteConfigFetchStatus status,
+                                               NSError *_Nullable error)
+    NS_SWIFT_UNAVAILABLE("Use Swift's closure syntax instead.");
+typedef void (^FIRRemoteConfigActivateCompletion)(NSError *_Nullable error)
+    NS_SWIFT_UNAVAILABLE("Use Swift's closure syntax instead.");
+typedef void (^FIRRemoteConfigFetchAndActivateCompletion)(
+    FIRRemoteConfigFetchAndActivateStatus status, NSError *_Nullable error)
+    NS_SWIFT_UNAVAILABLE("Use Swift's closure syntax instead.");
+
 static NSString *const FIRPerfNamespace = @"fireperf";
 static NSString *const FIRDefaultFIRAppName = @"__FIRAPP_DEFAULT";
 static NSString *const FIRSecondFIRAppName = @"secondFIRApp";

diff --git a/Package.swift b/Package.swift
@@ -996,8 +996,7 @@ let package = Package(
     ),
     .testTarget(
       name: "RemoteConfigFakeConsole",
-      dependencies: ["FirebaseRemoteConfig",
-                     "RemoteConfigFakeConsoleObjC"],
+      dependencies: ["FirebaseRemoteConfig"],
       path: "FirebaseRemoteConfig/Tests/Swift",
       exclude: [
         "AccessToken.json",
@@ -1011,15 +1010,6 @@ let package = Package(
         .headerSearchPath("../../../"),
       ]
     ),
-    .target(
-      name: "RemoteConfigFakeConsoleObjC",
-      dependencies: [.product(name: "OCMock", package: "ocmock")],
-      path: "FirebaseRemoteConfig/Tests/Swift/ObjC",
-      publicHeadersPath: ".",
-      cSettings: [
-        .headerSearchPath("../../../../"),
-      ]
-    ),
     // Internal headers only for consuming from other SDK.
     .target(
       name: "FirebaseRemoteConfigInterop",