Allow GTMSessionFetcher 3.x (#257)

Author: petea

GoogleSignIn.podspec

@@ -12,7 +12,7 @@ The Google Sign-In SDK allows users to sign in with their Google account from th
     :git => 'https://github.com/google/GoogleSignIn-iOS.git',
     :tag => s.version.to_s
   }
-  ios_deployment_target = '9.0'
+  ios_deployment_target = '10.0'
   osx_deployment_target = '10.15'
   s.ios.deployment_target = ios_deployment_target
   s.osx.deployment_target = osx_deployment_target
@@ -33,8 +33,8 @@ The Google Sign-In SDK allows users to sign in with their Google account from th
   s.ios.framework = 'UIKit'
   s.osx.framework = 'AppKit'
   s.dependency 'AppAuth', '~> 1.5'
-  s.dependency 'GTMAppAuth', '~> 1.3'
-  s.dependency 'GTMSessionFetcher/Core', '>= 1.1', '< 3.0'
+  s.dependency 'GTMAppAuth', '>= 1.3', '< 3.0'
+  s.dependency 'GTMSessionFetcher/Core', '>= 1.1', '< 4.0'
   s.resource_bundle = {
     'GoogleSignIn' => ['GoogleSignIn/Sources/{Resources,Strings}/*']
   }

GoogleSignIn/Sources/GIDEMMErrorHandler.m

@@ -267,13 +267,7 @@ - (UIAlertController *)appVerificationRequiredAlertWithURL:(nullable NSURL *)url
 }
 
 - (void)openURL:(NSURL *)url {
-  if (@available(iOS 10, *)) {
-    [UIApplication.sharedApplication openURL:url options:@{} completionHandler:nil];
-  } else {
-#if __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_10_0
-    [UIApplication.sharedApplication openURL:url];
-#endif  // __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_10_0
-  }
+  [UIApplication.sharedApplication openURL:url options:@{} completionHandler:nil];
 }
 
 #pragma mark - Localization

GoogleSignIn/Tests/Unit/GIDEMMErrorHandlerTest.m

@@ -114,11 +114,7 @@ - (void)expectOpenURLString:(NSString *)urlString inAction:(void (^)(void))actio
                    selector:@selector(sharedApplication)
             isClassSelector:YES
                   withBlock:^() { return mockApplication; }];
-  if (@available(iOS 10, *)) {
-    [[mockApplication expect] openURL:[NSURL URLWithString:urlString] options:@{} completionHandler:nil];
-  } else {
-    [[mockApplication expect] openURL:[NSURL URLWithString:urlString]];
-  }
+  [[mockApplication expect] openURL:[NSURL URLWithString:urlString] options:@{} completionHandler:nil];
   action();
   [mockApplication verify];
   [GULSwizzler unswizzleClass:[UIApplication class]

Package.swift

@@ -24,7 +24,7 @@ let package = Package(
   defaultLocalization: "en",
   platforms: [
     .macOS(.v10_15),
-    .iOS(.v9)
+    .iOS(.v10)
   ],
   products: [
     .library(
@@ -48,11 +48,11 @@ let package = Package(
     .package(
       name: "GTMAppAuth",
       url: "https://github.com/google/GTMAppAuth.git",
-      "1.3.0" ..< "2.0.0"),
+      "1.3.0" ..< "3.0.0"),
     .package(
       name: "GTMSessionFetcher",
       url: "https://github.com/google/gtm-session-fetcher.git",
-      "1.5.0" ..< "3.0.0"),
+      "1.5.0" ..< "4.0.0"),
     .package(
       name: "OCMock",
       url: "https://github.com/firebase/ocmock.git",

Samples/ObjC/SignInSample/SignInSample.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		C1D4BC8A2926EF61001BCB24 /* GoogleSignIn in Frameworks */ = {isa = PBXBuildFile; productRef = C1D4BC892926EF61001BCB24 /* GoogleSignIn */; };
 		C1E69232264315E7004CE2BC /* SignInViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C1E69226264315E7004CE2BC /* SignInViewController.m */; };
 		C1E69233264315E7004CE2BC /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = C1E69228264315E7004CE2BC /* LaunchScreen.xib */; };
 		C1E69234264315E7004CE2BC /* DataPickerState.m in Sources */ = {isa = PBXBuildFile; fileRef = C1E6922A264315E7004CE2BC /* DataPickerState.m */; };
@@ -15,7 +16,6 @@
 		C1E69237264315E7004CE2BC /* SignInViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = C1E6922D264315E7004CE2BC /* SignInViewController.xib */; };
 		C1E69238264315E7004CE2BC /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = C1E6922F264315E7004CE2BC /* AppDelegate.m */; };
 		C1E69239264315E7004CE2BC /* AuthInspectorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C1E69231264315E7004CE2BC /* AuthInspectorViewController.m */; };
