Fix and normalize TARGET_OS macro references. (google#129)

Author: petea

GoogleSignIn/Sources/GIDAuthentication.m

@@ -18,10 +18,10 @@
 
 #import "GoogleSignIn/Sources/GIDSignInPreferences.h"
 
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
 #import "GoogleSignIn/Sources/GIDEMMErrorHandler.h"
 #import "GoogleSignIn/Sources/GIDMDMPasscodeState.h"
-#endif
+#endif // TARGET_OS_IOS && !TARGET_OS_MACCATALYST
 
 #import "GoogleSignIn/Sources/Public/GoogleSignIn/GIDSignIn.h"
 
@@ -57,7 +57,7 @@
 // New UIDevice system name for iOS.
 static NSString *const kNewIOSSystemName = @"iOS";
 
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
 
 // The specialized GTMAppAuthFetcherAuthorization delegate that handles potential EMM error
 // responses.
@@ -149,7 +149,7 @@ - (void)authorizeRequest:(nullable NSMutableURLRequest *)request
 
 @end
 
-#endif
+#endif // TARGET_OS_IOS && !TARGET_OS_MACCATALYST
 
 @implementation GIDAuthentication {
   // A queue for pending authentication handlers so we don't fire multiple requests in parallel.
@@ -197,24 +197,24 @@ - (nullable NSDate *)idTokenExpirationDate {
 
 #pragma mark - Private property accessors
 
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
 - (NSString *)emmSupport {
   return
       _authState.lastAuthorizationResponse.request.additionalParameters[kEMMSupportParameterName];
 }
-#endif
+#endif // TARGET_OS_IOS && !TARGET_OS_MACCATALYST
 
 #pragma mark - Public methods
 
 - (id<GTMFetcherAuthorizationProtocol>)fetcherAuthorizer {
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
   GTMAppAuthFetcherAuthorization *authorization = self.emmSupport ?
       [[GTMAppAuthFetcherAuthorizationWithEMMSupport alloc] initWithAuthState:_authState] :
       [[GTMAppAuthFetcherAuthorization alloc] initWithAuthState:_authState];
-#else // TARGET_OS_OSX or TARGET_OS_MACCATALYST
+#elif TARGET_OS_OSX || TARGET_OS_MACCATALYST
   GTMAppAuthFetcherAuthorization *authorization =
       [[GTMAppAuthFetcherAuthorization alloc] initWithAuthState:_authState];
-#endif
+#endif // TARGET_OS_IOS && !TARGET_OS_MACCATALYST
   authorization.tokenRefreshDelegate = self;
   return authorization;
 }
@@ -237,14 +237,14 @@ - (void)doWithFreshTokens:(GIDAuthenticationAction)action {
   }
   // This is the first handler in the queue, a fetch is needed.
   NSMutableDictionary *additionalParameters = [@{} mutableCopy];
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
   [additionalParameters addEntriesFromDictionary:
       [GIDAuthentication updatedEMMParametersWithParameters:
           _authState.lastTokenResponse.request.additionalParameters]];
-#else // TARGET_OS_OSX or TARGET_OS_MACCATALYST
+#elif TARGET_OS_OSX || TARGET_OS_MACCATALYST
   [additionalParameters addEntriesFromDictionary:
       _authState.lastTokenResponse.request.additionalParameters];
-#endif
+#endif // TARGET_OS_IOS && !TARGET_OS_MACCATALYST
   additionalParameters[kSDKVersionLoggingParameter] = GIDVersion();
   additionalParameters[kEnvironmentLoggingParameter] = GIDEnvironment();
 
@@ -269,7 +269,7 @@ - (void)doWithFreshTokens:(GIDAuthenticationAction)action {
         [self->_authState updateWithAuthorizationError:error];
       }
     }
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
     [GIDAuthentication handleTokenFetchEMMError:error completion:^(NSError *_Nullable error) {
       // Process the handler queue to call back.
       NSArray *authenticationHandlerQueue;
@@ -283,7 +283,7 @@ - (void)doWithFreshTokens:(GIDAuthenticationAction)action {
         });
       }
     }];
-#else // TARGET_OS_OSX or TARGET_OS_MACCATALYST
+#elif TARGET_OS_OSX || TARGET_OS_MACCATALYST
     NSArray *authenticationHandlerQueue;
     @synchronized(self->_authenticationHandlerQueue) {
       authenticationHandlerQueue = [self->_authenticationHandlerQueue copy];
@@ -294,12 +294,14 @@ - (void)doWithFreshTokens:(GIDAuthenticationAction)action {
         action(error ? nil : self, error);
       });
     }
-#endif
+#endif // TARGET_OS_IOS && !TARGET_OS_MACCATALYST
   }];
 }
 
 #pragma mark - Private methods
-#if TARGET_OS_IOS
+
+#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
+
 + (NSDictionary *)parametersWithParameters:(NSDictionary *)parameters
                                 emmSupport:(nullable NSString *)emmSupport
                     isPasscodeInfoRequired:(BOOL)isPasscodeInfoRequired {
@@ -346,18 +348,19 @@ + (void)handleTokenFetchEMMError:(nullable NSError *)error
     completion(error);
   }
 }
