Merge pull request #690 from morganchen12/auth

Fix using deprecated method

Author: morganchen12

Auth/FirebaseAuthUI/FUIAuth.m

@@ -197,9 +197,9 @@ - (void)signInWithProviderUI:(id<FUIAuthProvider>)providerUI
                                   credential:credential
                               resultCallback:result];
     } else {
-      [self.auth signInAndRetrieveDataWithCredential:credential
-                                          completion:^(FIRAuthDataResult *_Nullable authResult,
-                                                       NSError *_Nullable error) {
+      [self.auth signInWithCredential:credential
+                           completion:^(FIRAuthDataResult *_Nullable authResult,
+                                        NSError *_Nullable error) {
         if (error && error.code == FIRAuthErrorCodeAccountExistsWithDifferentCredential) {
           NSString *email = error.userInfo[kErrorUserInfoEmailKey];
           [self.emailAuthProvider handleAccountLinkingForEmail:email
@@ -230,9 +230,9 @@ - (void)autoUpgradeAccountWithProviderUI:(id<FUIAuthProvider>)providerUI
                               credential:(nullable FIRAuthCredential *)credential
                           resultCallback:(nullable FIRAuthResultCallback)callback {
   [self.auth.currentUser
-      linkAndRetrieveDataWithCredential:credential
-                             completion:^(FIRAuthDataResult *_Nullable authResult,
-                                          NSError * _Nullable error) {
+      linkWithCredential:credential
+              completion:^(FIRAuthDataResult *_Nullable authResult,
+                           NSError * _Nullable error) {
     if (error) {
       // Check for "credential in use" conflict error and handle appropriately.
       if (error.code == FIRAuthErrorCodeCredentialAlreadyInUse) {
@@ -283,9 +283,9 @@ - (void)autoUpgradeAccountWithProviderUI:(id<FUIAuthProvider>)providerUI
               return;
             }
 
-            [authResult.user linkAndRetrieveDataWithCredential:credential
-                                                    completion:^(FIRAuthDataResult *authResult,
-                                                                 NSError *linkError) {
+            [authResult.user linkWithCredential:credential
+                                     completion:^(FIRAuthDataResult *authResult,
+                                                  NSError *linkError) {
               if (linkError) {
                 [self completeSignInWithResult:nil
                                          error:linkError

Auth/Podfile.lock

@@ -1,21 +1,34 @@
 PODS:
-  - Firebase/Auth (5.18.0):
+  - Firebase/Auth (6.1.0):
     - Firebase/CoreOnly
-    - FirebaseAuth (= 5.4.0)
-  - Firebase/CoreOnly (5.18.0):
-    - FirebaseCore (= 5.3.1)
-  - FirebaseAuth (5.4.0):
+    - FirebaseAuth (~> 6.1.0)
+  - Firebase/CoreOnly (6.1.0):
+    - FirebaseCore (= 6.0.1)
+  - FirebaseAuth (6.1.0):
     - FirebaseAuthInterop (~> 1.0)
-    - FirebaseCore (~> 5.2)
-    - GoogleUtilities/Environment (~> 5.2)
+    - FirebaseCore (~> 6.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 6.0)
+    - GoogleUtilities/Environment (~> 6.0)
     - GTMSessionFetcher/Core (~> 1.1)
   - FirebaseAuthInterop (1.0.0)
-  - FirebaseCore (5.3.1):
-    - GoogleUtilities/Logger (~> 5.2)
-  - GoogleUtilities/Environment (5.4.0)
-  - GoogleUtilities/Logger (5.4.0):
+  - FirebaseCore (6.0.1):
+    - GoogleUtilities/Environment (~> 6.0)
+    - GoogleUtilities/Logger (~> 6.0)
+  - GoogleUtilities/AppDelegateSwizzler (6.2.0):
     - GoogleUtilities/Environment
-  - GTMSessionFetcher/Core (1.2.1)
+    - GoogleUtilities/Logger
+    - GoogleUtilities/Network
+  - GoogleUtilities/Environment (6.2.0)
+  - GoogleUtilities/Logger (6.2.0):
+    - GoogleUtilities/Environment
+  - GoogleUtilities/Network (6.2.0):
+    - GoogleUtilities/Logger
+    - "GoogleUtilities/NSData+zlib"
+    - GoogleUtilities/Reachability
+  - "GoogleUtilities/NSData+zlib (6.2.0)"
+  - GoogleUtilities/Reachability (6.2.0):
+    - GoogleUtilities/Logger
+  - GTMSessionFetcher/Core (1.2.2)
 
 DEPENDENCIES:
   - Firebase/Auth
@@ -30,12 +43,12 @@ SPEC REPOS:
     - GTMSessionFetcher
 
 SPEC CHECKSUMS:
-  Firebase: 02f3281965c075426141a0ce1277e9de6649cab9
-  FirebaseAuth: d85d052354447f30b4b2a805ab91b511458b56a6
+  Firebase: 8d77bb33624ae9b62d745d82ec023de5f70f7e4f
+  FirebaseAuth: 4281d6d98a90881e00710fa8d9e37c2ccdfc7d80
   FirebaseAuthInterop: 0ffa57668be100582bb7643d4fcb7615496c41fc
-  FirebaseCore: 52f851b30e11360f1e67cf04b1edfebf0a47a2d3
-  GoogleUtilities: fa768ad04b264be250ee9edf9f378ad006f7a560
-  GTMSessionFetcher: 32aeca0aa144acea523e1c8e053089dec2cb98ca
+  FirebaseCore: 66bdef3b310a026880e2a5bc8aa586ab62ce4543
+  GoogleUtilities: 996e0db07153674fd1b54b220fda3a3dc3547cba
+  GTMSessionFetcher: 61bb0f61a4cb560030f1222021178008a5727a23
 
 PODFILE CHECKSUM: b52e77a8635fdab60813531d42d397d13cda156e
 

FirebaseUI.podspec

@@ -4,7 +4,7 @@ Pod::Spec.new do |s|
   s.summary      = 'UI binding libraries for Firebase.'
   s.homepage     = 'https://github.com/firebase/FirebaseUI-iOS'
   s.license      = { :type => 'Apache 2.0', :file => 'LICENSE' }
-  s.source       = { :git => 'https://github.com/firebase/FirebaseUI-iOS.git', :tag => 'v' + s.version.to_s + '-prerelease' }
+  s.source       = { :git => 'https://github.com/firebase/FirebaseUI-iOS.git', :tag => 'v' + s.version.to_s }
   s.author       = 'Firebase'
   s.platform = :ios
   s.ios.deployment_target = '9.0'