From 6c75d37ac1dd295595ba962a44559c7ea595932a Mon Sep 17 00:00:00 2001
From: Michael Wyman <michael@mwyman.com>
Date: Tue, 11 Oct 2022 09:40:02 -0700
Subject: [PATCH 1/3] Add empty method to satisfy fetcher service protocol
 changes.

---
 GoogleSignIn/Tests/Unit/GIDFakeFetcherService.m | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/GoogleSignIn/Tests/Unit/GIDFakeFetcherService.m b/GoogleSignIn/Tests/Unit/GIDFakeFetcherService.m
index 002a9172..071bdc80 100644
--- a/GoogleSignIn/Tests/Unit/GIDFakeFetcherService.m
+++ b/GoogleSignIn/Tests/Unit/GIDFakeFetcherService.m
@@ -63,6 +63,11 @@ - (NSURLSession *)sessionForFetcherCreation {
   return nil;
 }
 
+- (NSURLSession *)sessionWithCreationBlock:
+    (NS_NOESCAPE GTMSessionFetcherSessionCreationBlock)creationBlock {
+  return nil;
+}
+
 - (id<NSURLSessionDelegate>)sessionDelegate {
   return nil;
 }

From 441bb671694f3dd22914ab257b3be58dd315df61 Mon Sep 17 00:00:00 2001
From: Michael Wyman <michael@mwyman.com>
Date: Tue, 11 Oct 2022 09:45:55 -0700
Subject: [PATCH 2/3] Use explicit local typedef as GTMSessionFetcher's may not
 yet be available.

---
 GoogleSignIn/Tests/Unit/GIDFakeFetcherService.m | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/GoogleSignIn/Tests/Unit/GIDFakeFetcherService.m b/GoogleSignIn/Tests/Unit/GIDFakeFetcherService.m
index 071bdc80..be6eeeea 100644
--- a/GoogleSignIn/Tests/Unit/GIDFakeFetcherService.m
+++ b/GoogleSignIn/Tests/Unit/GIDFakeFetcherService.m
@@ -63,8 +63,12 @@ - (NSURLSession *)sessionForFetcherCreation {
   return nil;
 }
 
+// TODO: replace with GTMSessionFetcherSessionCreationBlock once that has become
+// available by updating the version dependencies.
+typedef NSURLSession *_Nullable (^GIDFakeFetcherSessionCreationBlock)(
+    id<NSURLSessionDelegate> _Nullable delegate);
 - (NSURLSession *)sessionWithCreationBlock:
-    (NS_NOESCAPE GTMSessionFetcherSessionCreationBlock)creationBlock {
+    (NS_NOESCAPE GIDFakeFetcherSessionCreationBlock)creationBlock {
   return nil;
 }
 

From 00365c401356a601bc620c1d09fa6426ebe6a45f Mon Sep 17 00:00:00 2001
From: Michael Wyman <michael@mwyman.com>
Date: Wed, 12 Oct 2022 22:54:28 -0700
Subject: [PATCH 3/3] Replace `@synthesize` of GTMSessionFetcherService
 protocol methods with explicit implementations.

This future-proofs against fetcher changes.
---
 .../Tests/Unit/GIDFakeFetcherService.m        | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/GoogleSignIn/Tests/Unit/GIDFakeFetcherService.m b/GoogleSignIn/Tests/Unit/GIDFakeFetcherService.m
index be6eeeea..99f76eda 100644
--- a/GoogleSignIn/Tests/Unit/GIDFakeFetcherService.m
+++ b/GoogleSignIn/Tests/Unit/GIDFakeFetcherService.m
@@ -20,10 +20,6 @@ @implementation GIDFakeFetcherService {
   NSMutableArray *_fetchers;
 }
 
-@synthesize delegateQueue;
-@synthesize callbackQueue;
-@synthesize reuseSession;
-
 - (instancetype)init {
   self = [super init];
   if (self) {
@@ -63,15 +59,6 @@ - (NSURLSession *)sessionForFetcherCreation {
   return nil;
 }
 
-// TODO: replace with GTMSessionFetcherSessionCreationBlock once that has become
-// available by updating the version dependencies.
-typedef NSURLSession *_Nullable (^GIDFakeFetcherSessionCreationBlock)(
-    id<NSURLSessionDelegate> _Nullable delegate);
-- (NSURLSession *)sessionWithCreationBlock:
-    (NS_NOESCAPE GIDFakeFetcherSessionCreationBlock)creationBlock {
-  return nil;
-}
-
 - (id<NSURLSessionDelegate>)sessionDelegate {
   return nil;
 }
@@ -84,4 +71,22 @@ - (NSDate *)stoppedAllFetchersDate {
   return nil;
 }
 
+- (dispatch_queue_t)callbackQueue {
+  return nil;
+}
+
+- (void)setCallbackQueue:(dispatch_queue_t)callbackQueue {
+}
+
+- (NSOperationQueue *)delegateQueue {
+  return nil;
+}
+
+- (BOOL)reuseSession {
+  return NO;
+}
+
+- (void)setReuseSession:(BOOL)reuseSession {
+}
+
 @end