chore: Merge branch 'main' into nc/quickstarts (#15477)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andrew Heard <[email protected]>
Co-authored-by: Paul Beusterien <[email protected]>
Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: Daniel La Rocque <[email protected]>
Co-authored-by: Peter Friese <[email protected]>
Co-authored-by: themiswang <[email protected]>
Co-authored-by: pcfba <[email protected]>
Co-authored-by: Daymon <[email protected]>
Co-authored-by: Jesús Rojas <[email protected]>
Co-authored-by: cherylEnkidu <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Anka <runner@sjc20-cw711-f080df3d-ebf6-4709-98e9-85b8a97486da-6EB573FF6658.local>
Co-authored-by: htcgh <[email protected]>
Co-authored-by: Tatsuyuki Kobayashi <[email protected]>
Co-authored-by: Tushar Khandelwal <[email protected]>
Co-authored-by: Seyed Mojtaba Hosseini Zeidabadi <[email protected]>

Author: 19 people

.github/actions/notices_generation/Gemfile.lock

@@ -98,7 +98,7 @@ GEM
       sawyer (~> 0.8.0, >= 0.5.3)
     plist (3.6.0)
     public_suffix (4.0.6)
-    rexml (3.4.1)
+    rexml (3.4.2)
     ruby-macho (2.5.1)
     ruby2_keywords (0.0.2)
     sawyer (0.8.2)

.github/workflows/auth.yml

@@ -29,69 +29,69 @@ concurrency:
     cancel-in-progress: true
 
 jobs:
-  # spm:
-  #   uses: ./.github/workflows/common.yml
-  #   with:
-  #     target: AuthUnit
-  #     buildonly_platforms: macOS
+  spm:
+    uses: ./.github/workflows/common.yml
+    with:
+      target: AuthUnit
+      buildonly_platforms: macOS
 
-  # catalyst:
-  #   uses: ./.github/workflows/common_catalyst.yml
-  #   with:
-  #     product: FirebaseAuth
-  #     target: FirebaseAuth-Unit-unit
-  #     buildonly: true
+  catalyst:
+    uses: ./.github/workflows/common_catalyst.yml
+    with:
+      product: FirebaseAuth
+      target: FirebaseAuth-Unit-unit
+      buildonly: true
 
-  # pod_lib_lint:
-  #   strategy:
-  #     matrix:
-  #       product: [FirebaseAuthInterop, FirebaseAuth]
-  #   uses: ./.github/workflows/common_cocoapods.yml
-  #   with:
-  #     product: ${{  matrix.product }}
-  #     buildonly_platforms: macOS
+  pod_lib_lint:
+    strategy:
+      matrix:
+        product: [FirebaseAuthInterop, FirebaseAuth]
+    uses: ./.github/workflows/common_cocoapods.yml
+    with:
+      product: ${{  matrix.product }}
+      buildonly_platforms: macOS
 
-  # integration-tests:
-  #   # Don't run on private repo unless it is a PR.
-  #   if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
-  #   needs: spm
-  #   strategy:
-  #     matrix:
-  #       scheme: [ObjCApiTests, SwiftApiTests, AuthenticationExampleUITests]
-  #   env:
-  #     plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
-  #     FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1
-  #   runs-on: macos-15
-  #   steps:
-  #   - uses: actions/checkout@v4
-  #   - uses: actions/cache/restore@v4
-  #     with:
-  #       path: .build
-  #       key: ${{ needs.spm.outputs.cache_key }}
-  #   - name: Install Secrets
-  #     run: |
-  #       scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthCredentials.h.gpg \
-  #         FirebaseAuth/Tests/SampleSwift/ObjCApiTests/AuthCredentials.h "$plist_secret"
-  #       scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthSample/SwiftApplication.plist.gpg \
-  #         FirebaseAuth/Tests/SampleSwift/AuthenticationExample/SwiftApplication.plist "$plist_secret"
-  #       scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthSample/AuthCredentials.h.gpg \
-  #         FirebaseAuth/Tests/SampleSwift/AuthCredentials.h "$plist_secret"
-  #       scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthSample/GoogleService-Info.plist.gpg \
-  #         FirebaseAuth/Tests/SampleSwift/GoogleService-Info.plist "$plist_secret"
-  #       scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthSample/GoogleService-Info_multi.plist.gpg \
-  #         FirebaseAuth/Tests/SampleSwift/GoogleService-Info_multi.plist "$plist_secret"
-  #       scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthSample/Sample.entitlements.gpg \
-  #         FirebaseAuth/Tests/SampleSwift/Sample.entitlements "$plist_secret"
-  #       scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthSample/Credentials.swift.gpg \
-  #         FirebaseAuth/Tests/SampleSwift/SwiftApiTests/Credentials.swift "$plist_secret"
-  #   - name: Xcode
-  #     run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
-  #   - uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3
-  #     with:
-  #       timeout_minutes: 15
-  #       max_attempts: 3
-  #       retry_wait_seconds: 120
-  #       command: ([ -z $plist_secret ] || scripts/build.sh Auth iOS ${{ matrix.scheme }})
+  integration-tests:
+    # Don't run on private repo unless it is a PR.
+    if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
+    needs: spm
+    strategy:
+      matrix:
+        scheme: [ObjCApiTests, SwiftApiTests, AuthenticationExampleUITests]
+    env:
+      plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
+      FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1
+    runs-on: macos-15
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/cache/restore@v4
+      with:
+        path: .build
+        key: ${{ needs.spm.outputs.cache_key }}
+    - name: Install Secrets
+      run: |
+        scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthCredentials.h.gpg \
+          FirebaseAuth/Tests/SampleSwift/ObjCApiTests/AuthCredentials.h "$plist_secret"
+        scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthSample/SwiftApplication.plist.gpg \
+          FirebaseAuth/Tests/SampleSwift/AuthenticationExample/SwiftApplication.plist "$plist_secret"
+        scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthSample/AuthCredentials.h.gpg \
+          FirebaseAuth/Tests/SampleSwift/AuthCredentials.h "$plist_secret"
+        scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthSample/GoogleService-Info.plist.gpg \
+          FirebaseAuth/Tests/SampleSwift/GoogleService-Info.plist "$plist_secret"
+        scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthSample/GoogleService-Info_multi.plist.gpg \
+          FirebaseAuth/Tests/SampleSwift/GoogleService-Info_multi.plist "$plist_secret"
+        scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthSample/Sample.entitlements.gpg \
+          FirebaseAuth/Tests/SampleSwift/Sample.entitlements "$plist_secret"
+        scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthSample/Credentials.swift.gpg \
+          FirebaseAuth/Tests/SampleSwift/SwiftApiTests/Credentials.swift "$plist_secret"
+    - name: Xcode
+      run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
+    - uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3
+      with:
+        timeout_minutes: 15
+        max_attempts: 3
+        retry_wait_seconds: 120
+        command: ([ -z $plist_secret ] || scripts/build.sh Auth iOS ${{ matrix.scheme }})
 
   quickstart:
     uses: ./.github/workflows/common_quickstart.yml
@@ -132,13 +132,14 @@ jobs:
   #       testapp_dir: quickstart-ios/build-for-testing
   #       test_type: "xctest"
 
-  # auth-cron-only:
-  #   needs: pod_lib_lint
-  #   uses: ./.github/workflows/common_cocoapods_cron.yml
-  #   with:
-  #     product: FirebaseAuth
-  #     platforms: '[ "ios", "tvos --skip-tests", "macos --skip-tests", "watchos --skip-tests" ]'
-  #     flags: '[ "--use-static-frameworks" ]'
-  #     setup_command: scripts/configure_test_keychain.sh
-  #   secrets:
-  #     plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
+  auth-cron-only:
+    needs: pod_lib_lint
+    uses: ./.github/workflows/common_cocoapods_cron.yml
+    with:
+      product: FirebaseAuth
+      platforms: '[ "ios", "tvos --skip-tests", "macos --skip-tests", "watchos --skip-tests" ]'
+      flags: '[ "--use-static-frameworks" ]'
+      setup_command: scripts/configure_test_keychain.sh
+      ignore_deprecation_warnings: true
+    secrets:
+      plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}

