Skip to content

Commit b12503d

Browse files
engali94engali94
authored
Merge pull request #34 from engali94/update-deprecated
Update deprecated & Bump version 0.3.9
2 parents 8c6d412 + 24ff741 commit b12503d

12 files changed

+420
-193
lines changed

‎Podfile.lock

+385-154
Large diffs are not rendered by default.

‎RxFirebase.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
Pod::Spec.new do |s|
1010
s.name = 'RxFirebase'
11-
s.version = '0.3.8'
11+
s.version = '0.3.9'
1212
s.summary = 'RxSwift extensions for Firebase.'
1313

1414
# This description is used to generate tags and improve search results.

‎RxFirebase.xcodeproj/project.pbxproj

+13-17
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
97510B32221891EE00722D52 /* RxFirebaseStorage.podspec in Resources */ = {isa = PBXBuildFile; fileRef = 97510B31221891EE00722D52 /* RxFirebaseStorage.podspec */; };
2121
97510B342218928800722D52 /* RxFirebaseFunctions.podspec in Resources */ = {isa = PBXBuildFile; fileRef = 97510B332218928800722D52 /* RxFirebaseFunctions.podspec */; };
2222
97510B382218A83F00722D52 /* RxFirebaseAuthentication.podspec in Resources */ = {isa = PBXBuildFile; fileRef = 97510B372218A83F00722D52 /* RxFirebaseAuthentication.podspec */; };
23-
DE36A9F6ABD46F6983D58756 /* Pods_Example___tvOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF91522DED7F2FCAD7518147 /* Pods_Example___tvOS.framework */; };
2423
FB9A33922F58CBCEB483797A /* Pods_RxFirebase_Example_tvOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A3C3E953D330487A65186FB8 /* Pods_RxFirebase_Example_tvOS.framework */; };
2524
/* End PBXBuildFile section */
2625

@@ -58,7 +57,6 @@
5857
B2E93982D2C0A28AF5F580D4 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
5958
B8496169945A170C3255767D /* Pods-RxFirebase_Example_tvOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RxFirebase_Example_tvOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-RxFirebase_Example_tvOS/Pods-RxFirebase_Example_tvOS.release.xcconfig"; sourceTree = "<group>"; };
6059
C580F5CD4C129AE9AE8D4CB4 /* Pods_RxFirebase_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RxFirebase_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
61-
DF91522DED7F2FCAD7518147 /* Pods_Example___tvOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = "Pods_Example___tvOS.framework"; sourceTree = BUILT_PRODUCTS_DIR; };
6260
/* End PBXFileReference section */
6361