-#endif
+
+#endif // TARGET_OS_IOS && !TARGET_OS_MACCATALYST
 
 #pragma mark - GTMAppAuthFetcherAuthorizationTokenRefreshDelegate
 
 - (nullable NSDictionary *)additionalRefreshParameters:
     (GTMAppAuthFetcherAuthorization *)authorization {
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
   return [GIDAuthentication updatedEMMParametersWithParameters:
       authorization.authState.lastTokenResponse.request.additionalParameters];
-#else // TARGET_OS_MACCATALYST or TARGET_OS_OSX
+#elif TARGET_OS_OSX || TARGET_OS_MACCATALYST
   return authorization.authState.lastTokenResponse.request.additionalParameters;
-#endif
+#endif // TARGET_OS_IOS && !TARGET_OS_MACCATALYST
 }
 
 #pragma mark - NSSecureCoding

GoogleSignIn/Sources/GIDAuthentication_Private.h

@@ -32,14 +32,14 @@ NS_ASSUME_NONNULL_BEGIN
 // A representation of the state of the OAuth session for this instance.
 @property(nonatomic, readonly) OIDAuthState *authState;
 
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
 // A string indicating support for Enterprise Mobility Management.
 @property(nonatomic, readonly) NSString *emmSupport;
-#endif
+#endif // TARGET_OS_IOS && !TARGET_OS_MACCATALYST
 
 - (instancetype)initWithAuthState:(OIDAuthState *)authState;
 
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
 // Gets a new set of URL parameters that also contains EMM-related URL parameters if needed.
 + (NSDictionary *)parametersWithParameters:(NSDictionary *)parameters
                                 emmSupport:(nullable NSString *)emmSupport
@@ -51,7 +51,7 @@ NS_ASSUME_NONNULL_BEGIN
 // Handles potential EMM error from token fetch response.
 + (void)handleTokenFetchEMMError:(nullable NSError *)error
                       completion:(void (^)(NSError *_Nullable))completion;
-#endif
+#endif // TARGET_OS_IOS && !TARGET_OS_MACCATALYST
 
 @end
 

GoogleSignIn/Sources/GIDEMMErrorHandler.h

@@ -15,7 +15,7 @@
  */
 #import <TargetConditionals.h>
 
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
 
 #import <Foundation/Foundation.h>
 
@@ -39,4 +39,4 @@ NS_ASSUME_NONNULL_BEGIN
 
 NS_ASSUME_NONNULL_END
 
-#endif
+#endif // TARGET_OS_IOS && !TARGET_OS_MACCATALYST

GoogleSignIn/Sources/GIDEMMErrorHandler.m

@@ -13,7 +13,7 @@
 // limitations under the License.
 #import <TargetConditionals.h>
 
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
 
 #import "GoogleSignIn/Sources/GIDEMMErrorHandler.h"
 
@@ -336,4 +336,4 @@ - (NSString *)cancelString {
 
 NS_ASSUME_NONNULL_END
 
-#endif
+#endif // TARGET_OS_IOS && !TARGET_OS_MACCATALYST

GoogleSignIn/Sources/GIDMDMPasscodeCache.h

@@ -15,7 +15,7 @@
  */
 #import <TargetConditionals.h>
 
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
 
 #import <Foundation/Foundation.h>
 
@@ -43,4 +43,4 @@ NS_ASSUME_NONNULL_BEGIN
 
 NS_ASSUME_NONNULL_END
 
-#endif
+#endif // TARGET_OS_IOS && !TARGET_OS_MACCATALYST

GoogleSignIn/Sources/GIDMDMPasscodeCache.m

@@ -13,7 +13,7 @@
 // limitations under the License.
 #import <TargetConditionals.h>
 
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
 
 #import "GoogleSignIn/Sources/GIDMDMPasscodeCache.h"
 
@@ -298,4 +298,4 @@ - (NSString *)info {
 
 NS_ASSUME_NONNULL_END
 
-#endif
+#endif // TARGET_OS_IOS && !TARGET_OS_MACCATALYST

GoogleSignIn/Sources/GIDMDMPasscodeState.h

@@ -15,7 +15,7 @@
  */
 #import <TargetConditionals.h>
 
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
 
 #import <Foundation/Foundation.h>
 
@@ -51,4 +51,4 @@ NS_ASSUME_NONNULL_BEGIN
 
 NS_ASSUME_NONNULL_END
 
-#endif
+#endif // TARGET_OS_IOS && !TARGET_OS_MACCATALYST

GoogleSignIn/Sources/GIDMDMPasscodeState.m

@@ -13,7 +13,7 @@
 // limitations under the License.
 #import <TargetConditionals.h>
 
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
 
 #import "GoogleSignIn/Sources/GIDMDMPasscodeState.h"
 
@@ -52,4 +52,4 @@ + (instancetype)passcodeState {
 
 NS_ASSUME_NONNULL_END
 
-#endif
+#endif // TARGET_OS_IOS && !TARGET_OS_MACCATALYST

GoogleSignIn/Sources/GIDMDMPasscodeState_Private.h

@@ -15,7 +15,7 @@
  */
 #import <TargetConditionals.h>
 
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
 
 #import <Foundation/Foundation.h>
 
@@ -37,4 +37,4 @@ NS_ASSUME_NONNULL_BEGIN
 
 NS_ASSUME_NONNULL_END
 
-#endif
+#endif // TARGET_OS_IOS && !TARGET_OS_MACCATALYST