Replacing FIR_SWIFT_NAME macro with NS_SWIFT_NAME. (#476)

* Replacing FIR_SWIFT_NAME macro with NS_SWIFT_NAME.

This pushes the minimum Xcode version to 7.3, as NS_SWIFT_NAME was
limited before that version (which is why the macro was introduced in
the first place).

* Fixed FIRMessaging header

21 files changed, 62 insertions, 127 deletions

diff --git a/Firebase/Auth/Source/Public/FIRActionCodeSettings.h b/Firebase/Auth/Source/Public/FIRActionCodeSettings.h
index d0a54e4..6eb4c89 100644
--- a/Firebase/Auth/Source/Public/FIRActionCodeSettings.h
+++ b/Firebase/Auth/Source/Public/FIRActionCodeSettings.h
@@ -16,14 +16,12 @@
 
  #import <Foundation/Foundation.h>
 
- #import "FIRAuthSwiftNameSupport.h"
-
  NS_ASSUME_NONNULL_BEGIN
 
  /** @class FIRActionCodeSettings
      @brief Used to set and retrieve settings related to handling action codes.
   */
- FIR_SWIFT_NAME(ActionCodeSettings)
+ NS_SWIFT_NAME(ActionCodeSettings)
  @interface FIRActionCodeSettings : NSObject
 
  /** @property URL
diff --git a/Firebase/Auth/Source/Public/FIRAdditionalUserInfo.h b/Firebase/Auth/Source/Public/FIRAdditionalUserInfo.h
index 44c3646..36dd3aa 100644
--- a/Firebase/Auth/Source/Public/FIRAdditionalUserInfo.h
+++ b/Firebase/Auth/Source/Public/FIRAdditionalUserInfo.h
@@ -16,8 +16,6 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRAuthSwiftNameSupport.h"
-
 @class FIRVerifyAssertionResponse;
 
 NS_ASSUME_NONNULL_BEGIN
@@ -25,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
 /** @class FIRAdditionalUserInfo
     @brief Represents additional user data returned from an identity provider.
  */
-FIR_SWIFT_NAME(AdditionalUserInfo)
+NS_SWIFT_NAME(AdditionalUserInfo)
 @interface FIRAdditionalUserInfo : NSObject
 
 /** @fn init
diff --git a/Firebase/Auth/Source/Public/FIRAuth.h b/Firebase/Auth/Source/Public/FIRAuth.h
index 2935916..42b3ac5 100644
--- a/Firebase/Auth/Source/Public/FIRAuth.h
+++ b/Firebase/Auth/Source/Public/FIRAuth.h
@@ -17,7 +17,6 @@
 #import <Foundation/Foundation.h>
 
 #import "FIRAuthErrors.h"
-#import "FIRAuthSwiftNameSupport.h"
 
 #if TARGET_OS_IOS
 #import "FIRAuthAPNSTokenType.h"
@@ -37,7 +36,7 @@ NS_ASSUME_NONNULL_BEGIN
     @brief The type of handle returned by @c FIRAuth.addAuthStateDidChangeListener:.
  */
 typedef id<NSObject> FIRAuthStateDidChangeListenerHandle
-    FIR_SWIFT_NAME(AuthStateDidChangeListenerHandle);
+    NS_SWIFT_NAME(AuthStateDidChangeListenerHandle);
 
 /** @typedef FIRAuthStateDidChangeListenerBlock
     @brief The type of block which can be registered as a listener for auth state did change events.
@@ -46,13 +45,13 @@ typedef id<NSObject> FIRAuthStateDidChangeListenerHandle
     @param user Optionally; the current signed in user, if any.
  */
 typedef void(^FIRAuthStateDidChangeListenerBlock)(FIRAuth *auth, FIRUser *_Nullable user)
-    FIR_SWIFT_NAME(AuthStateDidChangeListenerBlock);
+    NS_SWIFT_NAME(AuthStateDidChangeListenerBlock);
 
 /** @typedef FIRIDTokenDidChangeListenerHandle
     @brief The type of handle returned by @c FIRAuth.addIDTokenDidChangeListener:.
  */
 typedef id<NSObject> FIRIDTokenDidChangeListenerHandle
-    FIR_SWIFT_NAME(IDTokenDidChangeListenerHandle);
+    NS_SWIFT_NAME(IDTokenDidChangeListenerHandle);
 
 /** @typedef FIRIDTokenDidChangeListenerBlock
     @brief The type of block which can be registered as a listener for ID token did change events.
@@ -61,7 +60,7 @@ typedef id<NSObject> FIRIDTokenDidChangeListenerHandle
     @param user Optionally; the current signed in user, if any.
  */
 typedef void(^FIRIDTokenDidChangeListenerBlock)(FIRAuth *auth, FIRUser *_Nullable user)
-    FIR_SWIFT_NAME(IDTokenDidChangeListenerBlock);
+    NS_SWIFT_NAME(IDTokenDidChangeListenerBlock);
 
 /** @typedef FIRAuthDataResultCallback
     @brief The type of block invoked when sign-in related events complete.
@@ -72,7 +71,7 @@ typedef void(^FIRIDTokenDidChangeListenerBlock)(FIRAuth *auth, FIRUser *_Nullabl
  */
 typedef void (^FIRAuthDataResultCallback)(FIRAuthDataResult *_Nullable authResult,
                                           NSError *_Nullable error)
-    FIR_SWIFT_NAME(AuthDataResultCallback);
+    NS_SWIFT_NAME(AuthDataResultCallback);
 
 #if defined(__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0
 /**
@@ -81,7 +80,7 @@ typedef void (^FIRAuthDataResultCallback)(FIRAuthDataResult *_Nullable authResul
         object parameter of the notification is the sender @c FIRAuth instance.
  */
 extern const NSNotificationName FIRAuthStateDidChangeNotification
-    FIR_SWIFT_NAME(AuthStateDidChange);
+    NS_SWIFT_NAME(AuthStateDidChange);
 #else
 /**
     @brief The name of the @c NSNotificationCenter notification which is posted when the auth state
@@ -89,7 +88,7 @@ extern const NSNotificationName FIRAuthStateDidChangeNotification
         object parameter of the notification is the sender @c FIRAuth instance.
  */
 extern NSString *const FIRAuthStateDidChangeNotification
-    FIR_SWIFT_NAME(AuthStateDidChangeNotification);
+    NS_SWIFT_NAME(AuthStateDidChangeNotification);
 #endif  // defined(__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0
 
 /** @typedef FIRAuthResultCallback
@@ -100,7 +99,7 @@ extern NSString *const FIRAuthStateDidChangeNotification
         problem. Set to nil otherwise.
  */
 typedef void (^FIRAuthResultCallback)(FIRUser *_Nullable user, NSError *_Nullable error)
-    FIR_SWIFT_NAME(AuthResultCallback);
+    NS_SWIFT_NAME(AuthResultCallback);
 
 /** @typedef FIRProviderQueryCallback
     @brief The type of block invoked when a list of identity providers for a given email address is
@@ -113,7 +112,7 @@ typedef void (^FIRAuthResultCallback)(FIRUser *_Nullable user, NSError *_Nullabl
  */
 typedef void (^FIRProviderQueryCallback)(NSArray<NSString *> *_Nullable providers,
                                          NSError *_Nullable error)
-    FIR_SWIFT_NAME(ProviderQueryCallback);
+    NS_SWIFT_NAME(ProviderQueryCallback);
 
 /** @typedef FIRSendPasswordResetCallback
     @brief The type of block invoked when sending a password reset email.
@@ -122,7 +121,7 @@ typedef void (^FIRProviderQueryCallback)(NSArray<NSString *> *_Nullable provider
         problem. Set to nil otherwise.
  */
 typedef void (^FIRSendPasswordResetCallback)(NSError *_Nullable error)
-    FIR_SWIFT_NAME(SendPasswordResetCallback);
+    NS_SWIFT_NAME(SendPasswordResetCallback);
 
 /** @typedef FIRConfirmPasswordResetCallback
     @brief The type of block invoked when performing a password reset.
@@ -131,7 +130,7 @@ typedef void (^FIRSendPasswordResetCallback)(NSError *_Nullable error)
         problem. Set to nil otherwise.
  */
 typedef void (^FIRConfirmPasswordResetCallback)(NSError *_Nullable error)
-    FIR_SWIFT_NAME(ConfirmPasswordResetCallback);
+    NS_SWIFT_NAME(ConfirmPasswordResetCallback);
 
 /** @typedef FIRVerifyPasswordResetCodeCallback
     @brief The type of block invoked when verifying that an out of band code should be used to
@@ -143,7 +142,7 @@ typedef void (^FIRConfirmPasswordResetCallback)(NSError *_Nullable error)
  */
 typedef void (^FIRVerifyPasswordResetCodeCallback)(NSString *_Nullable email,
                                                    NSError *_Nullable error)
-    FIR_SWIFT_NAME(VerifyPasswordResetCodeCallback);
+    NS_SWIFT_NAME(VerifyPasswordResetCodeCallback);
 
 /** @typedef FIRApplyActionCodeCallback
     @brief The type of block invoked when applying an action code.
@@ -152,7 +151,7 @@ typedef void (^FIRVerifyPasswordResetCodeCallback)(NSString *_Nullable email,
         problem. Set to nil otherwise.
  */
 typedef void (^FIRApplyActionCodeCallback)(NSError *_Nullable error)
-    FIR_SWIFT_NAME(ApplyActionCodeCallback);
+    NS_SWIFT_NAME(ApplyActionCodeCallback);
 
 /**
     @brief Keys used to retrieve operation data from a @c FIRActionCodeInfo object by the
@@ -167,12 +166,12 @@ typedef NS_ENUM(NSInteger, FIRActionDataKey) {
 
   /** For FIRActionCodeOperationRecoverEmail, the current email address for the account. */
   FIRActionCodeFromEmailKey = 1
-} FIR_SWIFT_NAME(ActionDataKey);
+} NS_SWIFT_NAME(ActionDataKey);
 
 /** @class FIRActionCodeInfo
     @brief Manages information regarding action codes.
  */
