Merge branch 'master' into v0.6.2

* master: Fixing typo in Readme use xcpretty to get around travis log file size limit fix objc sample codes Revert "V0.6.2" add twitter import in objc sample code fix the broken link update code syntax for 0.6.1 framework

Author: yramanchuk

FirebaseAuthUI/FIRAuthUI.h

@@ -145,7 +145,7 @@ typedef void (^FIRAuthUIResultCallback)(FIRUser *_Nullable user, NSError *_Nulla
 /** @fn init
  @brief Please use @c FIRAuthUI.authUIWithAuth to get a @c FIRAuthUI instance.
  */
-- (instancetype)init NS_UNAVAILABLE;
+- (nullable instancetype)init NS_UNAVAILABLE;
 
 /** @fn handleOpenURL:
  @brief Should be called from your @c UIApplicationDelegate in

FirebaseAuthUI/FIRAuthUIBaseViewController.h

@@ -45,7 +45,7 @@ typedef void (^FIRAuthUIAlertActionHandler)(void);
 /** @fn init
  @brief Please use @c initWithNibName:bundle:authUI:.
  */
-- (instancetype)init NS_UNAVAILABLE;
+- (nullable instancetype)init NS_UNAVAILABLE;
 
 /** @fn initWithStyle:
  @brief Please use @c initWithNibName:bundle:authUI:.

FirebaseAuthUI/FIRAuthUIBaseViewController.m

@@ -60,7 +60,7 @@ @interface FIRAuthUIAlertViewDelegate : NSObject <UIAlertViewDelegate>
 /** @fn init
  @brief Please use initWithCancelHandler:otherHandlers.
  */
-- (instancetype)init NS_UNAVAILABLE;
+- (nullable instancetype)init NS_UNAVAILABLE;
 
 /** @fn initWithCancelHandler:otherHandlers:
  @brief Designated initializer.

FirebaseAuthUI/README.md

@@ -18,7 +18,7 @@ FirebaseUI can be easily customized to fit in with the rest of your app's visual
  experience you want.
 
 Compatible FirebaseUI clients are also available for [Android](https://github.com/firebase/firebaseui-android/tree/master/auth)
-and [Web](https://github.com/firebase/firebaseui-web/tree/master/auth).
+and [Web](https://github.com/firebase/firebaseui-web/).
 
 ## Table of Contents
 
@@ -59,7 +59,8 @@ import FirebaseAuthUI
 /* ... */
 
 FIRApp.configure()
-let authUI = FIRAuthUI.defaultAuthUI()
+let authUI = FIRAuthUI.default()
+// You need to adopt a FIRAuthUIDelegate protocol to receive callback
 authUI?.delegate = self
 ```
 
@@ -70,7 +71,8 @@ authUI?.delegate = self
 ...
 [FIRApp configure];
 FIRAuthUI *authUI = [FIRAuthUI defaultAuthUI];
-authUI.delegate = self; // Set the delegate to receive callback.
+// You need to adopt a FIRAuthUIDelegate protocol to receive callback
+authUI.delegate = self;
 ```
 
 This instance can then be configured with the providers you wish to support:
@@ -79,23 +81,28 @@ This instance can then be configured with the providers you wish to support:
 // swift
 import FirebaseGoogleAuthUI
 import FirebaseFacebookAuthUI
-
-let googleAuthUI = FIRGoogleAuthUI(clientID: kGoogleClientID)
-let facebookAuthUI = FIRFacebookAuthUI(appID: kFacebookAppID)
-
-authUI?.providers = [googleAuthUI, facebookAuthUI]
+import FirebaseTwitterAuthUI
+
+let providers: [FIRAuthProviderUI] = [
+ FIRGoogleAuthUI(),
+ FIRFacebookAuthUI(),
+ FIRTwitterAuthUI(),
+]
+self.authUI?.providers = providers
 ```
 
 ```objective-c
 // objc
 @import FirebaseGoogleAuthUI
 @import FirebaseFacebookAuthUI
+@import FIRTwitterAuthUI
 ...
-FIRGoogleAuthUI *googleAuthUI =
- [[FIRGoogleAuthUI alloc] initWithClientID:kGoogleClientID];
-FIRFacebookAuthUI *facebookAuthUI =
- [[FIRFacebookAuthUI alloc] initWithAppID:kFacebookAppID];
-authUI.signInProviders = @[ googleAuthUI, facebookAuthUI];
+NSArray<id<FIRAuthProviderUI>> *providers = @[
+ [[FIRGoogleAuthUI alloc] init],
+ [[FIRFacebookAuthUI alloc] init],
+ [[FIRTwitterAuthUI alloc] init],
+ ];
+_authUI.providers = providers;
 ```
 
 For Google sign in support, add custom URL schemes to your Xcode project
@@ -110,9 +117,13 @@ Google/Facebook authentication process.
 
 ```swift
 // swift
-func application(app: UIApplication, openURL url: NSURL, options: [String: AnyObject]) -> Bool {
- let sourceApplication = options[UIApplicationOpenURLOptionsSourceApplicationKey] as! String
- return FIRAuthUI.defaultAuthUI()?.handleOpenURL(url, sourceApplication: sourceApplication ?? "") ?? false
+func application(_ app: UIApplication, open url: URL, options: [UIApplicationOpenURLOptionsKey : Any]) -> Bool {
+ let sourceApplication = options[UIApplicationOpenURLOptionsKey.sourceApplication] as! String?
+ if FIRAuthUI.default()?.handleOpen(url, sourceApplication: sourceApplication) ?? false {
+ return true
+ }
+ // other URL handling goes here.
+ return false
 }
 ```
 
@@ -138,7 +149,7 @@ present the `authViewController` obtain as instance as follows:
 // Present the auth view controller and then implement the sign in callback.
 let authViewController = authUI!.authViewController()
 
-func authUI(authUI: FIRAuthUI, didSignInWithUser user: FIRUser?, error: ErrorType?) {
+func authUI(_ authUI: FIRAuthUI, didSignInWithUser user: FIRUser?, error: Error?) {
  // handle user and error as necessary
 }
 ```
@@ -162,7 +173,8 @@ email/password account creation screen, can be specified as follows:
 
 ```swift
 // swift
-authUI?.TOSURL = NSURL(string: "https://example.com/tos")!
+let kFirebaseTermsOfService = URL(string: "https://firebase.google.com/terms/")!
+authUI?.tosurl = kFirebaseTermsOfService
 ```
 
 ```objective-c
@@ -187,7 +199,7 @@ authUI?.customStringsBundle = NSBundle.mainBundle() // Or any custom bundle.
 authUI.customStringsBundle = [NSBundle mainBundle]; // Or any custom bundle.
 ```
 
-The bundle should include [.strings](Auth/AuthUI/Strings/en.lproj/FirebaseAuthUI.strings)
+The bundle should include [.strings](https://github.com/firebase/FirebaseUI-iOS/blob/master/FirebaseAuthUI/Strings/en.lproj/FirebaseAuthUI.strings)
 files that have the same names as the default files, namely `FirebaseAuthUI`,
 `FirebaseGoogleAuthUI`, and `FirebaseFacebookAuthUI`. Each string in these files
 should have the same key as its counterpart in the default `.strings` files.
@@ -204,7 +216,7 @@ subclass by implementing the delegate method
 
 ```swift
 // swift
-func authPickerViewControllerForAuthUI(authUI: FIRAuthUI) -> FIRAuthPickerViewController {
+func authPickerViewController(for authUI: FIRAuthUI) -> FIRAuthPickerViewController {
  return CustomAuthPickerViewController(authUI: authUI)
 }
 ```

README.md

@@ -34,7 +34,7 @@ pod 'FirebaseUI/Facebook', '~> 0.6'
 pod 'FirebaseUI/Google', '~> 0.6'
 
 # Only pull in Twitter login features
-pod 'FirebaseUI/Google', '~> 0.6'
+pod 'FirebaseUI/Twitter', '~> 0.6'
 ```
 
 If you're including FirebaseUI in a Swift project, make sure you also have: