update to GSI 5.0 pod

Author: ulukaya

ios/signin/Podfile

@@ -1,5 +1,5 @@
 use_frameworks!
-platform :ios, '7.0'
+platform :ios, '8.0'
 pod 'GoogleSignIn'
 
 target 'SignInExample' do

ios/signin/SignInExample.xcodeproj/project.pbxproj

@@ -156,6 +156,7 @@
 				10A034B61E039F1900A667F0 /* SignInExampleTests */,
 				4BC032DF1ACF33B70092326A /* Products */,
 				E27D599993EDB54E213FA076 /* Frameworks */,
+				72A0AD6FEF1A09A1A7F1472D /* Pods */,
 			);
 			sourceTree = "<group>";
 		};
@@ -192,6 +193,13 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
+		72A0AD6FEF1A09A1A7F1472D /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = Pods;
+			sourceTree = "<group>";
+		};
 		E27D599993EDB54E213FA076 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -301,6 +309,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -456,7 +465,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_OBJC_BRIDGING_HEADER = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 				VALID_ARCHS = "armv7 armv7s arm64";
 			};
 			name = Debug;
@@ -479,7 +488,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
 				SWIFT_OBJC_BRIDGING_HEADER = "";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 				VALID_ARCHS = "armv7 armv7s arm64";
 			};
 			name = Release;
@@ -610,6 +619,7 @@
 				10A034BD1E039F1900A667F0 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 		4B97B2721AD7145E0036DD6C /* Build configuration list for PBXNativeTarget "SignInExampleSwift" */ = {
 			isa = XCConfigurationList;

ios/signin/SignInExample/AppDelegate.m

@@ -29,21 +29,41 @@ - (BOOL)application:(UIApplication *)application
 }
 // [END didfinishlaunching]
 