-FIR_SWIFT_NAME(ActionCodeInfo)
+NS_SWIFT_NAME(ActionCodeInfo)
 @interface FIRActionCodeInfo : NSObject
 
 /**
@@ -191,7 +190,7 @@ typedef NS_ENUM(NSInteger, FIRActionCodeOperation) {
     /** Action code for recover email operation. */
     FIRActionCodeOperationRecoverEmail = 3,
 
-} FIR_SWIFT_NAME(ActionCodeOperation);
+} NS_SWIFT_NAME(ActionCodeOperation);
 
 /**
     @brief The operation being performed.
@@ -223,13 +222,13 @@ typedef NS_ENUM(NSInteger, FIRActionCodeOperation) {
  */
 typedef void (^FIRCheckActionCodeCallBack)(FIRActionCodeInfo *_Nullable info,
                                            NSError *_Nullable error)
-    FIR_SWIFT_NAME(CheckActionCodeCallback);
+    NS_SWIFT_NAME(CheckActionCodeCallback);
 
 /** @class FIRAuth
     @brief Manages authentication for Firebase apps.
     @remarks This class is thread-safe.
  */
-FIR_SWIFT_NAME(Auth)
+NS_SWIFT_NAME(Auth)
 @interface FIRAuth : NSObject
 
 /** @fn auth
@@ -237,7 +236,7 @@ FIR_SWIFT_NAME(Auth)
     @remarks The default Firebase app must have already been configured or an exception will be
         raised.
  */
