Paul Beusterien 1 year ago
parent
commit
79866caa23
38 changed files with 53 additions and 53 deletions
  1. 1 1
      Crashlytics/Crashlytics/FIRCLSUserDefaults/FIRCLSUserDefaults_private.h
  2. 1 1
      FirebaseAnalytics/Tests/ObjCAPI/ObjCAPITests.m
  3. 1 1
      FirebaseAuth/CHANGELOG.md
  4. 1 1
      FirebaseAuth/Sources/Public/FirebaseAuth/FIRAuthErrors.h
  5. 1 1
      FirebaseAuth/Sources/Swift/ActionCode/ActionCodeInfo.swift
  6. 4 4
      FirebaseAuth/Sources/Swift/Auth/Auth.swift
  7. 1 1
      FirebaseAuth/Sources/Swift/Backend/RPC/DeleteAccountRequest.swift
  8. 1 1
      FirebaseAuth/Sources/Swift/Backend/RPC/GetAccountInfoRequest.swift
  9. 2 2
      FirebaseAuth/Sources/Swift/Backend/RPC/GetOOBConfirmationCodeRequest.swift
  10. 1 1
      FirebaseAuth/Sources/Swift/Backend/RPC/GetRecaptchaConfigRequest.swift
  11. 1 1
      FirebaseAuth/Sources/Swift/Backend/RPC/SetAccountInfoRequest.swift
  12. 1 1
      FirebaseAuth/Sources/Swift/Backend/RPC/VerifyAssertionRequest.swift
  13. 2 2
      FirebaseAuth/Sources/Swift/Backend/RPC/VerifyAssertionResponse.swift
  14. 1 1
      FirebaseAuth/Sources/Swift/Backend/VerifyClientRequest.swift
  15. 1 1
      FirebaseAuth/Sources/Swift/SystemService/SecureTokenService.swift
  16. 1 1
      FirebaseAuth/Sources/Swift/User/AdditionalUserInfo.swift
  17. 1 1
      FirebaseAuth/Sources/Swift/User/User.swift
  18. 1 1
      FirebaseAuth/Sources/Swift/Utilities/AuthErrors.swift
  19. 1 1
      FirebaseAuth/Tests/SampleSwift/README.md
  20. 2 2
      FirebaseAuth/Tests/Unit/AuthBackendRPCImplentationTests.swift
  21. 1 1
      FirebaseAuth/Tests/Unit/AuthProviderIDTests.swift
  22. 3 3
      FirebaseAuth/Tests/Unit/AuthTests.swift
  23. 1 1
      FirebaseAuth/Tests/Unit/GetAccountInfoTests.swift
  24. 1 1
      FirebaseAuth/Tests/Unit/ObjCAPITests.m
  25. 1 1
      FirebaseAuth/Tests/Unit/PhoneAuthProviderTests.swift
  26. 1 1
      FirebaseAuth/Tests/Unit/SwiftGlobalTests.swift
  27. 1 1
      FirebaseAuth/Tests/Unit/VerifyAssertionTests.swift
  28. 1 1
      FirebaseCore/Internal/Sources/HeartbeatLogging/HeartbeatStorage.swift
  29. 1 1
      FirebaseDynamicLinks/CHANGELOG.md
  30. 1 1
      FirebaseDynamicLinks/Sources/Logging/FDLLogging.h
  31. 4 4
      FirebaseDynamicLinks/Sources/Logging/FDLLogging.m
  32. 1 1
      FirebaseInAppMessaging/Sources/Data/FIRIAMFetchResponseParser.m
  33. 3 3
      FirebaseInAppMessaging/Swift/Tests/Unit/FirebaseInAppMessaging_APIBuildTests.swift
  34. 1 1
      FirebaseInstallations/Source/Tests/Unit/FIRInstallationsAPIServiceTests.m
  35. 1 1
      FirebaseMessaging/Tests/UnitTests/FIRMessagingTokenOperationsTest.m
  36. 1 1
      Firestore/core/src/remote/watch_stream.h
  37. 1 1
      docs/AddNewPod.md
  38. 3 3
      docs/AddNewProduct.md

+ 1 - 1
Crashlytics/Crashlytics/FIRCLSUserDefaults/FIRCLSUserDefaults_private.h

