changes to get ready for review

Author: camden-king

GoogleSignIn/Sources/GIDSignIn.m

@@ -560,7 +560,7 @@ - (instancetype)initWithKeychainStore:(GTMKeychainStore *)keychainStore {
                              initWithAuthorizationEndpoint:[NSURL URLWithString:authorizationEnpointURL]
                              tokenEndpoint:[NSURL URLWithString:tokenEndpointURL]];
     _keychainStore = keychainStore;
-    // Perform migration of auth state from old (before 5.0) versions of the SDK if needed.
+    // Perform migration of auth state from old versions of the SDK if needed.
     GIDAuthStateMigration *migration =
         [[GIDAuthStateMigration alloc] initWithKeychainStore:_keychainStore];
     [migration migrateIfNeededWithTokenURL:_appAuthConfiguration.tokenEndpoint

GoogleSignIn/Tests/Unit/GIDAuthStateMigrationTest.m

@@ -135,6 +135,8 @@ - (void)testMigrateIfNeeded_NoPreviousMigration {
   [[[_mockUserDefaults expect] andReturnValue:@NO] boolForKey:kMigrationCheckPerformedKey];
   [[_mockUserDefaults expect] setBool:YES forKey:kMigrationCheckPerformedKey];
 
+  [[_mockGTMKeychainStore expect] saveAuthSession:OCMOCK_ANY error:OCMArg.anyObjectRef];
+
 #if TARGET_OS_OSX || TARGET_OS_MACCATALYST
   [[[_mockGTMKeychainStore expect] andReturn:kKeychainName] itemName];
   OIDAuthState *authState = [OIDAuthState testInstance];
@@ -146,10 +148,8 @@ - (void)testMigrateIfNeeded_NoPreviousMigration {
     [self setUpCommonExtractAuthorizationMocksWithFingerPrint:kSavedFingerprint];
 #endif
 
-  [[_mockGTMKeychainStore expect] saveAuthSession:OCMOCK_ANY error:OCMArg.anyObjectRef];
-
   GIDAuthStateMigration *migration =
-       [[GIDAuthStateMigration alloc] initWithKeychainStore:_mockGTMKeychainStore];
+      [[GIDAuthStateMigration alloc] initWithKeychainStore:_mockGTMKeychainStore];
   [migration migrateIfNeededWithTokenURL:[NSURL URLWithString:kTokenURL]
                             callbackPath:kCallbackPath
                             keychainName:kKeychainName

Samples/Swift/DaysUntilBirthday/DaysUntilBirthday.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 54;
+	objectVersion = 52;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -663,7 +663,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"macOS/Preview Content\"";
-				DEVELOPMENT_TEAM = V5B29DAW4U;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = macOS/Info.plist;
@@ -674,7 +674,7 @@
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.0;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = Google.camdenking.DaysUntilBirthdayOnMac;
+				PRODUCT_BUNDLE_IDENTIFIER = Google.DaysUntilBirthdayOnMac;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = macosx;
@@ -695,7 +695,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"macOS/Preview Content\"";
-				DEVELOPMENT_TEAM = V5B29DAW4U;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = macOS/Info.plist;
@@ -706,7 +706,7 @@
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.0;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = Google.camdenking.DaysUntilBirthdayOnMac;
+				PRODUCT_BUNDLE_IDENTIFIER = Google.DaysUntilBirthdayOnMac;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = macosx;

Samples/Swift/DaysUntilBirthday/macOS/Info.plist

@@ -15,7 +15,8 @@
 			</array>
 		</dict>
 	</array>
-	<key>GIDClientID</key>
-	<string>687389107077-8qr6dh8fr4uaja89sdr5ieqb7mep04qv.apps.googleusercontent.com</string>
+  <!-- Do not use this client ID in your own app, it will only work for this sample. -->
+  <key>GIDClientID</key>
+  <string>687389107077-8qr6dh8fr4uaja89sdr5ieqb7mep04qv.apps.googleusercontent.com</string>
 </dict>
 </plist>