-+ (FIRAuth *)auth FIR_SWIFT_NAME(auth());
++ (FIRAuth *)auth NS_SWIFT_NAME(auth());
 
 /** @fn authWithApp:
     @brief Gets the auth object for a @c FIRApp.
@@ -245,7 +244,7 @@ FIR_SWIFT_NAME(Auth)
     @param app The FIRApp for which to retrieve the associated FIRAuth instance.
     @return The FIRAuth instance associated with the given FIRApp.
  */
-+ (FIRAuth *)authWithApp:(FIRApp *)app FIR_SWIFT_NAME(auth(app:));
++ (FIRAuth *)authWithApp:(FIRApp *)app NS_SWIFT_NAME(auth(app:));
 
 /** @property app
     @brief Gets the @c FIRApp object that this auth object is connected to.
diff --git a/Firebase/Auth/Source/Public/FIRAuthAPNSTokenType.h b/Firebase/Auth/Source/Public/FIRAuthAPNSTokenType.h
index 87df574..4f3c9f6 100644
--- a/Firebase/Auth/Source/Public/FIRAuthAPNSTokenType.h
+++ b/Firebase/Auth/Source/Public/FIRAuthAPNSTokenType.h
@@ -16,8 +16,6 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRAuthSwiftNameSupport.h"
-
 NS_ASSUME_NONNULL_BEGIN
 
 /**
@@ -37,6 +35,6 @@ typedef NS_ENUM(NSInteger, FIRAuthAPNSTokenType) {
   /** Production token type.
    */
   FIRAuthAPNSTokenTypeProd,
-} FIR_SWIFT_NAME(AuthAPNSTokenType);
+} NS_SWIFT_NAME(AuthAPNSTokenType);
 
 NS_ASSUME_NONNULL_END
diff --git a/Firebase/Auth/Source/Public/FIRAuthCredential.h b/Firebase/Auth/Source/Public/FIRAuthCredential.h
index ce28854..106d844 100644
--- a/Firebase/Auth/Source/Public/FIRAuthCredential.h
+++ b/Firebase/Auth/Source/Public/FIRAuthCredential.h
@@ -16,14 +16,12 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRAuthSwiftNameSupport.h"
-
 NS_ASSUME_NONNULL_BEGIN
 
 /** @class FIRAuthCredential
     @brief Represents a credential.
  */
-FIR_SWIFT_NAME(AuthCredential)
+NS_SWIFT_NAME(AuthCredential)
 @interface FIRAuthCredential : NSObject
 
 /** @property provider
diff --git a/Firebase/Auth/Source/Public/FIRAuthDataResult.h b/Firebase/Auth/Source/Public/FIRAuthDataResult.h
index b7f3ee0..ba16576 100644
--- a/Firebase/Auth/Source/Public/FIRAuthDataResult.h
+++ b/Firebase/Auth/Source/Public/FIRAuthDataResult.h
@@ -16,8 +16,6 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRAuthSwiftNameSupport.h"
-
 @class FIRAdditionalUserInfo;
 @class FIRUser;
 
@@ -27,7 +25,7 @@ NS_ASSUME_NONNULL_BEGIN
     @brief Helper object that contains the result of a successful sign-in, link and reauthenticate
         action. It contains references to a FIRUser instance and a FIRAdditionalUserInfo instance.
  */
