aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Marek Gilbert <mcg@google.com>2017-08-02 09:35:12 -0700
committerGravatar Marek Gilbert <mcg@google.com>2017-08-02 09:52:48 -0700
commit8d55eb92a42217d4d3399d8cbb49e6e8a98d209f (patch)
treee65a149e0827ed1ddba3256fde25df1c5ae7f58c
parentdc30b673efde645bba551a576bdaacb04a2f4733 (diff)
Disable clang-format around multi-label NS_SWIFT_NAMES
Otherwise clang-format inserts a linebreak before the last colon which, in addition to being ugly, breaks the resulting swift interface.
-rw-r--r--Firebase/Core/Public/FIRApp.h2
-rw-r--r--Firebase/Core/Public/FIROptions.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/Firebase/Core/Public/FIRApp.h b/Firebase/Core/Public/FIRApp.h
index 712781f..dbec0ac 100644
--- a/Firebase/Core/Public/FIRApp.h
+++ b/Firebase/Core/Public/FIRApp.h
@@ -75,8 +75,10 @@ FIR_SWIFT_NAME(FirebaseApp)
Letters, Numbers and Underscore.
* @param options The Firebase application options used to configure the services.
*/
+// clang-format off
+ (void)configureWithName:(NSString *)name
options:(FIROptions *)options FIR_SWIFT_NAME(configure(name:options:));
+// clang-format on
/**
* Returns the default app, or nil if the default app does not exist.
diff --git a/Firebase/Core/Public/FIROptions.h b/Firebase/Core/Public/FIROptions.h
index e7facd8..e1d114a 100644
--- a/Firebase/Core/Public/FIROptions.h
+++ b/Firebase/Core/Public/FIROptions.h
@@ -124,9 +124,11 @@ FIR_SWIFT_NAME(FirebaseOptions)
* Initializes a customized instance of FIROptions with required fields. Use the mutable properties
* to modify fields for configuring specific services.
*/
+// clang-format off
- (instancetype)initWithGoogleAppID:(NSString *)googleAppID
GCMSenderID:(NSString *)GCMSenderID
FIR_SWIFT_NAME(init(googleAppID:gcmSenderID:));
+// clang-format on
@end