@@ -19,5 +19,5 @@
 - (BOOL)synchronizeWroteToDisk;
 - (NSDictionary *)loadDefaults;
 - (NSURL *)generateDirectoryURLForBaseURL:(NSURL *)directoryBaseURL
-                  hostAppBundleIdentifier:(NSString *)hostAppBundleIdentifer;
+                  hostAppBundleIdentifier:(NSString *)hostAppBundleIdentifier;
 @end

+ 1 - 1
FirebaseAnalytics/Tests/ObjCAPI/ObjCAPITests.m

@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 
-// MARK: This file is used to test the coverage of using Analytics APIs from Objective C.
+// MARK: This file is used to test the coverage of using Analytics APIs from Objective-C.
 
 @import Foundation;
 @import XCTest;

+ 1 - 1
FirebaseAuth/CHANGELOG.md

@@ -385,7 +385,7 @@
 # 3.0.3
 - [added] Adds documentation for all possible errors returned by each method.
 - [fixed] Improves error handling and messages for a variety of error conditions.
-- [fixed] Whether or not an user is considered anonymous is now consistent with other
+- [fixed] Whether or not a user is considered anonymous is now consistent with other
   platforms.
 - [changed] A saved signed in user is now siloed between different Firebase projects
   within the same app.

+ 1 - 1
FirebaseAuth/Sources/Public/FirebaseAuth/FIRAuthErrors.h

@@ -33,7 +33,7 @@ extern NSString *const FIRAuthErrorUserInfoNameKey NS_SWIFT_NAME(AuthErrorUserIn
           - `AuthErrorCodeAccountExistsWithDifferentCredential`
           - `AuthErrorCodeCredentialAlreadyInUse`
           - `AuthErrorCodeEmailAlreadyInUse`
-        may contain an `NSError.userInfo` dictinary object which contains this key. The value
+        may contain an `NSError.userInfo` dictionary object which contains this key. The value
         associated with this key is an NSString of the email address of the account that already
         exists.
  */

+ 1 - 1
FirebaseAuth/Sources/Swift/ActionCode/ActionCodeInfo.swift

@@ -38,7 +38,7 @@ import Foundation
   }
 
   /// Map a request type string to the corresponding operation type.