+// [START openurl_new]
+- (BOOL)application:(UIApplication *)app
+            openURL:(NSURL *)url
+            options:(NSDictionary<NSString *, id> *)options {
+  return [[GIDSignIn sharedInstance] handleURL:url];
+}
+// [END openurl_new]
+
 // [START openurl]
 - (BOOL)application:(UIApplication *)application
             openURL:(NSURL *)url
   sourceApplication:(NSString *)sourceApplication
          annotation:(id)annotation {
-  return [[GIDSignIn sharedInstance] handleURL:url
-                             sourceApplication:sourceApplication
-                                    annotation:annotation];
+  return [[GIDSignIn sharedInstance] handleURL:url];
 }
 // [END openurl]
 
 // [START signin_handler]
 - (void)signIn:(GIDSignIn *)signIn
 didSignInForUser:(GIDGoogleUser *)user
      withError:(NSError *)error {
+  if (error != nil) {
+    if (error.code == kGIDSignInErrorCodeHasNoAuthInKeychain) {
+      NSLog(@"The user has not signed in before or they have since signed out.");
+    } else {
+      NSLog(@"%@", error.localizedDescription);
+    }
+    // [START_EXCLUDE silent]
+    [[NSNotificationCenter defaultCenter]
+     postNotificationName:@"ToggleAuthUINotification"
+     object:nil
+     userInfo:nil];
+    // [END_EXCLUDE]
+    return;
+  }
   // Perform any operations on signed in user here.
   NSString *userId = user.userID;                  // For client-side use only!
   NSString *idToken = user.authentication.idToken; // Safe to send to the server

ios/signin/SignInExample/ViewController.h

@@ -18,7 +18,7 @@
 @import GoogleSignIn;
 
 // [START viewcontroller_interfaces]
-@interface ViewController : UIViewController <GIDSignInUIDelegate>
+@interface ViewController : UIViewController
 // [END viewcontroller_interfaces]
 
 // [START viewcontroller_vars]

ios/signin/SignInExample/ViewController.m

@@ -21,12 +21,11 @@ @implementation ViewController
 - (void)viewDidLoad {
   [super viewDidLoad];
 
-  // TODO(developer) Configure the sign-in button look/feel
+  [GIDSignIn sharedInstance].presentingViewController = self;
 
-  [GIDSignIn sharedInstance].uiDelegate = self;
+  // Automatically sign in the user.
+  [[GIDSignIn sharedInstance] restorePreviousSignIn];
 
-  // Uncomment to automatically sign in the user.
-  //[[GIDSignIn sharedInstance] signInSilently];
   // [START_EXCLUDE silent]
   [[NSNotificationCenter defaultCenter]
       addObserver:self

ios/signin/SignInExampleSwift/AppDelegate.swift

@@ -20,74 +20,75 @@ import GoogleSignIn
 // [START appdelegate_interfaces]
 class AppDelegate: UIResponder, UIApplicationDelegate, GIDSignInDelegate {
 
-// [END appdelegate_interfaces]
+  // [END appdelegate_interfaces]
   var window: UIWindow?
 
   // [START didfinishlaunching]
   func application(_ application: UIApplication,
-    didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
-      // Initialize sign-in
-      GIDSignIn.sharedInstance().clientID = "YOUR_CLIENT_ID"
-      GIDSignIn.sharedInstance().delegate = self
+                   didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+    // Initialize sign-in
+    GIDSignIn.sharedInstance().clientID = "YOUR_CLIENT_ID"
+    GIDSignIn.sharedInstance().delegate = self
 
-      return true
+    return true
   }
   // [END didfinishlaunching]
 
   // [START openurl]
   func application(_ application: UIApplication,
-    open url: URL, sourceApplication: String?, annotation: Any) -> Bool {
-      return GIDSignIn.sharedInstance().handle(url,
-          sourceApplication: sourceApplication,
-          annotation: annotation)
+                   open url: URL, sourceApplication: String?, annotation: Any) -> Bool {
+    return GIDSignIn.sharedInstance().handle(url)
   }
   // [END openurl]
 
+  // [START openurl_new]
   @available(iOS 9.0, *)
-  func application(_ app: UIApplication, open url: URL, options: [UIApplicationOpenURLOptionsKey : Any]) -> Bool {
-    return GIDSignIn.sharedInstance().handle(url,
-      sourceApplication: options[UIApplicationOpenURLOptionsKey.sourceApplication] as? String,
-      annotation: options[UIApplicationOpenURLOptionsKey.annotation])
+  func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey : Any]) -> Bool {
+    return GIDSignIn.sharedInstance().handle(url)
   }
+  // [END openurl_new]
 
   // [START signin_handler]
   func sign(_ signIn: GIDSignIn!, didSignInFor user: GIDGoogleUser!,
-    withError error: Error!) {
-      if let error = error {
-        print("\(error.localizedDescription)")
-        // [START_EXCLUDE silent]
-        NotificationCenter.default.post(
-          name: Notification.Name(rawValue: "ToggleAuthUINotification"), object: nil, userInfo: nil)
-        // [END_EXCLUDE]
+            withError error: Error!) {
+    if let error = error {
+      if (error as NSError).code == GIDSignInErrorCode.hasNoAuthInKeychain.rawValue {
+        print("The user has not signed in before or they have since signed out.")
       } else {
-        // Perform any operations on signed in user here.
-        let userId = user.userID                  // For client-side use only!
-        let idToken = user.authentication.idToken // Safe to send to the server
-        let fullName = user.profile.name
-        let givenName = user.profile.givenName
-        let familyName = user.profile.familyName
-        let email = user.profile.email
-        // [START_EXCLUDE]
-        NotificationCenter.default.post(
-          name: Notification.Name(rawValue: "ToggleAuthUINotification"),
-          object: nil,
-          userInfo: ["statusText": "Signed in user:\n\(fullName)"])
-        // [END_EXCLUDE]
+        print("\(error.localizedDescription)")
       }
+      // [START_EXCLUDE silent]
+      NotificationCenter.default.post(
+        name: Notification.Name(rawValue: "ToggleAuthUINotification"), object: nil, userInfo: nil)
+      // [END_EXCLUDE]
+      return
+    }
+    // Perform any operations on signed in user here.
+    let userId = user.userID                  // For client-side use only!
+    let idToken = user.authentication.idToken // Safe to send to the server
+    let fullName = user.profile.name
+    let givenName = user.profile.givenName
+    let familyName = user.profile.familyName
+    let email = user.profile.email
+    // [START_EXCLUDE]
+    NotificationCenter.default.post(
+      name: Notification.Name(rawValue: "ToggleAuthUINotification"),
+      object: nil,
+      userInfo: ["statusText": "Signed in user:\n\(fullName!)"])
+    // [END_EXCLUDE]
   }
   // [END signin_handler]
 
   // [START disconnect_handler]
   func sign(_ signIn: GIDSignIn!, didDisconnectWith user: GIDGoogleUser!,
-    withError error: Error!) {
-      // Perform any operations when the user disconnects from app here.
-      // [START_EXCLUDE]
-      NotificationCenter.default.post(
-          name: Notification.Name(rawValue: "ToggleAuthUINotification"),
-          object: nil,
-          userInfo: ["statusText": "User has disconnected."])
-      // [END_EXCLUDE]
+            withError error: Error!) {
+    // Perform any operations when the user disconnects from app here.
+    // [START_EXCLUDE]
+    NotificationCenter.default.post(
+      name: Notification.Name(rawValue: "ToggleAuthUINotification"),
+      object: nil,
+      userInfo: ["statusText": "User has disconnected."])
+    // [END_EXCLUDE]
   }
   // [END disconnect_handler]
-
 }

ios/signin/SignInExampleSwift/ViewController.swift

@@ -19,7 +19,7 @@ import GoogleSignIn
 // Match the ObjC symbol name inside Main.storyboard.
 @objc(ViewController)
 // [START viewcontroller_interfaces]
-class ViewController: UIViewController, GIDSignInUIDelegate {
+class ViewController: UIViewController {
 // [END viewcontroller_interfaces]
 
   // [START viewcontroller_vars]
@@ -33,12 +33,11 @@ class ViewController: UIViewController, GIDSignInUIDelegate {
   override func viewDidLoad() {
     super.viewDidLoad()
 
-    GIDSignIn.sharedInstance().uiDelegate = self
+    GIDSignIn.sharedInstance()?.presentingViewController = self
 
-    // Uncomment to automatically sign in the user.
-    //GIDSignIn.sharedInstance().signInSilently()
+    // Automatically sign in the user.
+    GIDSignIn.sharedInstance()?.restorePreviousSignIn()
 
-    // TODO(developer) Configure the sign-in button look/feel
     // [START_EXCLUDE]
     NotificationCenter.default.addObserver(self,
         selector: #selector(ViewController.receiveToggleAuthUINotification(_:)),
@@ -72,7 +71,7 @@ class ViewController: UIViewController, GIDSignInUIDelegate {
 
   // [START toggle_auth]
   func toggleAuthUI() {
-    if GIDSignIn.sharedInstance().hasAuthInKeychain() {
+    if let _ = GIDSignIn.sharedInstance()?.currentUser?.authentication {
       // Signed in
       signInButton.isHidden = true
       signOutButton.isHidden = false