Skip to content

Commit 5485b92

Browse files
committed
fixes
1 parent 86faab6 commit 5485b92

File tree

5 files changed

+14
-66
lines changed

5 files changed

+14
-66
lines changed

FirebaseRemoteConfig.podspec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ app update.
129129
fake_console.source_files = ['FirebaseRemoteConfig/Tests/Swift/SwiftAPI/*.swift',
130130
'FirebaseRemoteConfig/Tests/Swift/FakeUtils/*.swift',
131131
'FirebaseRemoteConfig/Tests/Swift/FakeConsole/*.swift',
132-
'FirebaseRemoteConfig/Tests/Swift/ObjC/*.[hm]',
133132
]
134133
fake_console.resources = 'FirebaseRemoteConfig/Tests/Swift/Defaults-testInfo.plist'
135134
fake_console.requires_app_host = true

FirebaseRemoteConfig/Sources/Private/FIRRemoteConfig_Private.h

Lines changed: 0 additions & 49 deletions
This file was deleted.

FirebaseRemoteConfig/SwiftNew/RemoteConfig.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -861,8 +861,9 @@ open class RemoteConfig: NSObject, NSFastEnumeration {
861861
/// - Returns Returns a registration representing the listener. The registration
862862
/// contains a remove method, which can be used to stop receiving updates for the provided
863863
/// listener.
864-
@objc public func addOnConfigUpdateListener(remoteConfigUpdateCompletion listener: @Sendable @escaping (RemoteConfigUpdate?,
865-
Error?)
864+
@discardableResult
865+
@objc(addOnConfigUpdateListener:) public func addOnConfigUpdateListener(remoteConfigUpdateCompletion listener: @Sendable @escaping (RemoteConfigUpdate?,
866+
Error?)
866867
-> Void)
867868
-> ConfigUpdateListenerRegistration {
868869
return configRealtime.addConfigUpdateListener(listener)

FirebaseRemoteConfig/Tests/Sample/RemoteConfigSampleApp/ViewController.m

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,20 @@
1818
#import <FirebaseCore/FIROptions.h>
1919
#import <FirebaseCore/FirebaseCore.h>
2020
#import <FirebaseInstallations/FirebaseInstallations.h>
21-
#import <FirebaseRemoteConfig/FirebaseRemoteConfig.h>
22-
#import "../../../Sources/Private/FIRRemoteConfig_Private.h"
21+
@import FirebaseRemoteConfig;
2322
#import "FRCLog.h"
2423

25-
@import FirebaseRemoteConfig;
2624
@import FirebaseRemoteConfigInterop;
2725

26+
typedef void (^FIRRemoteConfigFetchCompletion)(FIRRemoteConfigFetchStatus status,
27+
NSError *_Nullable error)
28+
NS_SWIFT_UNAVAILABLE("Use Swift's closure syntax instead.");
29+
typedef void (^FIRRemoteConfigActivateCompletion)(NSError *_Nullable error)
30+
NS_SWIFT_UNAVAILABLE("Use Swift's closure syntax instead.");
31+
typedef void (^FIRRemoteConfigFetchAndActivateCompletion)(
32+
FIRRemoteConfigFetchAndActivateStatus status, NSError *_Nullable error)
33+
NS_SWIFT_UNAVAILABLE("Use Swift's closure syntax instead.");
34+
2835
static NSString *const FIRPerfNamespace = @"fireperf";
2936
static NSString *const FIRDefaultFIRAppName = @"__FIRAPP_DEFAULT";
3037
static NSString *const FIRSecondFIRAppName = @"secondFIRApp";

Package.swift

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -996,8 +996,7 @@ let package = Package(
996996
),
997997
.testTarget(
998998
name: "RemoteConfigFakeConsole",
999-
dependencies: ["FirebaseRemoteConfig",
1000-
"RemoteConfigFakeConsoleObjC"],
999+
dependencies: ["FirebaseRemoteConfig"],
10011000
path: "FirebaseRemoteConfig/Tests/Swift",
10021001
exclude: [
10031002
"AccessToken.json",
@@ -1011,15 +1010,6 @@ let package = Package(
10111010
.headerSearchPath("../../../"),
10121011
]
10131012
),
1014-
.target(
1015-
name: "RemoteConfigFakeConsoleObjC",
1016-
dependencies: [.product(name: "OCMock", package: "ocmock")],
1017-
path: "FirebaseRemoteConfig/Tests/Swift/ObjC",
1018-
publicHeadersPath: ".",
1019-
cSettings: [
1020-
.headerSearchPath("../../../../"),
1021-
]
1022-
),
10231013
// Internal headers only for consuming from other SDK.
10241014
.target(
10251015
name: "FirebaseRemoteConfigInterop",

0 commit comments

Comments
 (0)