-  /// - Parameter requestType: Request type returned in in the server response.
+  /// - Parameter requestType: Request type returned in the server response.
   /// - Returns: The corresponding ActionCodeOperation for the supplied request type.
   class func actionCodeOperation(forRequestType requestType: String?) -> ActionCodeOperation {
     switch requestType {

+ 4 - 4
FirebaseAuth/Sources/Swift/Auth/Auth.swift

@@ -201,7 +201,7 @@ extension Auth: AuthInterop {
   /// Contains shareAuthStateAcrossDevices setting related to the auth object.
   ///
   /// If userAccessGroup is not set, setting shareAuthStateAcrossDevices will
-  /// have no effect. You should set shareAuthStateAcrossDevices to it's desired
+  /// have no effect. You should set shareAuthStateAcrossDevices to its desired
   /// state and then set the userAccessGroup after.
   @objc open var shareAuthStateAcrossDevices: Bool = false
 
@@ -1329,7 +1329,7 @@ extension Auth: AuthInterop {
   /// * A user with a different UID from the current user has signed in, or
   /// * The current user has signed out.
   ///
-  ///  The block is invoked immediately after adding it according to it's standard invocation
+  /// The block is invoked immediately after adding it according to its standard invocation
   /// semantics, asynchronously on the main thread. Users should pay special attention to
   /// making sure the block does not inadvertently retain objects which should not be retained by
   /// the long-lived block. The block itself will be retained by `Auth` until it is
@@ -1370,7 +1370,7 @@ extension Auth: AuthInterop {
   /// * The ID token of the current user has been refreshed, or
   /// * The current user has signed out.
   ///
-  /// The block is invoked immediately after adding it according to it's standard invocation
+  /// The block is invoked immediately after adding it according to its standard invocation
   /// semantics, asynchronously on the main thread. Users should pay special attention to
   /// making sure the block does not inadvertently retain objects which should not be retained by
   /// the long-lived block. The block itself will be retained by `Auth` until it is
@@ -1838,7 +1838,7 @@ extension Auth: AuthInterop {
 
   // MARK: Private methods
 
-  /// Posts the auth state change notificaton if current user's token has been changed.
+  /// Posts the auth state change notification if current user's token has been changed.
   private func possiblyPostAuthStateChangeNotification() {
     let token = currentUser?.rawAccessToken()
     if lastNotifiedUserToken == token ||

+ 1 - 1
FirebaseAuth/Sources/Swift/Backend/RPC/DeleteAccountRequest.swift

@@ -19,7 +19,7 @@ import Foundation
 private let kDeleteAccountEndpoint = "deleteAccount"
 
 /// The key for the "idToken" value in the request. This is actually the STS Access Token,
-///    despite its confusing (backwards compatiable) parameter name.
+///    despite its confusing (backwards compatible) parameter name.
 private let kIDTokenKey = "idToken"
 
 /// The key for the "localID" value in the request.

+ 1 - 1
FirebaseAuth/Sources/Swift/Backend/RPC/GetAccountInfoRequest.swift

@@ -18,7 +18,7 @@ import Foundation
 private let kGetAccountInfoEndpoint = "getAccountInfo"
 
 /// The key for the "idToken" value in the request. This is actually the STS Access Token,
-///    despite its confusing (backwards compatiable) parameter name.
+/// despite its confusing (backwards compatible) parameter name.
 private let kIDTokenKey = "idToken"
 
 /// Represents the parameters for the getAccountInfo endpoint.

+ 2 - 2
FirebaseAuth/Sources/Swift/Backend/RPC/GetOOBConfirmationCodeRequest.swift

@@ -24,7 +24,7 @@ enum GetOOBConfirmationCodeRequestType: Int {
   /// Requests an email sign-in link.
   case emailLink
 
-  /// Requests an verify before update email.
+  /// Requests a verify before update email.
   case verifyBeforeUpdateEmail
 
   var value: String {
@@ -53,7 +53,7 @@ private let kEmailKey = "email"
 private let kNewEmailKey = "newEmail"
 
 /// The key for the "idToken" value in the request. This is actually the STS Access Token,
-///    despite its confusing (backwards compatiable) parameter name.
+/// despite its confusing (backwards compatible) parameter name.
 private let kIDTokenKey = "idToken"
 
 /// The key for the "continue URL" value in the request.

+ 1 - 1
FirebaseAuth/Sources/Swift/Backend/RPC/GetRecaptchaConfigRequest.swift

@@ -28,7 +28,7 @@ private let kEmailKey = "email"
 private let kNewEmailKey = "newEmail"
 
 /// The key for the "idToken" value in the request. This is actually the STS Access Token,
-///   despite its confusing (backwards compatiable) parameter name.
+/// despite its confusing (backwards compatible) parameter name.
 private let kIDTokenKey = "idToken"
 
 /// The "getRecaptchaConfig" endpoint.

+ 1 - 1
FirebaseAuth/Sources/Swift/Backend/RPC/SetAccountInfoRequest.swift

@@ -28,7 +28,7 @@ private let FIRSetAccountInfoUserAttributePassword = "PASSWORD"
 private let kSetAccountInfoEndpoint = "setAccountInfo"
 
 /// The key for the "idToken" value in the request. This is actually the STS Access Token,
-///    despite its confusing (backwards compatiable) parameter name.
+/// despite its confusing (backwards compatible) parameter name.
 private let kIDTokenKey = "idToken"
 
 /// The key for the "displayName" value in the request.

+ 1 - 1
FirebaseAuth/Sources/Swift/Backend/RPC/VerifyAssertionRequest.swift

@@ -48,7 +48,7 @@ private let kPendingTokenKey = "pendingToken"
 private let kAutoCreateKey = "autoCreate"
 
 /// The key for the "idToken" value in the request. This is actually the STS Access Token,
-///   despite its confusing (backwards compatiable) parameter name.
+/// despite its confusing (backwards compatible) parameter name.
 private let kIDTokenKey = "idToken"
 
 /// The key for the "returnSecureToken" value in the request.

+ 2 - 2
FirebaseAuth/Sources/Swift/Backend/RPC/VerifyAssertionResponse.swift

@@ -23,7 +23,7 @@ class VerifyAssertionResponse: AuthRPCResponse, AuthMFAResponse {
   var federatedID: String?
 
   /// The IdP ID. For white listed IdPs it's a short domain name e.g. google.com, aol.com,
-  /// live.net and yahoo.com.If the "providerId" param is set to OpenID OP identifer other than
+  /// live.net and yahoo.com.If the "providerId" param is set to OpenID OP identifier other than
   /// the white listed IdPs the OP identifier is returned.If the "identifier" param is federated
   /// ID in the createAuthUri request.The domain part of the federated ID is returned.
   var providerID: String?
@@ -123,7 +123,7 @@ class VerifyAssertionResponse: AuthRPCResponse, AuthMFAResponse {
   /// The access token for the OpenID OAuth extension.
   var oauthAccessToken: String?
 
-  /// The secret for the OpenID OAuth extention.
+  /// The secret for the OpenID OAuth extension.
   var oauthSecretToken: String?
 
   /// The pending ID Token string.

+ 1 - 1
FirebaseAuth/Sources/Swift/Backend/VerifyClientRequest.swift

@@ -21,7 +21,7 @@ class VerifyClientRequest: IdentityToolkitRequest, AuthRPCRequest {
   /// The endpoint for the verifyClient request.
   private static let verifyClientEndpoint = "verifyClient"
 
-  /// The key for the appToken request paramenter.
+  /// The key for the appToken request parameter.
   private static let appTokenKey = "appToken"
 
   /// The key for the isSandbox request parameter.

+ 1 - 1
FirebaseAuth/Sources/Swift/SystemService/SecureTokenService.swift

@@ -57,7 +57,7 @@ class SecureTokenService: NSObject, NSSecureCoding {
   /// Fetch a fresh ephemeral access token for the ID associated with this instance. The token
   ///   received in the callback should be considered short lived and not cached.
   ///
-  ///    Invoked asyncronously on the auth global work queue in the future.
+  ///    Invoked asynchronously on the auth global work queue in the future.
   /// - Parameter forceRefresh: Forces the token to be refreshed.
   /// - Parameter callback: Callback block that will be called to return either the token or an
   /// error.

+ 1 - 1
FirebaseAuth/Sources/Swift/User/AdditionalUserInfo.swift

@@ -28,7 +28,7 @@ extension AdditionalUserInfo: NSSecureCoding {}
   /// Indicates whether or not the current user was signed in for the first time.
   @objc public let isNewUser: Bool
 
-  // Maintain newUser for Objective C API.
+  // Maintain newUser for Objective-C API.
 
   /// Indicates whether or not the current user was signed in for the first time.
   @objc open func newUser() -> Bool {

+ 1 - 1
FirebaseAuth/Sources/Swift/User/User.swift

@@ -544,7 +544,7 @@ extension User: NSSecureCoding {}
     }
   }
 
-  /// API included for compatibilty with a mis-named Firebase 10 API.
+  /// API included for compatibility with a mis-named Firebase 10 API.
   /// Use `getIDToken(forcingRefresh forceRefresh: Bool = false)` instead.
   open func idTokenForcingRefresh(_ forceRefresh: Bool) async throws -> String {
     return try await getIDToken(forcingRefresh: forceRefresh)

+ 1 - 1
FirebaseAuth/Sources/Swift/Utilities/AuthErrors.swift

@@ -865,7 +865,7 @@ private let kErrorMissingAppToken =
 
 private let kErrorNotificationNotForwarded =
   "If app delegate swizzling is disabled, remote notifications received by UIApplicationDelegate need to" +
-  "be forwarded to FirebaseAuth's canHandleNotificaton method."
+  "be forwarded to FirebaseAuth's canHandleNotification method."
 
 private let kErrorAppNotVerified =
   "Firebase could not retrieve the silent push notification and therefore could not verify your app. Ensure that you configured your app correctly to receive push notifications."

+ 1 - 1
FirebaseAuth/Tests/SampleSwift/README.md

@@ -137,7 +137,7 @@ We have already included the **`FBSDKLoginKit`** cocoapod in the `Podfile`. This
 
 - Go to the [Facebook Developers Site](https://developers.facebook.com) and follow all
   instructions to set up a new iOS app. When asked for a bundle ID, use
-  `com.google.firebase.quickstart.AuthenticationExample`. This is the default bundle identifier for this quickstart. If you change it, be sure that the bundle identifer entered on the Facebook developer console matches that of the bundle identifier for the quickstart.
+  `com.google.firebase.quickstart.AuthenticationExample`. This is the default bundle identifier for this quickstart. If you change it, be sure that the bundle identifier entered on the Facebook developer console matches that of the bundle identifier for the quickstart.
 - Follow Facebook's [iOS getting started guide](https://developers.facebook.com/docs/ios/getting-started/). You can skip steps 1 and 3 since
   we've already set up the dependencies and initialization code in this sample.
 - Go to the [Firebase Console](https://console.firebase.google.com) and navigate to your project:

+ 2 - 2
FirebaseAuth/Tests/Unit/AuthBackendRPCImplentationTests.swift

@@ -460,7 +460,7 @@ class AuthBackendRPCImplementationTests: RPCBaseTests {
 
   /** @fn testClientErrorResponse
       @brief This test checks the behaviour of @c postWithRequest:response:callback: when the
-          response contains a client error specified by an error messsage sent from the backend.
+          response contains a client error specified by an error message sent from the backend.
    */
   func testClientErrorResponse() async throws {
     let responseError = NSError(domain: kFakeErrorDomain, code: kFakeErrorCode)
@@ -547,7 +547,7 @@ class AuthBackendRPCImplementationTests: RPCBaseTests {
 
       func log() {
         // This API should not be used by the below tests because the Auth
-        // SDK does not log heartbeats in it's networking context.
+        // SDK does not log heartbeats in its networking context.
         fatalError("FakeHeartbeatLogger log should not be used in tests.")
       }
 

+ 1 - 1
FirebaseAuth/Tests/Unit/AuthProviderIDTests.swift

@@ -18,7 +18,7 @@ import XCTest
 
 @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
 final class AuthProviderIDTests: XCTestCase {
-  // Verify that AuthProviderID enum values match the class values published for Objective C
+  // Verify that AuthProviderID enum values match the class values published for Objective-C
   // compatibility.
   func testAuthProviderIDEnumRawValue() {
     XCTAssertEqual(AuthProviderID.apple.rawValue, "apple.com")

+ 3 - 3
FirebaseAuth/Tests/Unit/AuthTests.swift

@@ -1023,7 +1023,7 @@ class AuthTests: RPCBaseTests {
 
   /** @fn testSignInWithCredentialSuccess
       @brief Tests the flow of a successful @c signInWithCredential:completion: call
-          with an Google Sign-In credential.
+          with a Google Sign-In credential.
       Note: also a superset of the former testSignInWithGoogleCredentialSuccess
    */
   func testSignInWithCredentialSuccess() throws {
@@ -1497,8 +1497,8 @@ class AuthTests: RPCBaseTests {
 
   /** @fn testCreateUserEmptyEmailFailure
       @brief Tests the flow of a failed @c createUserWithEmail:password:completion: call due to an
-          empty email adress. This error occurs on the client side, so there is no need to fake an RPC
-          response.
+          empty email address. This error occurs on the client side, so there is no need to fake an
+          RPC response.
    */
   func testCreateUserEmptyEmailFailure() throws {
     let expectation = self.expectation(description: #function)

+ 1 - 1
FirebaseAuth/Tests/Unit/GetAccountInfoTests.swift

@@ -26,7 +26,7 @@ class GetAccountInfoTests: RPCBaseTests {
 
   /** var kIDTokenKey
       brief The key for the "idToken" value in the request. This is actually the STS Access Token,
-          despite it's confusing (backwards compatiable) parameter name.
+          despite it's confusing (backwards compatible) parameter name.
    */
   let kIDTokenKey = "idToken"
 

+ 1 - 1
FirebaseAuth/Tests/Unit/ObjCAPITests.m

@@ -103,7 +103,7 @@
   [auth setCustomAuthDomain:s];
 #if TARGET_OS_IOS
   __unused NSData *d = [auth APNSToken];
-  // TODO: It seems like a no-op and a bug to have this API in Objective C
+  // TODO: It seems like a no-op and a bug to have this API in Objective-C
   // auth.APNSToken = [[NSData alloc] init];
 #endif
 }

+ 1 - 1
FirebaseAuth/Tests/Unit/PhoneAuthProviderTests.swift

@@ -210,7 +210,7 @@
       )
     }
 
-    // TODO: This test is skipped. What was formerly an Objective C exception is now a Swift fatal_error.
+    // TODO: This test is skipped. What was formerly an Objective-C exception is now a Swift fatal_error.
     // The test runs correctly, but it's not clear how to automate fatal_error testing. Switching to
     // Swift exceptions would break the API.
     /** @fn testVerifyPhoneNumberUIDelegateRaiseException

+ 1 - 1
FirebaseAuth/Tests/Unit/SwiftGlobalTests.swift

@@ -17,7 +17,7 @@ import XCTest
 
 import FirebaseAuth
 
-/// Tests globals defined in Objective C sources.  These globals are for backward compatibility and
+/// Tests globals defined in Objective-C sources.  These globals are for backward compatibility and
 /// should not be used in new code.
 class SwiftGlobalTests: XCTestCase {
   func GlobalSymbolBuildTest() {

+ 1 - 1
FirebaseAuth/Tests/Unit/VerifyAssertionTests.swift

@@ -79,7 +79,7 @@ class VerifyAssertionTests: RPCBaseTests {
   }
 
   /** @fn testVerifyAssertionRequestOptionalFields
-      @brief Tests the verify assertion request with all optinal fields set.
+      @brief Tests the verify assertion request with all optional fields set.
    */
   func testVerifyAssertionRequestOptionalFields() async throws {
     let request = makeVerifyAssertionRequest()

+ 1 - 1
FirebaseCore/Internal/Sources/HeartbeatLogging/HeartbeatStorage.swift

@@ -37,7 +37,7 @@ final class HeartbeatStorage: HeartbeatStorageProtocol {
 
   /// Designated initializer.
   /// - Parameters:
-  ///   - id: A string identifer.
+  ///   - id: A string identifier.
   ///   - storage: The underlying storage container where heartbeat data is stored.
   init(id: String,
        storage: Storage) {

+ 1 - 1
FirebaseDynamicLinks/CHANGELOG.md

@@ -177,7 +177,7 @@ Refer to the [README.md](https://github.com/firebase/firebase-ios-sdk/blob/main/
 
 # 1.3.1
 - [added] Adds FIRLogger support (not public-facing)
-- [fixed] Fixes IPv6 compatibilty issues
+- [fixed] Fixes IPv6 compatibility issues
 
 # 1.3.0
 - [changed] Removes the SFSafariViewController per Apple's Review Guidelines

+ 1 - 1
FirebaseDynamicLinks/Sources/Logging/FDLLogging.h

@@ -43,6 +43,6 @@ FOUNDATION_EXPORT NSString *const FDLMessageCodeIntegerFormat;
 
 /** Logs a message with FIRLogger. */
 FOUNDATION_EXPORT void FDLLog(FDLLogLevel logLevel,
-                              FDLLogIdentifier identifer,
+                              FDLLogIdentifier identifier,
                               NSString *message,
                               ...) NS_FORMAT_FUNCTION(3, 4);

+ 4 - 4
FirebaseDynamicLinks/Sources/Logging/FDLLogging.m

@@ -33,18 +33,18 @@ NSString *const FDLMessageCodeIntegerFormat = @"%06ld";
 NSString *const FDLMessageCodeIntegerFormat = @"%06d";
 #endif  // #if __LP64__
 
-NSString *FDLMessageCodeForLogIdentifier(FDLLogIdentifier identifer) {
+NSString *FDLMessageCodeForLogIdentifier(FDLLogIdentifier identifier) {
   static NSString *const kMessageCodePrefix = @"I-FDL";
-  NSString *intString = [NSString stringWithFormat:FDLMessageCodeIntegerFormat, identifer];
+  NSString *intString = [NSString stringWithFormat:FDLMessageCodeIntegerFormat, identifier];
   return [kMessageCodePrefix stringByAppendingString:intString];
 }
 #endif  // GIN_SCION_LOGGING
 
-void FDLLog(FDLLogLevel logLevel, FDLLogIdentifier identifer, NSString *message, ...) {
+void FDLLog(FDLLogLevel logLevel, FDLLogIdentifier identifier, NSString *message, ...) {
   va_list args_ptr;
   va_start(args_ptr, message);
 #ifdef GIN_SCION_LOGGING
-  NSString *messageCode = FDLMessageCodeForLogIdentifier(identifer);
+  NSString *messageCode = FDLMessageCodeForLogIdentifier(identifier);
 
   switch (logLevel) {
     case FDLLogLevelError:

+ 1 - 1
FirebaseInAppMessaging/Sources/Data/FIRIAMFetchResponseParser.m

@@ -149,7 +149,7 @@
     NSString *messageID = payloadNode[@"campaignId"];
     if (!messageID) {
       FIRLogWarning(kFIRLoggerInAppMessaging, @"I-IAM900010",
-                    @"messsage id is missing in message node %@", messageNode);
+                    @"message id is missing in message node %@", messageNode);
       return nil;
     }
 

+ 3 - 3
FirebaseInAppMessaging/Swift/Tests/Unit/FirebaseInAppMessaging_APIBuildTests.swift

@@ -66,8 +66,8 @@ final class FirebaseInAppMessaging_APIBuildTests: XCTestCase {
     let _: UIColor = button.buttonBackgroundColor
 
     _ = FirebaseInAppMessaging.InAppMessagingDisplayMessageType.RawValue()
-    let messsageType: FirebaseInAppMessaging.InAppMessagingDisplayMessageType! = nil
-    switch messsageType! {
+    let messageType: FirebaseInAppMessaging.InAppMessagingDisplayMessageType! = nil
+    switch messageType! {
     case .modal: break
     case .banner: break
     case .imageOnly: break
@@ -156,7 +156,7 @@ final class FirebaseInAppMessaging_APIBuildTests: XCTestCase {
       messageID: nonnullText,
       campaignName: nonnullText,
       renderAsTestMessage: true,
-      messageType: messsageType,
+      messageType: messageType,
       triggerType: triggerType
     )
     let _: FirebaseInAppMessaging.InAppMessagingCampaignInfo = displayMessage.campaignInfo

+ 1 - 1
FirebaseInstallations/Source/Tests/Unit/FIRInstallationsAPIServiceTests.m

@@ -61,7 +61,7 @@ typedef FBLPromise * (^FIRInstallationsAPIServiceTask)(void);
 
 - (void)log {
   // This API should not be used by the below tests because the Installations
-  // SDK does not log heartbeats in it's networking context.
+  // SDK does not log heartbeats in its networking context.
   [self doesNotRecognizeSelector:_cmd];
 }
 

+ 1 - 1
FirebaseMessaging/Tests/UnitTests/FIRMessagingTokenOperationsTest.m

@@ -94,7 +94,7 @@ static NSString *kRegistrationToken = @"token-12345";
 
 - (void)log {
   // This API should not be used by the below tests because the Messaging
-  // SDK does not log heartbeats in it's networking context.
+  // SDK does not log heartbeats in its networking context.
   [self doesNotRecognizeSelector:_cmd];
 }
 

+ 1 - 1
Firestore/core/src/remote/watch_stream.h

@@ -56,7 +56,7 @@ class WatchStreamCallback {
 
   /**
    * Called by the `WatchStream` with changes and the snapshot versions
-   * included in in the `WatchChange` responses sent back by the server.
+   * included in the `WatchChange` responses sent back by the server.
    */
   virtual void OnWatchStreamChange(
       const WatchChange& change,

+ 1 - 1
docs/AddNewPod.md

@@ -4,7 +4,7 @@
 
 **This document is deprecated in favor of [docs/AddNewProduct.md](AddNewProduct.md)**.
 
-This doc continues to provide additional context about legacy Objective C implementations.
+This doc continues to provide additional context about legacy Objective-C implementations.
 
 The Firebase build is driven by the contents of a podspec. It is helpful to
 use an existing podspec as a template when starting a new pod.

+ 3 - 3
docs/AddNewProduct.md

@@ -8,8 +8,8 @@ evolution, so you should also consult with the iCore team as you are ramping up.
 
 ## Swift
 
-While much of Firebase has been implemented in Objective C, any new products or major
-implementations should be implemented in Swift. If Objective C API support is required it should
+While much of Firebase has been implemented in Objective-C, any new products or major
+implementations should be implemented in Swift. If Objective-C API support is required it should
 be implemented via the Swift `@objc` attribute. Consult with iCore and product management about
 the requirement itself.
 
@@ -17,7 +17,7 @@ Apple and others provide many great guides for Swift programming. Googlers, see
 [go/swift-sdks-2022](http://go/swift-sdks-2022).
 
 Existing Firebase Swift implementations can be helpful. However, note that they are mostly
-Objective C ports and do not take advantage of Swift features like structs, default arguments, and
+Objective-C ports and do not take advantage of Swift features like structs, default arguments, and
 async/await as much as new implementations should.
 
 ### Swift APIs