Merge branch 'main' into nc/followup-async

Author: ncooke3

.github/workflows/firestore.yml

@@ -30,16 +30,22 @@ jobs:
     # Only when this is not a scheduled run
     if: github.event_name != 'schedule'
     outputs:
-      changed: ${{ steps.changes.outputs.changed }}
+      changed: ${{ steps.firestore_src_changes.outputs.sources || steps.related_changes.outputs.other_changes }}
     steps:
       - uses: dorny/paths-filter@v2
-        id: changes
+        id: firestore_src_changes
         with:
+          predicate-quantifier: 'every'
           filters: |
-            changed:
+            sources:
               # Firestore sources
               - 'Firestore/**'
-
+              - '!**/*.md'
+      - uses: dorny/paths-filter@v2
+        id: related_changes
+        with:
+          filters: |
+            other_changes:
               # Interop headers
               - 'FirebaseAuth/Interop/*.h'
 

.github/workflows/inappmessaging.yml

@@ -45,13 +45,13 @@ jobs:
     if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
 
 # TODO(#12770): Update to macos-14 when tests are updated for Xcode 15.
-    runs-on: macos-12
+    runs-on: macos-13
     strategy:
       matrix:
 # TODO(#8682): Reenable iPad after fixing Xcode 13 test failures.
 #        platform: [iOS, iPad]
         platform: [iOS]
-
+        xcode: [Xcode_14.2]
     steps:
     - uses: actions/checkout@v4
     - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -60,6 +60,8 @@ jobs:
     - uses: ruby/setup-ruby@v1
     - name: Setup Bundler
       run: scripts/setup_bundler.sh
+    - name: Xcode
+      run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
     - name: Prereqs
       run: scripts/install_prereqs.sh InAppMessaging ${{ matrix.platform }} xcodebuild
     - name: Build and test

FirebaseAuth/CHANGELOG.md

@@ -1,7 +1,17 @@
-# Unreleased
+# 11.6.0
+- [added] Added reCAPTCHA Enterprise support for app verification during phone
+  authentication for Firebase Authentication (#14114)
 - [fixed] Restore Firebase 10 behavior by synchronizing access to the
   `Auth.currentUser` API. This resolves some Firebase 11 issues where the
   current user is unexpectedly `nil` at startup.
+- [fixed] Restore Firebase 10 decoding behavior to prevent user provider data
+  from always being decoded as `nil` . Note that this fix was only needed for
+  cases where Firebase 11 was reading data written by Firebase 10. (#14011)
+- [fixed] Restore Firebase 10 decoding behavior to prevent user provider data
+  from being decoded as `nil` when a user has multiple linked providers. Note
+  that this fix was only needed for cases where Firebase 11 was reading data
+  written by Firebase 10. Note that this fix will not be in the 11.6.0 zip and
+  Carthage distributions, but will be included from 11.6.0 onwards. (#14011)
 
 # 11.5.0
 - [fixed] Restore pre-Firebase 11 decoding behavior to prevent users getting

FirebaseAuth/Sources/Swift/Auth/Auth.swift

@@ -2309,7 +2309,7 @@ extension Auth: AuthInterop {
                                             action: AuthRecaptchaAction) async throws -> T
       .Response {
       let recaptchaVerifier = AuthRecaptchaVerifier.shared(auth: self)
-      if recaptchaVerifier.enablementStatus(forProvider: AuthRecaptchaProvider.password) {
+      if recaptchaVerifier.enablementStatus(forProvider: AuthRecaptchaProvider.password) != .off {
         try await recaptchaVerifier.injectRecaptchaFields(request: request,
                                                           provider: AuthRecaptchaProvider.password,
                                                           action: action)