diff options
| author |  Ryan Wilson <wilsonryan@google.com> | 2017-11-28 06:59:07 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-11-28 06:59:07 -0800 |
| commit | 7386f00178be4fe1f8d8f749049d25cbf0533e6a (patch) | |
| tree | 02ba61c9cda5c439b4b991c7286f93ea8512bbea /Firebase/Core/Public/FIRConfiguration.h | |
| parent | 7459be46ffb27bc95e155a1b267f91093f1a62b0 (diff) | |
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
Diffstat (limited to 'Firebase/Core/Public/FIRConfiguration.h')
| -rw-r--r-- | Firebase/Core/Public/FIRConfiguration.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Firebase/Core/Public/FIRConfiguration.h b/Firebase/Core/Public/FIRConfiguration.h index e2c85e5..05bd261 100644 --- a/Firebase/Core/Public/FIRConfiguration.h +++ b/Firebase/Core/Public/FIRConfiguration.h @@ -17,7 +17,6 @@ #import <Foundation/Foundation.h> #import "FIRAnalyticsConfiguration.h" -#import "FIRCoreSwiftNameSupport.h" #import "FIRLoggerLevel.h" /** @@ -45,15 +44,15 @@ NS_ASSUME_NONNULL_BEGIN * This interface provides global level properties that the developer can tweak, and the singleton * of the Firebase Analytics configuration class. */ -FIR_SWIFT_NAME(FirebaseConfiguration) +NS_SWIFT_NAME(FirebaseConfiguration) @interface FIRConfiguration : NSObject #if defined(__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0 /** Returns the shared configuration object. */ -@property(class, nonatomic, readonly) FIRConfiguration *sharedInstance FIR_SWIFT_NAME(shared); +@property(class, nonatomic, readonly) FIRConfiguration *sharedInstance NS_SWIFT_NAME(shared); #else /** Returns the shared configuration object. */ -+ (FIRConfiguration *)sharedInstance FIR_SWIFT_NAME(shared()); ++ (FIRConfiguration *)sharedInstance NS_SWIFT_NAME(shared()); #endif // defined(__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0 /** The configuration class for Firebase Analytics. */ |