.github/workflows/common_cocoapods.yml

@@ -75,6 +75,12 @@ on:
         required: false
         default: true
 
+      # Whether to lint with `--verbose`. Defaults to false.
+      verbose:
+        type: boolean
+        required: false
+        default: false
+
       # Whether to additionally build with Swift 6. Defaults to false.
       supports_swift6:
         type: boolean
@@ -151,6 +157,7 @@ jobs:
         command: |
           scripts/pod_lib_lint.rb ${{ inputs.product }}.podspec --platforms=${{ matrix.platform }} \
             ${{ inputs.allow_warnings == true && '--allow-warnings' || '' }} \
+            ${{ inputs.verbose == true && '--verbose' || '' }} \
             ${{ inputs.analyze == false && '--no-analyze' || '' }} \
             ${{ inputs.test_specs != '' && format('--test-specs={0}', inputs.test_specs) || '' }} \
             ${{ (contains(inputs.buildonly_platforms, matrix.platform) || contains(inputs.buildonly_platforms, 'all')) && '--skip-tests' || '' }}

.github/workflows/common_cocoapods_cron.yml

@@ -46,8 +46,11 @@ on:
         required: false
         default: "macos-15"
 
-env:
-  FIREBASE_CI: true
+      # Whether to ignore deprecation warnings by setting FIREBASE_CI.
+      ignore_deprecation_warnings:
+        type: boolean
+        required: false
+        default: false
 
 jobs:
   cron-job:
@@ -67,6 +70,9 @@ jobs:
       run: scripts/setup_bundler.sh
     - name: Xcode
       run: sudo xcode-select -s /Applications/${{ inputs.xcode }}.app/Contents/Developer
+    - name: Set FIREBASE_CI, if needed.
+      if: inputs.ignore_deprecation_warnings == true
+      run: echo "FIREBASE_CI=true" >> $GITHUB_ENV
     - name: Run setup command, if needed.
       if: inputs.setup_command != ''
       env:

.github/workflows/crashlytics.yml

@@ -18,8 +18,8 @@ on:
     - 'Interop/Analytics/Public/*.h'
     - 'Gemfile*'
   schedule:
-    # Run every day at 7pm (PDT) / 10pm (EDT) - cron uses UTC times
-    - cron:  '0 2 * * *'
+    # Run every day at 11pm (PDT) / 2am (EDT) - cron uses UTC times
+    - cron:  '0 6 * * *'
 
 concurrency:
     group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}

.github/workflows/firebaseai.yml

@@ -27,9 +27,12 @@ permissions:
 
 jobs:
   spm:
+    strategy:
+      matrix:
+        target: [FirebaseAILogicUnit, FirebaseAIUnit]
     uses: ./.github/workflows/common.yml
     with:
-      target: FirebaseAIUnit
+      target: ${{  matrix.target }}
       setup_command: scripts/update_vertexai_responses.sh
 
   testapp-integration:
@@ -56,13 +59,13 @@ jobs:
         path: .build
         key: ${{ needs.spm.outputs.cache_key }}
     - name: Install Secret GoogleService-Info.plist
-      run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/VertexAI/TestApp-GoogleService-Info.plist.gpg \
+      run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/FirebaseAI/TestApp-GoogleService-Info.plist.gpg \
         FirebaseAI/Tests/TestApp/Resources/GoogleService-Info.plist "$secrets_passphrase"
     - name: Install Secret GoogleService-Info-Spark.plist
-      run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/VertexAI/TestApp-GoogleService-Info-Spark.plist.gpg \
+      run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/FirebaseAI/TestApp-GoogleService-Info-Spark.plist.gpg \
         FirebaseAI/Tests/TestApp/Resources/GoogleService-Info-Spark.plist "$secrets_passphrase"
     - name: Install Secret Credentials.swift
-      run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/VertexAI/TestApp-Credentials.swift.gpg \
+      run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/FirebaseAI/TestApp-Credentials.swift.gpg \
         FirebaseAI/Tests/TestApp/Tests/Integration/Credentials.swift "$secrets_passphrase"
     - name: Xcode
       run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
@@ -77,9 +80,12 @@ jobs:
         retention-days: 2
 
   pod_lib_lint:
+    strategy:
+      matrix:
+        product: [FirebaseAILogic, FirebaseAI]
     uses: ./.github/workflows/common_cocoapods.yml
     with:
-      product: FirebaseAI
+      product: ${{  matrix.product }}
       supports_swift6: true
       setup_command: scripts/update_vertexai_responses.sh
 

.github/workflows/spm.yml

@@ -85,6 +85,12 @@ jobs:
         max_attempts: 3
         retry_wait_seconds: 120
         command: scripts/build.sh Firebase-Package iOS ${{ matrix.test }}
+    - uses: actions/upload-artifact@v4
+      if: ${{ failure() }}
+      with:
+        name: spm-build-run-${{ matrix.os }}-${{ matrix.xcode }}-logs
+        path: xcodebuild-*.log
+        if-no-files-found: error
 
   # Test iOS Device build since some Firestore dependencies build different files.
   iOS-Device:
@@ -113,6 +119,12 @@ jobs:
       run: scripts/setup_spm_tests.sh
     - name: iOS Device and Test Build
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh Firebase-Package iOS-device spmbuildonly
+    - uses: actions/upload-artifact@v4
+      if: ${{ failure() }}
+      with:
+        name: spm-ios-device-${{ matrix.os }}-${{ matrix.xcode }}-logs
+        path: xcodebuild-*.log
+        if-no-files-found: error
 
   platforms:
     # Don't run on private repo unless it is a PR.
@@ -148,3 +160,10 @@ jobs:
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh version-test ${{ matrix.target }} spm
     - name: Analytics Build Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh analytics-import-test ${{ matrix.target }} spm