-FIR_SWIFT_NAME(AuthDataResult)
+NS_SWIFT_NAME(AuthDataResult)
 @interface FIRAuthDataResult : NSObject
 
 /** @fn init
diff --git a/Firebase/Auth/Source/Public/FIRAuthErrors.h b/Firebase/Auth/Source/Public/FIRAuthErrors.h
index 1691228..fdfee19 100644
--- a/Firebase/Auth/Source/Public/FIRAuthErrors.h
+++ b/Firebase/Auth/Source/Public/FIRAuthErrors.h
@@ -16,8 +16,6 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRAuthSwiftNameSupport.h"
-
 /** @class FIRAuthErrors
     @remarks Error Codes common to all API Methods:
     <ul>
@@ -36,31 +34,31 @@
         <li>@c FIRAuthErrorCodeUserDisabled</li>
     </ul>
  */
-FIR_SWIFT_NAME(AuthErrors)
+NS_SWIFT_NAME(AuthErrors)
 @interface FIRAuthErrors
 
 /**
     @brief The Firebase Auth error domain.
  */
-extern NSString *const FIRAuthErrorDomain FIR_SWIFT_NAME(AuthErrorDomain);
+extern NSString *const FIRAuthErrorDomain NS_SWIFT_NAME(AuthErrorDomain);
 
 /**
     @brief The key used to read the updated credential from the userinfo dictionary of the NSError
         object returned in the case that the credential being linked in already in use.
  */
-extern NSString *const FIRAuthUpdatedCredentialKey FIR_SWIFT_NAME(AuthUpdatedCredentialKey);
+extern NSString *const FIRAuthUpdatedCredentialKey NS_SWIFT_NAME(AuthUpdatedCredentialKey);
 
 /**
     @brief The name of the key for the "error_name" string in the NSError userinfo dictionary.
  */
-extern NSString *const FIRAuthErrorNameKey FIR_SWIFT_NAME(AuthErrorNameKey);
+extern NSString *const FIRAuthErrorNameKey NS_SWIFT_NAME(AuthErrorNameKey);
 
 /**
     @brief Errors with the code @c FIRAuthErrorCodeAccountExistsWithDifferentCredential may contain
         an @c NSError.userInfo dictinary object which contains this key. The value associated with
         this key is an NSString of the email address of the account that already exists.
  */
-extern NSString *const FIRAuthErrorUserInfoEmailKey FIR_SWIFT_NAME(AuthErrorUserInfoEmailKey);
+extern NSString *const FIRAuthErrorUserInfoEmailKey NS_SWIFT_NAME(AuthErrorUserInfoEmailKey);
 
 /**
     @brief Error codes used by Firebase Auth.
@@ -308,6 +306,6 @@ typedef NS_ENUM(NSInteger, FIRAuthErrorCode) {
     /** Indicates an internal error occurred.
      */
     FIRAuthErrorCodeInternalError = 17999,
-} FIR_SWIFT_NAME(AuthErrorCode);
+} NS_SWIFT_NAME(AuthErrorCode);
 
 @end
diff --git a/Firebase/Auth/Source/Public/FIRAuthSwiftNameSupport.h b/Firebase/Auth/Source/Public/FIRAuthSwiftNameSupport.h
deleted file mode 100644
index 55e1bcc..0000000
--- a/Firebase/Auth/Source/Public/FIRAuthSwiftNameSupport.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2017 Google
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef FIR_SWIFT_NAME
-
-#import <Foundation/Foundation.h>
-
-// NS_SWIFT_NAME can only translate factory methods before the iOS 9.3 SDK.
-// Wrap it in our own macro if it's a non-compatible SDK.
-#ifdef __IPHONE_9_3
-#define FIR_SWIFT_NAME(X) NS_SWIFT_NAME(X)
-#else
-#define FIR_SWIFT_NAME(X)  // Intentionally blank.
-#endif  // #ifdef __IPHONE_9_3
-
-#endif  // FIR_SWIFT_NAME
diff --git a/Firebase/Auth/Source/Public/FIRAuthUIDelegate.h b/Firebase/Auth/Source/Public/FIRAuthUIDelegate.h
index 5fc5dc5..9b32968 100644
--- a/Firebase/Auth/Source/Public/FIRAuthUIDelegate.h
+++ b/Firebase/Auth/Source/Public/FIRAuthUIDelegate.h
@@ -17,14 +17,12 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
-#import "FIRAuthSwiftNameSupport.h"
-
 NS_ASSUME_NONNULL_BEGIN
 
 /** @protocol FIRAuthUIDelegate
     @brief A protocol to handle user interface interactions for Firebase Auth.
  */