-		C1E6924426431A6D004CE2BC /* GoogleSignIn in Frameworks */ = {isa = PBXBuildFile; productRef = C1E6924326431A6D004CE2BC /* GoogleSignIn */; };
 		C1E6927C26431E13004CE2BC /* Dummy.strings in Resources */ = {isa = PBXBuildFile; fileRef = C1E6925326431E12004CE2BC /* Dummy.strings */; };
 		C1E6927D26431E13004CE2BC /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C1E6926E26431E13004CE2BC /* Images.xcassets */; };
 		C1E6927E26431E13004CE2BC /* DataPickerDictionary.plist in Resources */ = {isa = PBXBuildFile; fileRef = C1E6927026431E13004CE2BC /* DataPickerDictionary.plist */; };
@@ -92,7 +92,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C1E6924426431A6D004CE2BC /* GoogleSignIn in Frameworks */,
+				C1D4BC8A2926EF61001BCB24 /* GoogleSignIn in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -188,7 +188,7 @@
 			);
 			name = SignInSample;
 			packageProductDependencies = (
-				C1E6924326431A6D004CE2BC /* GoogleSignIn */,
+				C1D4BC892926EF61001BCB24 /* GoogleSignIn */,
 			);
 			productName = SignInSample;
 			productReference = D99924CA1A92B3C7008CC226 /* SignInSample.app */;
@@ -253,7 +253,6 @@
 			);
 			mainGroup = D99924C11A92B3C7008CC226;
 			packageReferences = (
-				C1E6924226431A6D004CE2BC /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */,
 			);
 			productRefGroup = D99924CB1A92B3C7008CC226 /* Products */;
 			projectDirPath = "";
@@ -392,7 +391,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "-ObjC";
@@ -442,7 +441,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_LDFLAGS = "-ObjC";
 				SDKROOT = iphoneos;
@@ -510,21 +509,9 @@
 		};
 /* End XCConfigurationList section */
 
-/* Begin XCRemoteSwiftPackageReference section */
-		C1E6924226431A6D004CE2BC /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/google/GoogleSignIn-iOS.git";
-			requirement = {
-				branch = main;
-				kind = branch;
-			};
-		};
-/* End XCRemoteSwiftPackageReference section */
-
 /* Begin XCSwiftPackageProductDependency section */
-		C1E6924326431A6D004CE2BC /* GoogleSignIn */ = {
+		C1D4BC892926EF61001BCB24 /* GoogleSignIn */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = C1E6924226431A6D004CE2BC /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */;
 			productName = GoogleSignIn;
 		};
 /* End XCSwiftPackageProductDependency section */

Samples/ObjC/SignInSample/SignInSampleForPod.xcodeproj/project.pbxproj

@@ -433,7 +433,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -483,7 +483,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -497,7 +497,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = "$(SRCROOT)/SignInSample-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.google.SignInSample;
 				PRODUCT_NAME = SignInSample;
@@ -510,7 +510,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = "$(SRCROOT)/SignInSample-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.google.SignInSample;
 				PRODUCT_NAME = SignInSample;