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 /Firestore/Source/Public/FIRTransaction.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 'Firestore/Source/Public/FIRTransaction.h')
| -rw-r--r-- | Firestore/Source/Public/FIRTransaction.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/Firestore/Source/Public/FIRTransaction.h b/Firestore/Source/Public/FIRTransaction.h index 68e4600..51a6e90 100644 --- a/Firestore/Source/Public/FIRTransaction.h +++ b/Firestore/Source/Public/FIRTransaction.h @@ -16,8 +16,6 @@ #import <Foundation/Foundation.h> -#import "FIRFirestoreSwiftNameSupport.h" - NS_ASSUME_NONNULL_BEGIN @class FIRDocumentReference; @@ -29,7 +27,7 @@ NS_ASSUME_NONNULL_BEGIN * * @see FIRFirestore#transaction:completion: */ -FIR_SWIFT_NAME(Transaction) +NS_SWIFT_NAME(Transaction) @interface FIRTransaction : NSObject /** */ @@ -47,7 +45,7 @@ FIR_SWIFT_NAME(Transaction) // clang-format off - (FIRTransaction *)setData:(NSDictionary<NSString *, id> *)data forDocument:(FIRDocumentReference *)document - FIR_SWIFT_NAME(setData(_:forDocument:)); + NS_SWIFT_NAME(setData(_:forDocument:)); // clang-format on /** @@ -64,7 +62,7 @@ FIR_SWIFT_NAME(Transaction) - (FIRTransaction *)setData:(NSDictionary<NSString *, id> *)data forDocument:(FIRDocumentReference *)document options:(FIRSetOptions *)options - FIR_SWIFT_NAME(setData(_:forDocument:options:)); + NS_SWIFT_NAME(setData(_:forDocument:options:)); // clang-format on /** @@ -79,7 +77,7 @@ FIR_SWIFT_NAME(Transaction) // clang-format off - (FIRTransaction *)updateData:(NSDictionary<id, id> *)fields forDocument:(FIRDocumentReference *)document - FIR_SWIFT_NAME(updateData(_:forDocument:)); + NS_SWIFT_NAME(updateData(_:forDocument:)); // clang-format on /** @@ -89,7 +87,7 @@ FIR_SWIFT_NAME(Transaction) * @return This `FIRTransaction` instance. Used for chaining method calls. */ - (FIRTransaction *)deleteDocument:(FIRDocumentReference *)document - FIR_SWIFT_NAME(deleteDocument(_:)); + NS_SWIFT_NAME(deleteDocument(_:)); /** * Reads the document referenced by `document`. @@ -99,7 +97,7 @@ FIR_SWIFT_NAME(Transaction) */ - (FIRDocumentSnapshot *_Nullable)getDocument:(FIRDocumentReference *)document error:(NSError *__autoreleasing *)error - FIR_SWIFT_NAME(getDocument(_:)); + NS_SWIFT_NAME(getDocument(_:)); @end |