-FIR_SWIFT_NAME(AuthUIDelegate)
+NS_SWIFT_NAME(AuthUIDelegate)
 @protocol FIRAuthUIDelegate <NSObject>
 
 /** @fn presentViewController:animated:completion:
@@ -47,7 +45,7 @@ FIR_SWIFT_NAME(AuthUIDelegate)
         value and takes no parameters.
 */
 - (void)dismissViewControllerAnimated:(BOOL)flag completion:(void (^ _Nullable)(void))completion
-    FIR_SWIFT_NAME(dismiss(animated:completion:));
+    NS_SWIFT_NAME(dismiss(animated:completion:));
 
 @end
 
diff --git a/Firebase/Auth/Source/Public/FIREmailAuthProvider.h b/Firebase/Auth/Source/Public/FIREmailAuthProvider.h
index 4fb5ea0..030efda 100644
--- a/Firebase/Auth/Source/Public/FIREmailAuthProvider.h
+++ b/Firebase/Auth/Source/Public/FIREmailAuthProvider.h
@@ -16,8 +16,6 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRAuthSwiftNameSupport.h"
-
 @class FIRAuthCredential;
 
 NS_ASSUME_NONNULL_BEGIN
@@ -25,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
 /**
     @brief A string constant identifying the email & password identity provider.
  */
-extern NSString *const FIREmailAuthProviderID FIR_SWIFT_NAME(EmailAuthProviderID);
+extern NSString *const FIREmailAuthProviderID NS_SWIFT_NAME(EmailAuthProviderID);
 
 /**
     @brief please use @c FIREmailAuthProviderID instead.
@@ -35,7 +33,7 @@ extern NSString *const FIREmailPasswordAuthProviderID __attribute__((deprecated)
 /** @class FIREmailAuthProvider
     @brief A concrete implementation of @c FIRAuthProvider for Email & Password Sign In.
  */
-FIR_SWIFT_NAME(EmailAuthProvider)
+NS_SWIFT_NAME(EmailAuthProvider)
 @interface FIREmailAuthProvider : NSObject
 
 /** @typedef FIREmailPasswordAuthProvider
diff --git a/Firebase/Auth/Source/Public/FIRFacebookAuthProvider.h b/Firebase/Auth/Source/Public/FIRFacebookAuthProvider.h
index 2307b08..dae90dc 100644
--- a/Firebase/Auth/Source/Public/FIRFacebookAuthProvider.h
+++ b/Firebase/Auth/Source/Public/FIRFacebookAuthProvider.h
@@ -16,8 +16,6 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRAuthSwiftNameSupport.h"
-
 @class FIRAuthCredential;
 
 NS_ASSUME_NONNULL_BEGIN
@@ -25,12 +23,12 @@ NS_ASSUME_NONNULL_BEGIN
 /**
     @brief A string constant identifying the Facebook identity provider.
  */
-extern NSString *const FIRFacebookAuthProviderID FIR_SWIFT_NAME(FacebookAuthProviderID);
+extern NSString *const FIRFacebookAuthProviderID NS_SWIFT_NAME(FacebookAuthProviderID);
 
 /** @class FIRFacebookAuthProvider
     @brief Utility class for constructing Facebook credentials.
  */
-FIR_SWIFT_NAME(FacebookAuthProvider)
+NS_SWIFT_NAME(FacebookAuthProvider)
 @interface FIRFacebookAuthProvider : NSObject
 
 /** @fn credentialWithAccessToken:
diff --git a/Firebase/Auth/Source/Public/FIRGitHubAuthProvider.h b/Firebase/Auth/Source/Public/FIRGitHubAuthProvider.h
index ab5c0ef..0da3142 100644
--- a/Firebase/Auth/Source/Public/FIRGitHubAuthProvider.h
+++ b/Firebase/Auth/Source/Public/FIRGitHubAuthProvider.h
@@ -16,8 +16,6 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRAuthSwiftNameSupport.h"
-
 @class FIRAuthCredential;
 
 NS_ASSUME_NONNULL_BEGIN
@@ -25,12 +23,12 @@ NS_ASSUME_NONNULL_BEGIN
 /**
     @brief A string constant identifying the GitHub identity provider.
  */
-extern NSString *const FIRGitHubAuthProviderID FIR_SWIFT_NAME(GitHubAuthProviderID);
+extern NSString *const FIRGitHubAuthProviderID NS_SWIFT_NAME(GitHubAuthProviderID);
 
 /** @class FIRGitHubAuthProvider
     @brief Utility class for constructing GitHub credentials.
  */
