Merge pull request #34 from engali94/update-deprecated

Update deprecated & Bump version 0.3.9
RxSwiftCommunity · May 13, 2020 · b12503d · b12503d
2 parents 8c6d412 + 24ff741
commit b12503d
Show file tree

Hide file tree

Showing 12 changed files with 420 additions and 193 deletions.
diff --git a/Podfile.lock b/Podfile.lock
diff --git a/RxFirebase.podspec b/RxFirebase.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
     s.name             = 'RxFirebase'
-    s.version          = '0.3.8'
+    s.version          = '0.3.9'
     s.summary          = 'RxSwift extensions for Firebase.'
 
     # This description is used to generate tags and improve search results.

diff --git a/RxFirebase.xcodeproj/project.pbxproj b/RxFirebase.xcodeproj/project.pbxproj
@@ -20,7 +20,6 @@
 		97510B32221891EE00722D52 /* RxFirebaseStorage.podspec in Resources */ = {isa = PBXBuildFile; fileRef = 97510B31221891EE00722D52 /* RxFirebaseStorage.podspec */; };
 		97510B342218928800722D52 /* RxFirebaseFunctions.podspec in Resources */ = {isa = PBXBuildFile; fileRef = 97510B332218928800722D52 /* RxFirebaseFunctions.podspec */; };
 		97510B382218A83F00722D52 /* RxFirebaseAuthentication.podspec in Resources */ = {isa = PBXBuildFile; fileRef = 97510B372218A83F00722D52 /* RxFirebaseAuthentication.podspec */; };
-		DE36A9F6ABD46F6983D58756 /* Pods_Example___tvOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF91522DED7F2FCAD7518147 /* Pods_Example___tvOS.framework */; };
 		FB9A33922F58CBCEB483797A /* Pods_RxFirebase_Example_tvOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A3C3E953D330487A65186FB8 /* Pods_RxFirebase_Example_tvOS.framework */; };
 /* End PBXBuildFile section */
 
@@ -58,7 +57,6 @@
 		B2E93982D2C0A28AF5F580D4 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
 		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>"; };
 		C580F5CD4C129AE9AE8D4CB4 /* Pods_RxFirebase_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RxFirebase_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		DF91522DED7F2FCAD7518147 /* Pods_Example___tvOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = "Pods_Example___tvOS.framework"; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -74,7 +72,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				DE36A9F6ABD46F6983D58756 /* Pods_Example___tvOS.framework in Frameworks */,
 				FB9A33922F58CBCEB483797A /* Pods_RxFirebase_Example_tvOS.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -158,7 +155,6 @@
 			children = (
 				C580F5CD4C129AE9AE8D4CB4 /* Pods_RxFirebase_Example.framework */,
 				43B3387481C4516DAB44B114 /* Pods_RxFirebase_Example_macOS.framework */,
-				DF91522DED7F2FCAD7518147 /* Pods_Example___tvOS.framework */,
 				A3C3E953D330487A65186FB8 /* Pods_RxFirebase_Example_tvOS.framework */,
 			);
 			name = Frameworks;
@@ -336,33 +332,33 @@
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputFileListPaths = (
-			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-RxFirebase_Example/Pods-RxFirebase_Example-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/BoringSSL-GRPC/openssl_grpc.framework",
 				"${BUILT_PRODUCTS_DIR}/GTMSessionFetcher-iOS/GTMSessionFetcher.framework",
-				"${BUILT_PRODUCTS_DIR}/GoogleUtilities-00567490/GoogleUtilities.framework",
-				"${BUILT_PRODUCTS_DIR}/Protobuf/Protobuf.framework",
+				"${BUILT_PRODUCTS_DIR}/GoogleUtilities-54e75ca4/GoogleUtilities.framework",
+				"${BUILT_PRODUCTS_DIR}/PromisesObjC-iOS/FBLPromises.framework",
+				"${BUILT_PRODUCTS_DIR}/Protobuf/protobuf.framework",
 				"${BUILT_PRODUCTS_DIR}/RxCocoa-iOS/RxCocoa.framework",
 				"${BUILT_PRODUCTS_DIR}/RxRelay-iOS/RxRelay.framework",
 				"${BUILT_PRODUCTS_DIR}/RxSwift-iOS/RxSwift.framework",
+				"${BUILT_PRODUCTS_DIR}/abseil/absl.framework",
 				"${BUILT_PRODUCTS_DIR}/gRPC-C++/grpcpp.framework",
 				"${BUILT_PRODUCTS_DIR}/gRPC-Core/grpc.framework",
 				"${BUILT_PRODUCTS_DIR}/leveldb-library-iOS/leveldb.framework",
-				"${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework",
+				"${BUILT_PRODUCTS_DIR}/nanopb-iOS/nanopb.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-			);
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl_grpc.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMSessionFetcher.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Protobuf.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/protobuf.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxRelay.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/absl.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/grpcpp.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/grpc.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/leveldb.framework",
@@ -378,27 +374,27 @@
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputFileListPaths = (
-			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-RxFirebase_Example_tvOS/Pods-RxFirebase_Example_tvOS-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/GTMSessionFetcher-tvOS/GTMSessionFetcher.framework",
-				"${BUILT_PRODUCTS_DIR}/GoogleUtilities-Environment-Logger/GoogleUtilities.framework",
+				"${BUILT_PRODUCTS_DIR}/GoogleUtilities-df6f21d7/GoogleUtilities.framework",
+				"${BUILT_PRODUCTS_DIR}/PromisesObjC-tvOS/FBLPromises.framework",
 				"${BUILT_PRODUCTS_DIR}/RxCocoa-tvOS/RxCocoa.framework",
 				"${BUILT_PRODUCTS_DIR}/RxRelay-tvOS/RxRelay.framework",
 				"${BUILT_PRODUCTS_DIR}/RxSwift-tvOS/RxSwift.framework",
 				"${BUILT_PRODUCTS_DIR}/leveldb-library-tvOS/leveldb.framework",
+				"${BUILT_PRODUCTS_DIR}/nanopb-tvOS/nanopb.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-			);
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMSessionFetcher.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxRelay.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/leveldb.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;

diff --git a/RxFirebaseAuthentication.podspec b/RxFirebaseAuthentication.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name             = 'RxFirebaseAuthentication'
-    s.version          = '0.3.8'
+    s.version          = '0.3.9'
     s.summary          = 'RxSwift extensions for FirebaseAuth.'
 
     # This description is used to generate tags and improve search results.

diff --git a/RxFirebaseDatabase.podspec b/RxFirebaseDatabase.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name             = 'RxFirebaseDatabase'
-    s.version          = '0.3.8'
+    s.version          = '0.3.9'
     s.summary          = 'RxSwift extensions for FirebaseDatabase.'
 
     # This description is used to generate tags and improve search results.

diff --git a/RxFirebaseFirestore.podspec b/RxFirebaseFirestore.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name             = 'RxFirebaseFirestore'
-    s.version          = '0.3.8'
+    s.version          = '0.3.9'
     s.summary          = 'RxSwift extensions for FirebaseFirestore.'
 
     # This description is used to generate tags and improve search results.
@@ -28,7 +28,7 @@ Pod::Spec.new do |s|
     s.static_framework = true
     s.dependency 'RxSwift', '~> 5'
     s.dependency 'RxCocoa', '~> 5'
-    s.dependency 'FirebaseFirestore', '~> 1.5'
+    s.dependency 'FirebaseFirestore', '~> 1.1'
 
     s.source_files = 'Sources/Firestore/**/*'
 end
diff --git a/RxFirebaseFunctions.podspec b/RxFirebaseFunctions.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name             = 'RxFirebaseFunctions'
-    s.version          = '0.3.8'
+    s.version          = '0.3.9'
     s.summary          = 'RxSwift extensions for FirebaseFunctions.'
 
     # This description is used to generate tags and improve search results.

diff --git a/RxFirebaseRemoteConfig.podspec b/RxFirebaseRemoteConfig.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name             = 'RxFirebaseRemoteConfig'
-    s.version          = '0.3.8'
+    s.version          = '0.3.9'
     s.summary          = 'RxSwift extensions for FirebaseFirestore.'
 
     # This description is used to generate tags and improve search results.

diff --git a/RxFirebaseStorage.podspec b/RxFirebaseStorage.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name             = 'RxFirebaseStorage'
-    s.version          = '0.3.8'
+    s.version          = '0.3.9'
     s.summary          = 'RxSwift extensions for FirebaseStorage.'
 
     # This description is used to generate tags and improve search results.

diff --git a/Sources/Auth/FIRAuth+Rx.swift b/Sources/Auth/FIRAuth+Rx.swift
@@ -47,7 +47,7 @@ extension Reactive where Base: Auth {
      */
     public func fetchProviders(forEmail email: String) -> Observable<[String]> {
         return Observable.create { observer in
-            self.base.fetchProviders(forEmail: email) { providers, error in
+            self.base.fetchSignInMethods(forEmail: email) { providers, error in
                 guard let error = error else {
                     observer.onNext(providers ?? [])
                     observer.onCompleted()
@@ -59,7 +59,7 @@ extension Reactive where Base: Auth {
         }
     }
 
-    /** 
+    /**
      @brief Fetches the list of all sign-in methods previously used for the provided email address.
      
      @param email The email address for which to obtain a list of sign-in methods.
@@ -155,7 +155,7 @@ extension Reactive where Base: Auth {
         }
     }
 
-    /** 
+    /**
      @brief Asynchronously signs in to Firebase with the given 3rd-party credentials (e.g. a Facebook
      login Access Token, a Google ID Token/Access Token pair, etc.) and returns additional
      identity provider data.
@@ -197,7 +197,7 @@ extension Reactive where Base: Auth {
      */
     public func signInAndRetrieveData(with credential: AuthCredential) -> Observable<AuthDataResult> {
         return Observable.create { observer in
-            self.base.signInAndRetrieveData(with: credential) { auth, error in
+            self.base.signIn(with: credential) { auth, error in
                 if let error = error {
                     observer.onError(error)
                 } else if let auth = auth {
@@ -270,7 +270,7 @@ extension Reactive where Base: Auth {
         }
     }
 
-    /** 
+    /**
      @brief Creates and, on success, signs in a user with the given email address and password.
      
      @param email The user's email address.
@@ -339,7 +339,7 @@ extension Reactive where Base: Auth {
         }
     }
 
-    /** 
+    /**
      @brief Checks the validity of an out of band code.
      
      @param code The out of band code to check validity.
@@ -360,7 +360,7 @@ extension Reactive where Base: Auth {
         }
     }
 
-    /** 
+    /**
      @brief Checks the validity of a verify password reset code.
      
      @param code The password reset code to be verified.
@@ -405,7 +405,7 @@ extension Reactive where Base: Auth {
         }
     }
 
-    /** 
+    /**
      @brief Initiates a password reset for the given email address.
      
      @param email The email address of the user.
@@ -531,7 +531,7 @@ extension Reactive where Base: Auth {
         }
     }
 
-    /** 
+    /**
      @brief Registers a block as an "ID token did change" listener. To be invoked when:
      
      + The block is registered as a listener,

diff --git a/Sources/Auth/FIRUser+Rx.swift b/Sources/Auth/FIRUser+Rx.swift
@@ -186,7 +186,7 @@ extension Reactive where Base: User {
      */
     public func reauthenticateAndRetrieveData(with credential: AuthCredential) -> Observable<AuthDataResult> {
         return Observable.create { observer in
-            self.base.reauthenticateAndRetrieveData(with: credential) { result, error in
+            self.base.reauthenticate(with: credential) { result, error in
                 if let error = error {
                     observer.onError(error)
                 } else if let result = result {
@@ -296,7 +296,7 @@ extension Reactive where Base: User {
         }
     }
 
-    /** 
+    /**
      @brief Associates a user account from a third-party identity provider with this user and
      returns additional identity provider data.
      
@@ -322,7 +322,7 @@ extension Reactive where Base: User {
      */
     public func linkAndRetrieveData(with credential: AuthCredential) -> Observable<AuthDataResult> {
         return Observable.create { observer in
-            self.base.linkAndRetrieveData(with: credential) { result, error in
+            self.base.link(with: credential) { result, error in
                 if let error = error {
                     observer.onError(error)
                 } else if let result = result {

diff --git a/Sources/RemoteConfig/RemoteConfig+Rx.swift b/Sources/RemoteConfig/RemoteConfig+Rx.swift
@@ -20,7 +20,7 @@ extension Reactive where Base: RemoteConfig {
             self.base.fetch { status, error in
                 guard let error = error else {
                     if activateFetched, status == .success {
-                        self.base.activateFetched()
+                        self.base.activate()
                     }
                     observer.onNext(status)
                     observer.onCompleted()
@@ -42,7 +42,7 @@ extension Reactive where Base: RemoteConfig {
             self.base.fetch(withExpirationDuration: duration) { status, error in
                 guard let error = error else {
                     if activateFetched, status == .success {
-                        self.base.activateFetched()
+                        self.base.activate()
                     }
                     observer.onNext(status)
                     observer.onCompleted()