diff options
| author |  Paul Beusterien <paulbeusterien@google.com> | 2017-07-14 07:13:19 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-07-14 07:13:19 -0700 |
| commit | 3f53f1bb2793214f5e8837de1a60ba1bde959a94 (patch) | |
| tree | d9a581c8dded5c1352a44c34de2d3db11d0fad66 /Firebase | |
| parent | e731d90b5e1eca8b6726deea4057c3006b64b66d (diff) | |
Fix GoogleService-Info.plist casing in comments (#135)
* Fix GoogleService-Info.plist casing in comments
* fix macOS travis failure
Diffstat (limited to 'Firebase')
| -rw-r--r-- | Firebase/Auth/Source/FIRAuth.m | 2 | ||||
| -rw-r--r-- | Firebase/Auth/Source/FIRUser.m | 2 | ||||
| -rw-r--r-- | Firebase/Auth/Source/RPCs/FIRAuthBackend.m | 2 | ||||
| -rw-r--r-- | Firebase/Core/FIROptions.m | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/Firebase/Auth/Source/FIRAuth.m b/Firebase/Auth/Source/FIRAuth.m index 4494405..5e2e9a2 100644 --- a/Firebase/Auth/Source/FIRAuth.m +++ b/Firebase/Auth/Source/FIRAuth.m @@ -23,7 +23,6 @@ #import "FIROptions.h" #import "FIRLogger.h" #import "AuthProviders/EmailPassword/FIREmailPasswordAuthCredential.h" -#import "AuthProviders/Phone/FIRPhoneAuthCredential_Internal.h" #import "FIRAdditionalUserInfo_Internal.h" #import "FIRAuthCredential_Internal.h" #import "FIRAuthDataResult_Internal.h" @@ -62,6 +61,7 @@ #import "FIRAuthAPNSTokenManager.h" #import "FIRAuthAppCredentialManager.h" #import "FIRAuthAppDelegateProxy.h" +#import "AuthProviders/Phone/FIRPhoneAuthCredential_Internal.h" #import "FIRAuthNotificationManager.h" #endif diff --git a/Firebase/Auth/Source/FIRUser.m b/Firebase/Auth/Source/FIRUser.m index cd168cf..82c8bb8 100644 --- a/Firebase/Auth/Source/FIRUser.m +++ b/Firebase/Auth/Source/FIRUser.m @@ -20,7 +20,6 @@ #import "AuthProviders/EmailPassword/FIREmailPasswordAuthCredential.h" #import "FIREmailAuthProvider.h" -#import "AuthProviders/Phone/FIRPhoneAuthCredential_Internal.h" #import "FIRAdditionalUserInfo_Internal.h" #import "FIRAuth.h" #import "FIRAuthCredential_Internal.h" @@ -51,6 +50,7 @@ #if TARGET_OS_IOS #import "FIRPhoneAuthProvider.h" +#import "AuthProviders/Phone/FIRPhoneAuthCredential_Internal.h" #endif NS_ASSUME_NONNULL_BEGIN diff --git a/Firebase/Auth/Source/RPCs/FIRAuthBackend.m b/Firebase/Auth/Source/RPCs/FIRAuthBackend.m index 3e3765b..b2b5a34 100644 --- a/Firebase/Auth/Source/RPCs/FIRAuthBackend.m +++ b/Firebase/Auth/Source/RPCs/FIRAuthBackend.m @@ -18,7 +18,6 @@ #import "FIRAuthBackend.h" -#import "../AuthProviders/Phone/FIRPhoneAuthCredential_Internal.h" #import "FIRAuthErrorUtils.h" #import "FIRAuthGlobalWorkQueue.h" #import "FirebaseAuth.h" @@ -56,6 +55,7 @@ #import <GTMSessionFetcher/GTMSessionFetcherService.h> #if TARGET_OS_IOS +#import "../AuthProviders/Phone/FIRPhoneAuthCredential_Internal.h" #import "FIRPhoneAuthProvider.h" #endif diff --git a/Firebase/Core/FIROptions.m b/Firebase/Core/FIROptions.m index 488f379..3395767 100644 --- a/Firebase/Core/FIROptions.m +++ b/Firebase/Core/FIROptions.m @@ -62,8 +62,8 @@ NSString *const kFIRExceptionBadModification = @property(nonatomic, readwrite) NSMutableDictionary *optionsDictionary; /** - * Combination of analytics options from both the main plist and the GoogleService-info.plist. - * Values which are present in the main plist override values from the GoogleService-info.plist. + * Combination of analytics options from both the main plist and the GoogleService-Info.plist. + * Values which are present in the main plist override values from the GoogleService-Info.plist. */ @property(nonatomic, readonly) NSDictionary *analyticsOptionsDictionary; |