-FIR_SWIFT_NAME(GitHubAuthProvider)
+NS_SWIFT_NAME(GitHubAuthProvider)
 @interface FIRGitHubAuthProvider : NSObject
 
 /** @fn credentialWithToken:
diff --git a/Firebase/Auth/Source/Public/FIRGoogleAuthProvider.h b/Firebase/Auth/Source/Public/FIRGoogleAuthProvider.h
index 92f0db2..1386c04 100644
--- a/Firebase/Auth/Source/Public/FIRGoogleAuthProvider.h
+++ b/Firebase/Auth/Source/Public/FIRGoogleAuthProvider.h
@@ -16,8 +16,6 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRAuthSwiftNameSupport.h"
-
 @class FIRAuthCredential;
 
 NS_ASSUME_NONNULL_BEGIN
@@ -25,12 +23,12 @@ NS_ASSUME_NONNULL_BEGIN
 /**
     @brief A string constant identifying the Google identity provider.
  */
-extern NSString *const FIRGoogleAuthProviderID FIR_SWIFT_NAME(GoogleAuthProviderID);
+extern NSString *const FIRGoogleAuthProviderID NS_SWIFT_NAME(GoogleAuthProviderID);
 
 /** @class FIRGoogleAuthProvider
     @brief Utility class for constructing Google Sign In credentials.
  */
-FIR_SWIFT_NAME(GoogleAuthProvider)
+NS_SWIFT_NAME(GoogleAuthProvider)
 @interface FIRGoogleAuthProvider : NSObject
 
 /** @fn credentialWithIDToken:accessToken:
diff --git a/Firebase/Auth/Source/Public/FIROAuthProvider.h b/Firebase/Auth/Source/Public/FIROAuthProvider.h
index e059b22..b20d9b6 100644
--- a/Firebase/Auth/Source/Public/FIROAuthProvider.h
+++ b/Firebase/Auth/Source/Public/FIROAuthProvider.h
@@ -16,8 +16,6 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRAuthSwiftNameSupport.h"
-
 @class FIRAuthCredential;
 
 NS_ASSUME_NONNULL_BEGIN
@@ -25,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
 /** @class FIROAuthProvider
     @brief A concrete implementation of @c FIRAuthProvider for generic OAuth Providers.
  */
-FIR_SWIFT_NAME(OAuthProvider)
+NS_SWIFT_NAME(OAuthProvider)
 @interface FIROAuthProvider : NSObject
 
 /** @fn credentialWithProviderID:IDToken:accessToken:
diff --git a/Firebase/Auth/Source/Public/FIRPhoneAuthCredential.h b/Firebase/Auth/Source/Public/FIRPhoneAuthCredential.h
index d951564..26dfca8 100644
--- a/Firebase/Auth/Source/Public/FIRPhoneAuthCredential.h
+++ b/Firebase/Auth/Source/Public/FIRPhoneAuthCredential.h
@@ -17,14 +17,13 @@
 #import <Foundation/Foundation.h>
 
 #import "FIRAuthCredential.h"
-#import "FIRAuthSwiftNameSupport.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
 /** @class FIRPhoneAuthCredential
     @brief Implementation of FIRAuthCredential for Phone Auth credentials.
  */
-FIR_SWIFT_NAME(PhoneAuthCredential)
+NS_SWIFT_NAME(PhoneAuthCredential)
 @interface FIRPhoneAuthCredential : FIRAuthCredential
 
 /** @fn init
diff --git a/Firebase/Auth/Source/Public/FIRPhoneAuthProvider.h b/Firebase/Auth/Source/Public/FIRPhoneAuthProvider.h
index 90cfebd..2d6d698 100644
--- a/Firebase/Auth/Source/Public/FIRPhoneAuthProvider.h
+++ b/Firebase/Auth/Source/Public/FIRPhoneAuthProvider.h
@@ -16,8 +16,6 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRAuthSwiftNameSupport.h"
-
 @class FIRAuth;
 @class FIRPhoneAuthCredential;
 @protocol FIRAuthUIDelegate;
@@ -27,7 +25,7 @@ NS_ASSUME_NONNULL_BEGIN
 /** @var FIRPhoneAuthProviderID
     @brief A string constant identifying the phone identity provider.
  */
-extern NSString *const FIRPhoneAuthProviderID FIR_SWIFT_NAME(PhoneAuthProviderID);
+extern NSString *const FIRPhoneAuthProviderID NS_SWIFT_NAME(PhoneAuthProviderID);
 
 /** @typedef FIRVerificationResultCallback
     @brief The type of block invoked when a request to send a verification code has finished.
@@ -37,25 +35,25 @@ extern NSString *const FIRPhoneAuthProviderID FIR_SWIFT_NAME(PhoneAuthProviderID
  */
 typedef void (^FIRVerificationResultCallback)(NSString *_Nullable verificationID,
                                               NSError *_Nullable error)
-    FIR_SWIFT_NAME(VerificationResultCallback);
+    NS_SWIFT_NAME(VerificationResultCallback);
 
 /** @class FIRPhoneAuthProvider
     @brief A concrete implementation of @c FIRAuthProvider for phone auth providers.
  */
-FIR_SWIFT_NAME(PhoneAuthProvider)
+NS_SWIFT_NAME(PhoneAuthProvider)
 @interface FIRPhoneAuthProvider : NSObject
 
 /** @fn provider
     @brief Returns an instance of @c FIRPhoneAuthProvider for the default @c FIRAuth object.
  */
-+ (instancetype)provider FIR_SWIFT_NAME(provider());
++ (instancetype)provider NS_SWIFT_NAME(provider());
 
 /** @fn providerWithAuth:
     @brief Returns an instance of @c FIRPhoneAuthProvider for the provided @c FIRAuth object.
 
     @param auth The auth object to associate with the phone auth provider instance.
  */
-+ (instancetype)providerWithAuth:(FIRAuth *)auth FIR_SWIFT_NAME(provider(auth:));
++ (instancetype)providerWithAuth:(FIRAuth *)auth NS_SWIFT_NAME(provider(auth:));
 
 /** @fn verifyPhoneNumber:completion:
     @brief Please use @c verifyPhoneNumber:UIDelegate:completion: instead.
diff --git a/Firebase/Auth/Source/Public/FIRTwitterAuthProvider.h b/Firebase/Auth/Source/Public/FIRTwitterAuthProvider.h
index d8f647d..4200753 100644
--- a/Firebase/Auth/Source/Public/FIRTwitterAuthProvider.h
+++ b/Firebase/Auth/Source/Public/FIRTwitterAuthProvider.h
@@ -16,8 +16,6 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRAuthSwiftNameSupport.h"
-
 @class FIRAuthCredential;
 
 NS_ASSUME_NONNULL_BEGIN
@@ -25,12 +23,12 @@ NS_ASSUME_NONNULL_BEGIN
 /**
     @brief A string constant identifying the Twitter identity provider.
  */
-extern NSString *const FIRTwitterAuthProviderID FIR_SWIFT_NAME(TwitterAuthProviderID);
+extern NSString *const FIRTwitterAuthProviderID NS_SWIFT_NAME(TwitterAuthProviderID);
 
 /** @class FIRTwitterAuthProvider
     @brief Utility class for constructing Twitter credentials.
  */
-FIR_SWIFT_NAME(TwitterAuthProvider)
+NS_SWIFT_NAME(TwitterAuthProvider)
 @interface FIRTwitterAuthProvider : NSObject
 
 /** @fn credentialWithToken:secret:
diff --git a/Firebase/Auth/Source/Public/FIRUser.h b/Firebase/Auth/Source/Public/FIRUser.h
index f0a5619..7e22329 100644
--- a/Firebase/Auth/Source/Public/FIRUser.h
+++ b/Firebase/Auth/Source/Public/FIRUser.h
@@ -18,7 +18,6 @@
 
 #import "FIRAuth.h"
 #import "FIRAuthDataResult.h"
-#import "FIRAuthSwiftNameSupport.h"
 #import "FIRUserInfo.h"
 
 @class FIRPhoneAuthCredential;
@@ -38,7 +37,7 @@ NS_ASSUME_NONNULL_BEGIN
     @remarks One of: @c token or @c error will always be non-nil.
  */
 typedef void (^FIRAuthTokenCallback)(NSString *_Nullable token, NSError *_Nullable error)
-    FIR_SWIFT_NAME(AuthTokenCallback);
+    NS_SWIFT_NAME(AuthTokenCallback);
 
 /** @typedef FIRUserProfileChangeCallback
     @brief The type of block called when a user profile change has finished.
@@ -46,7 +45,7 @@ typedef void (^FIRAuthTokenCallback)(NSString *_Nullable token, NSError *_Nullab
     @param error Optionally; the error which occurred - or nil if the request was successful.
  */
 typedef void (^FIRUserProfileChangeCallback)(NSError *_Nullable error)
-    FIR_SWIFT_NAME(UserProfileChangeCallback);
+    NS_SWIFT_NAME(UserProfileChangeCallback);
 
 /** @typedef FIRSendEmailVerificationCallback
     @brief The type of block called when a request to send an email verification has finished.
@@ -54,13 +53,13 @@ typedef void (^FIRUserProfileChangeCallback)(NSError *_Nullable error)
     @param error Optionally; the error which occurred - or nil if the request was successful.
  */
 typedef void (^FIRSendEmailVerificationCallback)(NSError *_Nullable error)
-    FIR_SWIFT_NAME(SendEmailVerificationCallback);
+    NS_SWIFT_NAME(SendEmailVerificationCallback);
 
 /** @class FIRUser
     @brief Represents a user.
     @remarks This class is thread-safe.
  */
-FIR_SWIFT_NAME(User)
+NS_SWIFT_NAME(User)
 @interface FIRUser : NSObject <FIRUserInfo>
 
 /** @property anonymous
@@ -133,7 +132,7 @@ FIR_SWIFT_NAME(User)
     @remarks See @c FIRAuthErrors for a list of error codes that are common to all FIRUser methods.
  */
 - (void)updateEmail:(NSString *)email completion:(nullable FIRUserProfileChangeCallback)completion