6462
/* Begin PBXFrameworksBuildPhase section */
@@ -74,7 +72,6 @@
7472
isa = PBXFrameworksBuildPhase;
7573
buildActionMask = 2147483647;
7674
files = (
77-
DE36A9F6ABD46F6983D58756 /* Pods_Example___tvOS.framework in Frameworks */,
7875
FB9A33922F58CBCEB483797A /* Pods_RxFirebase_Example_tvOS.framework in Frameworks */,
7976
);
8077
runOnlyForDeploymentPostprocessing = 0;
@@ -158,7 +155,6 @@
158155
children = (
159156
C580F5CD4C129AE9AE8D4CB4 /* Pods_RxFirebase_Example.framework */,
160157
43B3387481C4516DAB44B114 /* Pods_RxFirebase_Example_macOS.framework */,
161-
DF91522DED7F2FCAD7518147 /* Pods_Example___tvOS.framework */,
162158
A3C3E953D330487A65186FB8 /* Pods_RxFirebase_Example_tvOS.framework */,
163159
);
164160
name = Frameworks;
@@ -336,33 +332,33 @@
336332
buildActionMask = 2147483647;
337333
files = (
338334
);
339-
inputFileListPaths = (
340-
);
341335
inputPaths = (
342336
"${PODS_ROOT}/Target Support Files/Pods-RxFirebase_Example/Pods-RxFirebase_Example-frameworks.sh",
343337
"${BUILT_PRODUCTS_DIR}/BoringSSL-GRPC/openssl_grpc.framework",
344338
"${BUILT_PRODUCTS_DIR}/GTMSessionFetcher-iOS/GTMSessionFetcher.framework",
345-
"${BUILT_PRODUCTS_DIR}/GoogleUtilities-00567490/GoogleUtilities.framework",
346-
"${BUILT_PRODUCTS_DIR}/Protobuf/Protobuf.framework",
339+
"${BUILT_PRODUCTS_DIR}/GoogleUtilities-54e75ca4/GoogleUtilities.framework",
340+
"${BUILT_PRODUCTS_DIR}/PromisesObjC-iOS/FBLPromises.framework",
341+
"${BUILT_PRODUCTS_DIR}/Protobuf/protobuf.framework",
347342
"${BUILT_PRODUCTS_DIR}/RxCocoa-iOS/RxCocoa.framework",
348343
"${BUILT_PRODUCTS_DIR}/RxRelay-iOS/RxRelay.framework",
349344
"${BUILT_PRODUCTS_DIR}/RxSwift-iOS/RxSwift.framework",
345+
"${BUILT_PRODUCTS_DIR}/abseil/absl.framework",
350346
"${BUILT_PRODUCTS_DIR}/gRPC-C++/grpcpp.framework",
351347
"${BUILT_PRODUCTS_DIR}/gRPC-Core/grpc.framework",
352348
"${BUILT_PRODUCTS_DIR}/leveldb-library-iOS/leveldb.framework",
353-
"${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework",
349+
"${BUILT_PRODUCTS_DIR}/nanopb-iOS/nanopb.framework",
354350
);
355351
name = "[CP] Embed Pods Frameworks";
356-
outputFileListPaths = (
357-
);
358352
outputPaths = (
359353
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl_grpc.framework",
360354
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMSessionFetcher.framework",
361355
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework",
362-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Protobuf.framework",
356+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework",
357+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/protobuf.framework",
363358
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework",
364359
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxRelay.framework",
365360
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework",
361+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/absl.framework",
366362
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/grpcpp.framework",
367363
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/grpc.framework",
368364
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/leveldb.framework",
@@ -378,27 +374,27 @@
378374
buildActionMask = 2147483647;
379375
files = (
380376
);
381-
inputFileListPaths = (
382-
);
383377
inputPaths = (
384378
"${PODS_ROOT}/Target Support Files/Pods-RxFirebase_Example_tvOS/Pods-RxFirebase_Example_tvOS-frameworks.sh",
385379
"${BUILT_PRODUCTS_DIR}/GTMSessionFetcher-tvOS/GTMSessionFetcher.framework",
386-
"${BUILT_PRODUCTS_DIR}/GoogleUtilities-Environment-Logger/GoogleUtilities.framework",
380+
"${BUILT_PRODUCTS_DIR}/GoogleUtilities-df6f21d7/GoogleUtilities.framework",
381+
"${BUILT_PRODUCTS_DIR}/PromisesObjC-tvOS/FBLPromises.framework",
387382
"${BUILT_PRODUCTS_DIR}/RxCocoa-tvOS/RxCocoa.framework",
388383
"${BUILT_PRODUCTS_DIR}/RxRelay-tvOS/RxRelay.framework",
389384
"${BUILT_PRODUCTS_DIR}/RxSwift-tvOS/RxSwift.framework",
390385
"${BUILT_PRODUCTS_DIR}/leveldb-library-tvOS/leveldb.framework",
386+
"${BUILT_PRODUCTS_DIR}/nanopb-tvOS/nanopb.framework",
391387
);
392388
name = "[CP] Embed Pods Frameworks";
393-
outputFileListPaths = (
394-
);
395389
outputPaths = (
396390
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMSessionFetcher.framework",
397391
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework",
392+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework",
398393
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework",
399394
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxRelay.framework",
400395
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework",
401396
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/leveldb.framework",
397+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework",
402398
);
403399
runOnlyForDeploymentPostprocessing = 0;
404400
shellPath = /bin/sh;

‎RxFirebaseAuthentication.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'RxFirebaseAuthentication'
3-
s.version = '0.3.8'
3+
s.version = '0.3.9'
44
s.summary = 'RxSwift extensions for FirebaseAuth.'
55

66
# This description is used to generate tags and improve search results.

‎RxFirebaseDatabase.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'RxFirebaseDatabase'
3-
s.version = '0.3.8'
3+
s.version = '0.3.9'
44
s.summary = 'RxSwift extensions for FirebaseDatabase.'
55

66
# This description is used to generate tags and improve search results.

‎RxFirebaseFirestore.podspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'RxFirebaseFirestore'
3-
s.version = '0.3.8'
3+
s.version = '0.3.9'
44
s.summary = 'RxSwift extensions for FirebaseFirestore.'
55

66
# This description is used to generate tags and improve search results.
@@ -28,7 +28,7 @@ Pod::Spec.new do |s|
2828
s.static_framework = true
2929
s.dependency 'RxSwift', '~> 5'
3030
s.dependency 'RxCocoa', '~> 5'
31-
s.dependency 'FirebaseFirestore', '~> 1.5'
31+
s.dependency 'FirebaseFirestore', '~> 1.1'
3232

3333
s.source_files = 'Sources/Firestore/**/*'
3434
end

‎RxFirebaseFunctions.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'RxFirebaseFunctions'
3-
s.version = '0.3.8'
3+
s.version = '0.3.9'
44
s.summary = 'RxSwift extensions for FirebaseFunctions.'
55

66
# This description is used to generate tags and improve search results.

‎RxFirebaseRemoteConfig.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'RxFirebaseRemoteConfig'
3-
s.version = '0.3.8'
3+
s.version = '0.3.9'
44
s.summary = 'RxSwift extensions for FirebaseFirestore.'
55

66
# This description is used to generate tags and improve search results.

‎RxFirebaseStorage.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'RxFirebaseStorage'
3-
s.version = '0.3.8'
3+
s.version = '0.3.9'
44
s.summary = 'RxSwift extensions for FirebaseStorage.'
55

66
# This description is used to generate tags and improve search results.

‎Sources/Auth/FIRAuth+Rx.swift

+9-9
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ extension Reactive where Base: Auth {
4747
*/
4848
public func fetchProviders(forEmail email: String) -> Observable<[String]> {
4949
return Observable.create { observer in
50-
self.base.fetchProviders(forEmail: email) { providers, error in
50+
self.base.fetchSignInMethods(forEmail: email) { providers, error in
5151
guard let error = error else {
5252
observer.onNext(providers ?? [])
5353
observer.onCompleted()
@@ -59,7 +59,7 @@ extension Reactive where Base: Auth {
5959
}
6060
}
6161

62-
/**
62+
/**
6363
@brief Fetches the list of all sign-in methods previously used for the provided email address.
6464

6565
@param email The email address for which to obtain a list of sign-in methods.
@@ -155,7 +155,7 @@ extension Reactive where Base: Auth {
155155
}
156156
}
157157

158-
/**
158+
/**
159159
@brief Asynchronously signs in to Firebase with the given 3rd-party credentials (e.g. a Facebook
160160
login Access Token, a Google ID Token/Access Token pair, etc.) and returns additional
161161
identity provider data.
@@ -197,7 +197,7 @@ extension Reactive where Base: Auth {
197197
*/
198198
public func signInAndRetrieveData(with credential: AuthCredential) -> Observable<AuthDataResult> {
199199
return Observable.create { observer in
200-
self.base.signInAndRetrieveData(with: credential) { auth, error in
200+
self.base.signIn(with: credential) { auth, error in
201201
if let error = error {
202202
observer.onError(error)
203203
} else if let auth = auth {
@@ -270,7 +270,7 @@ extension Reactive where Base: Auth {
270270
}
271271
}
272272

273-
/**
273+
/**
274274
@brief Creates and, on success, signs in a user with the given email address and password.
275275

276276
@param email The user's email address.
@@ -339,7 +339,7 @@ extension Reactive where Base: Auth {
339339
}
340340
}
341341

342-
/**
342+
/**
343343
@brief Checks the validity of an out of band code.
344344

345345
@param code The out of band code to check validity.
@@ -360,7 +360,7 @@ extension Reactive where Base: Auth {
360360
}
361361
}
362362

363-
/**
363+
/**
364364
@brief Checks the validity of a verify password reset code.
365365

366366
@param code The password reset code to be verified.
@@ -405,7 +405,7 @@ extension Reactive where Base: Auth {
405405
}
406406
}
407407

408-
/**
408+
/**
409409
@brief Initiates a password reset for the given email address.
410410

411411
@param email The email address of the user.
@@ -531,7 +531,7 @@ extension Reactive where Base: Auth {
531531
}
532532
}
533533

534-
/**
534+
/**
535535
@brief Registers a block as an "ID token did change" listener. To be invoked when:
536536

537537
+ The block is registered as a listener,

‎Sources/Auth/FIRUser+Rx.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ extension Reactive where Base: User {
186186
*/
187187
public func reauthenticateAndRetrieveData(with credential: AuthCredential) -> Observable<AuthDataResult> {
188188
return Observable.create { observer in
189-
self.base.reauthenticateAndRetrieveData(with: credential) { result, error in
189+
self.base.reauthenticate(with: credential) { result, error in
190190
if let error = error {
191191
observer.onError(error)
192192
} else if let result = result {
@@ -296,7 +296,7 @@ extension Reactive where Base: User {
296296
}
297297
}
298298

299-
/**
299+
/**
300300
@brief Associates a user account from a third-party identity provider with this user and
301301
returns additional identity provider data.
302302

@@ -322,7 +322,7 @@ extension Reactive where Base: User {
322322
*/
323323
public func linkAndRetrieveData(with credential: AuthCredential) -> Observable<AuthDataResult> {
324324
return Observable.create { observer in
325-
self.base.linkAndRetrieveData(with: credential) { result, error in
325+
self.base.link(with: credential) { result, error in
326326
if let error = error {
327327
observer.onError(error)
328328
} else if let result = result {

‎Sources/RemoteConfig/RemoteConfig+Rx.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ extension Reactive where Base: RemoteConfig {
2020
self.base.fetch { status, error in
2121
guard let error = error else {
2222
if activateFetched, status == .success {
23-
self.base.activateFetched()
23+
self.base.activate()
2424
}
2525
observer.onNext(status)
2626
observer.onCompleted()
@@ -42,7 +42,7 @@ extension Reactive where Base: RemoteConfig {
4242
self.base.fetch(withExpirationDuration: duration) { status, error in
4343
guard let error = error else {
4444
if activateFetched, status == .success {
45-
self.base.activateFetched()
45+
self.base.activate()
4646
}
4747
observer.onNext(status)
4848
observer.onCompleted()

0 commit comments

Comments
 (0)