+    - uses: actions/upload-artifact@v4
+      if: ${{ failure() }}
+      with:
+        name: spm-platforms-${{ matrix.target }}-${{ matrix.os }}-${{ matrix.xcode }}-logs
+        path: xcodebuild-*.log
+        if-no-files-found: error
+

.github/workflows/zip.yml

@@ -457,6 +457,57 @@ jobs:
           quickstart-ios/
           !quickstart-ios/**/GoogleService-Info.plist
 
+  quickstart_framework_firebaseai:
+    needs: package-head
+    if: ${{ !cancelled() && (success() || github.event.inputs.zip_run_id != '') }}
+    env:
+      plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
+      SDK: "FirebaseAI"
+      # This is a workaround to use the FirebaseAIExampleZip scheme that does not have the SPM dependency.
+      SWIFT_SUFFIX: "Zip"
+    strategy:
+      matrix:
+        artifact: [Firebase-actions-dir, Firebase-actions-dir-dynamic]
+        build-env:
+          - os: macos-15
+            xcode: Xcode_16.4
+    runs-on: ${{ matrix.build-env.os }}
+    steps:
+    - uses: actions/checkout@v4
+    - name: Get framework dir
+      uses: actions/[email protected]
+      with:
+        name: ${{ matrix.artifact }}
+        run-id: ${{ github.event.inputs.zip_run_id || github.run_id }}
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+    - uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
+    - name: Xcode
+      run: sudo xcode-select -s /Applications/${{ matrix.build-env.xcode }}.app/Contents/Developer
+    - name: Setup Bundler
+      run: ./scripts/setup_bundler.sh
+    - name: Move frameworks
+      run: |
+        mkdir -p "${HOME}"/ios_frameworks/
+        find "${GITHUB_WORKSPACE}" -name "Firebase*latest.zip" -exec unzip -d "${HOME}"/ios_frameworks/ {} +
+    - uses: actions/checkout@v4
+    - name: Setup quickstart
+      run: SAMPLE="$SDK" TARGET="${SDK}ExampleZip" scripts/setup_quickstart_framework.sh \
+                                               "${HOME}"/ios_frameworks/Firebase/FirebaseAILogic/* \
+                                               "${HOME}"/ios_frameworks/Firebase/FirebaseAnalytics/*
+    - name: Install Secret GoogleService-Info.plist
+      run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/FirebaseAI/TestApp-GoogleService-Info.plist.gpg \
+        quickstart-ios/firebaseai/GoogleService-Info.plist "$plist_secret"
+    - name: Test Quickstart
+      run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart_framework.sh "${SDK}")
+    - name: Remove data before upload
+      if: ${{ failure() }}
+      run: scripts/remove_data.sh firebaseai
+    - uses: actions/upload-artifact@v4
+      if: ${{ failure() }}
+      with:
+        name: quickstart_artifacts_firebaseai
+        path: quickstart-ios/
+
   quickstart_framework_firestore:
     needs: packaging_done
     if: ${{ !cancelled() }}
@@ -594,6 +645,12 @@ jobs:
       run: SAMPLE="$SDK" TARGET="${SDK}Example" scripts/setup_quickstart_framework.sh \
                                                "${HOME}"/ios_frameworks/Firebase/FirebaseMessaging/* \
                                                "${HOME}"/ios_frameworks/Firebase/FirebaseAnalytics/*
+    # - name: Setup swift quickstart
+    #   run: SAMPLE="$SDK" TARGET="${SDK}ExampleSwift" scripts/setup_quickstart_framework.sh
+    # - name: Add frameworks to Crashlytics watchOS target
+    #   run: |
+    #     cd quickstart-ios/messaging
+    #     "${GITHUB_WORKSPACE}"/quickstart-ios/scripts/add_framework_script.rb --sdk Messaging --target NotificationServiceExtension --framework_path Firebase/
     - name: Install Secret GoogleService-Info.plist
       run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-messaging.plist.gpg \
         quickstart-ios/messaging/GoogleService-Info.plist "$plist_secret"

Carthage.md

@@ -31,7 +31,7 @@ Firebase components that you want to include in your app. Note that
 
 ```
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseABTestingBinary.json"
-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAIBinary.json"
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAILogicBinary.json"
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAdMobBinary.json"
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json"
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAppCheckBinary.json"

CoreOnly/NOTICES

@@ -2,6 +2,7 @@ AppCheckCore
 Firebase
 FirebaseABTesting
 FirebaseAI
+FirebaseAILogic
 FirebaseAppCheck
 FirebaseAppCheckInterop
 FirebaseAppDistribution