-    FIR_SWIFT_NAME(updateEmail(to:completion:));
+    NS_SWIFT_NAME(updateEmail(to:completion:));
 
 /** @fn updatePassword:completion:
     @brief Updates the password for the user. On success, the cached user profile data is updated.
@@ -162,7 +161,7 @@ FIR_SWIFT_NAME(User)
  */
 - (void)updatePassword:(NSString *)password
             completion:(nullable FIRUserProfileChangeCallback)completion
-    FIR_SWIFT_NAME(updatePassword(to:completion:));
+    NS_SWIFT_NAME(updatePassword(to:completion:));
 
 #if TARGET_OS_IOS
 /** @fn updatePhoneNumberCredential:completion:
@@ -198,7 +197,7 @@ FIR_SWIFT_NAME(User)
 
     @return An object which may be used to change the user's profile data atomically.
  */
-- (FIRUserProfileChangeRequest *)profileChangeRequest FIR_SWIFT_NAME(createProfileChangeRequest());
+- (FIRUserProfileChangeRequest *)profileChangeRequest NS_SWIFT_NAME(createProfileChangeRequest());
 
 /** @fn reloadWithCompletion:
     @brief Reloads the user's profile data from the server.
@@ -275,7 +274,7 @@ FIR_SWIFT_NAME(User)
     @remarks See @c FIRAuthErrors for a list of error codes that are common to all API methods.
  */
 - (void)getIDTokenWithCompletion:(nullable FIRAuthTokenCallback)completion
-    FIR_SWIFT_NAME(getIDToken(completion:));
+    NS_SWIFT_NAME(getIDToken(completion:));
 
 /** @fn getTokenWithCompletion:
     @brief Please use @c getIDTokenWithCompletion: instead.
@@ -286,7 +285,7 @@ FIR_SWIFT_NAME(User)
     @remarks See @c FIRAuthErrors for a list of error codes that are common to all API methods.
  */
 - (void)getTokenWithCompletion:(nullable FIRAuthTokenCallback)completion
-    FIR_SWIFT_NAME(getToken(completion:)) __attribute__((deprecated));
+    NS_SWIFT_NAME(getToken(completion:)) __attribute__((deprecated));
 
 /** @fn getIDTokenForcingRefresh:completion:
     @brief Retrieves the Firebase authentication token, possibly refreshing it if it has expired.
@@ -470,7 +469,7 @@ FIR_SWIFT_NAME(User)
     @remarks Properties are marked as being part of a profile update when they are set. Setting a
         property value to nil is not the same as leaving the property unassigned.
  */
-FIR_SWIFT_NAME(UserProfileChangeRequest)
+NS_SWIFT_NAME(UserProfileChangeRequest)
 @interface FIRUserProfileChangeRequest : NSObject
 
 /** @fn init
diff --git a/Firebase/Auth/Source/Public/FIRUserInfo.h b/Firebase/Auth/Source/Public/FIRUserInfo.h
index 03f2038..04eca49 100644
--- a/Firebase/Auth/Source/Public/FIRUserInfo.h
+++ b/Firebase/Auth/Source/Public/FIRUserInfo.h
@@ -16,14 +16,12 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRAuthSwiftNameSupport.h"
-
 NS_ASSUME_NONNULL_BEGIN
 
 /**
     @brief Represents user data returned from an identity provider.
  */
-FIR_SWIFT_NAME(UserInfo)
+NS_SWIFT_NAME(UserInfo)
 @protocol FIRUserInfo <NSObject>
 
 /** @property providerID
diff --git a/Firebase/Auth/Source/Public/FIRUserMetadata.h b/Firebase/Auth/Source/Public/FIRUserMetadata.h
index 1b72ee1..2533171 100644
--- a/Firebase/Auth/Source/Public/FIRUserMetadata.h
+++ b/Firebase/Auth/Source/Public/FIRUserMetadata.h
@@ -16,14 +16,12 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRAuthSwiftNameSupport.h"
-
 NS_ASSUME_NONNULL_BEGIN
 
 /** @class FIRUserMetdata
     @brief A data class representing the metadata corresponding to a Firebase user.
  */
-FIR_SWIFT_NAME(UserMetadata)
+NS_SWIFT_NAME(UserMetadata)
 @interface FIRUserMetadata : NSObject
 
 /** @property lastSignInDate
diff --git a/Firebase/Auth/Source/Public/FirebaseAuth.h b/Firebase/Auth/Source/Public/FirebaseAuth.h
index 0cc5905..409ac73 100644
--- a/Firebase/Auth/Source/Public/FirebaseAuth.h
+++ b/Firebase/Auth/Source/Public/FirebaseAuth.h
@@ -22,7 +22,6 @@
 #import "FIRAuthCredential.h"
 #import "FIRAuthDataResult.h"
 #import "FIRAuthErrors.h"
-#import "FIRAuthSwiftNameSupport.h"
 #import "FirebaseAuthVersion.h"
 #import "FIREmailAuthProvider.h"
 #import "FIRFacebookAuthProvider.h"