Merge remote-tracking branch 'origin/main' into UserDefinedEnumsInternal

Author: dconeybe

.github/ISSUE_TEMPLATE/bug.md

@@ -3,37 +3,35 @@ name: ⚠️ Report a Bug
 about: Think you found a bug in the SDK? Report it here.
 ---
 
-<!-- DO NOT DELETE 
+<!-- DO NOT DELETE
 validate_template=true
 template_path=.github/ISSUE_TEMPLATE/bug.md
 -->
 
 ### [READ] Step 1: Are you in the right place?
 
-Issues filed here should be about bugs in __the code in this repository__. 
-If you have a general question, need help debugging, or fall into some
-other category use one of these other channels:
+Issues filed here should be about bugs in **the code in this repository**. If you have a general
+question, need help debugging, or fall into some other category use one of these other channels:
 
-  * For general technical questions, post a question on [StackOverflow](http://stackoverflow.com/)
-    with the firebase tag.
-  * For general Firebase discussion, use the [firebase-talk](https://groups.google.com/forum/#!forum/firebase-talk)
-    google group.
-  * For help troubleshooting your application that does not fall under one
-    of the above categories, reach out to the personalized
-    [Firebase support channel](https://firebase.google.com/support/).
+- For general technical questions, post a question on [StackOverflow](http://stackoverflow.com/)
+  with the firebase tag.
+- For general Firebase discussion, use the
+  [firebase-talk](https://groups.google.com/forum/#!forum/firebase-talk) google group.
+- For help troubleshooting your application that does not fall under one of the above categories,
+  reach out to the personalized [Firebase support channel](https://firebase.google.com/support/).
 
 ### [REQUIRED] Step 2: Describe your environment
 
-  * Android Studio version: _____
-  * Firebase Component: _____ (Database, Firestore, Storage, Functions, etc)
-  * Component version: _____
+- Android Studio version: **\_**
+- Firebase Component: **\_** (Database, Firestore, Storage, Functions, etc)
+- Component version: **\_**
 
 ### [REQUIRED] Step 3: Describe the problem
 
 #### Steps to reproduce:
 
-What happened? How can we make the problem occur?
-This could be a description, log/console output, etc.
+What happened? How can we make the problem occur? This could be a description, log/console output,
+etc.
 
 #### Relevant Code:
 

.github/ISSUE_TEMPLATE/fr.md

@@ -3,7 +3,7 @@ name: 💡 Feature Request
 about: Have a feature you'd like to see in the Android SDK? Request it here.
 ---
 
-<!-- DO NOT DELETE 
+<!-- DO NOT DELETE
 validate_template=false
 template_path=.github/ISSUE_TEMPLATE/fr.md
 -->

.github/workflows/ai-daily-tests.yml

@@ -0,0 +1,68 @@
+name: Firebase AI Daily Tests
+
+on:
+  schedule:
+    - cron: 2 7 * * *  # Runs automatically once a day
+  workflow_dispatch:   # Allow triggering the workflow manually
+
+permissions:
+  contents: read
+
+jobs:
+  dailies:
+    name: "Daily Tests"
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          submodules: true
+
+      - name: Enable KVM
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
+        with:
+          java-version: 17
+          distribution: temurin
+          cache: gradle
+
+      - name: Add google-services.json
+        env:
+          INTEG_TESTS_GOOGLE_SERVICES: ${{ secrets.INTEG_TESTS_GOOGLE_SERVICES }}
+        run: |
+          echo $INTEG_TESTS_GOOGLE_SERVICES | base64 -d > google-services.json
+      - uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935 # v2.1.8
+        with:
+          credentials_json: ${{ secrets.GCP_SERVICE_ACCOUNT }}
+
+      - uses: google-github-actions/setup-gcloud@77e7a554d41e2ee56fc945c52dfd3f33d12def9a # v2.1.4
+
+      - name: Run tests
+        uses: reactivecircus/android-emulator-runner@62dbb605bba737720e10b196cb4220d374026a6d #v2.33.0
+        env:
+          FIREBASE_CI: 1
+          FTL_RESULTS_BUCKET: android-ci
+          FTL_RESULTS_DIR: ${{ format('logs/{0}/{1}_{2}/artifacts/', github.workflow, github.run_id, github.run_attempt) }}
+          FIREBASE_APP_CHECK_DEBUG_SECRET: ${{ secrets.FIREBASE_APP_CHECK_DEBUG_SECRET }}
+        with:
+          api-level: 34
+          arch: x86_64
+          ram-size: 4096M
+          heap-size: 4096M
+          script: |
+            adb logcat -v time > logcat.txt &
+            ./gradlew firebase-ai:connectedCheck withErrorProne -PtargetBackend="prod"
+
+      - name: Upload logs
+        if: failure()
+        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
+        with:
+          name: logcat.txt
+          path: logcat.txt
+          retention-days: 7
+          if-no-files-found: ignore

.github/workflows/check_format.yml

@@ -9,44 +9,13 @@ on:
       - main
 
 jobs:
-  determine_changed:
-    name: "Determine changed modules"
-    runs-on: ubuntu-22.04
-    if: (github.repository == 'Firebase/firebase-android-sdk' && github.event_name == 'push') || github.event_name == 'pull_request'
-    outputs:
-      modules: ${{ steps.changed-modules.outputs.modules }}
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          fetch-depth: 2
-          submodules: true
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
-        with:
-          java-version: 17
-          distribution: temurin
-          cache: gradle
-
-      - id: changed-modules
-        run: |
-          git diff --name-only HEAD~1 | xargs printf -- '--changed-git-paths %s\n' | xargs ./gradlew writeChangedProjects --output-file-path=modules.json
-          echo modules=$(cat modules.json) >> $GITHUB_OUTPUT
-
   check_format:
     name: "Check Format"
     runs-on: ubuntu-22.04
-    needs:
-      - determine_changed
-    strategy:
-      fail-fast: false
-      matrix:
-        module: ${{ fromJSON(needs.determine_changed.outputs.modules) }}
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          fetch-depth: 2
           submodules: true
 
       - name: Set up JDK 17
@@ -56,18 +25,5 @@ jobs:
           distribution: temurin
           cache: gradle
 
-      - name: ${{ matrix.module }} Check Format
-        run: |
-          ./gradlew ${{matrix.module}}:spotlessCheck
-
-  # A job that fails if any job in the check_format matrix fails,
-  # to be used as a required check for merging.
-  check_all:
-    runs-on: ubuntu-22.04
-    if: always()
-    name: Check Format (matrix)
-    needs: check_format
-    steps:
-      - name: Check matrix
-        if: needs.check_format.result != 'success'
-        run: exit 1
+      - name: Run Spotless
+        run: ./gradlew ${{matrix.module}}:spotlessCheck

.github/workflows/ci_tests.yml

@@ -38,6 +38,7 @@ jobs:
     runs-on: ubuntu-22.04
     needs:
       - determine_changed
+    if: ${{ needs.determine_changed.outputs.modules != '[]' }}
     strategy:
       fail-fast: false
       matrix:
@@ -56,10 +57,6 @@ jobs:
           distribution: temurin
           cache: gradle
 
-      - name: Clone vertexai mock responses
-        if: matrix.module == ':firebase-vertexai'
-        run: firebase-vertexai/update_responses.sh
-
       - name: Clone ai mock responses
         if: matrix.module == ':firebase-ai'
         run: firebase-ai/update_responses.sh
@@ -76,6 +73,7 @@ jobs:
         run: |
           ./gradlew ${{matrix.module}}:check withErrorProne
       - name: Compute upload file name
+        if: always()
         run: |
           MODULE=${{matrix.module}}
           echo "ARTIFACT_NAME=${MODULE//:/_}" >> $GITHUB_ENV
@@ -92,12 +90,11 @@ jobs:
   # to be used as a required check for merging.
   check_all:
     runs-on: ubuntu-22.04
-    if: always()
     name: Unit Tests (matrix)
     needs: unit_tests
+    if: ${{ failure() }}
     steps:
-      - name: Check test matrix
-        if: needs.unit_tests.result != 'success'
+      - name: Check test matrix results
         run: exit 1
 
 

.github/workflows/dataconnect.yml

@@ -34,7 +34,7 @@ env:
   FDC_JAVA_VERSION: ${{ inputs.javaVersion || '17' }}
   FDC_ANDROID_EMULATOR_API_LEVEL: ${{ inputs.androidEmulatorApiLevel || '34' }}
   FDC_NODEJS_VERSION: ${{ inputs.nodeJsVersion || '20' }}
-  FDC_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion || '14.11.0' }}
+  FDC_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion || '14.15.1' }}
   FDC_FIREBASE_TOOLS_DIR: /tmp/firebase-tools
   FDC_FIREBASE_COMMAND: /tmp/firebase-tools/node_modules/.bin/firebase
   FDC_PYTHON_VERSION: ${{ inputs.pythonVersion || '3.13' }}
@@ -271,6 +271,17 @@ jobs:
         with:
           args: -color /github/workspace/.github/workflows/dataconnect.yml
 
+  shellcheck:
+    continue-on-error: false
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          show-progress: false
+          sparse-checkout: 'firebase-dataconnect/'
+      - name: shellcheck
+        run: find . -name '*.sh' -print0 | xargs --verbose -0 shellcheck --norc --enable=all --shell=bash
+
   python-ci-unit-tests:
     continue-on-error: false
     runs-on: ubuntu-latest

.github/workflows/dataconnect_demo_app.yml

@@ -18,7 +18,7 @@ on:
 
 env:
   FDC_NODE_VERSION: ${{ inputs.nodeVersion || '20' }}
-  FDC_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion || '14.11.0' }}
+  FDC_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion || '14.15.1' }}
   FDC_JAVA_VERSION: ${{ inputs.javaVersion || '17' }}
   FDC_FIREBASE_TOOLS_DIR: ${{ github.workspace }}/firebase-tools
   FDC_FIREBASE_COMMAND: ${{ github.workspace }}/firebase-tools/node_modules/.bin/firebase

.github/workflows/metalava-semver-check.yml

@@ -11,8 +11,10 @@ jobs:
     permissions:
       pull-requests: write
     steps:
-      - name: Checkout PR
+      - name: Checkout main
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          ref: ${{ github.base_ref }}
 
       - name: Set up JDK 17
         uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
@@ -21,13 +23,13 @@ jobs:
           distribution: temurin
           cache: gradle
 
-      - name: Copy new api.txt files
+      - name: Copy existing api.txt files
         run: ./gradlew copyApiTxtFile
 
-      - name: Checkout main
+      - name: Checkout PR
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          ref: ${{ github.base_ref }}
+          ref: ${{ github.head_ref || github.ref_name }}
           clean: false
 
       - name: Run Metalava SemVer check

CONTRIBUTING.md

@@ -1,26 +1,24 @@
 # How to Contribute
 
-We'd love to accept your patches and contributions to this project. There are
-just a few small guidelines you need to follow.
+We'd love to accept your patches and contributions to this project. There are just a few small
+guidelines you need to follow.
 
 ## Contributor License Agreement
 
-Contributions to this project must be accompanied by a Contributor License
-Agreement. You (or your employer) retain the copyright to your contribution;
-this simply gives us permission to use and redistribute your contributions as
-part of the project. Head over to <https://cla.developers.google.com/> to see
-your current agreements on file or to sign a new one.
+Contributions to this project must be accompanied by a Contributor License Agreement. You (or your
+employer) retain the copyright to your contribution; this simply gives us permission to use and
+redistribute your contributions as part of the project. Head over to
+<https://cla.developers.google.com/> to see your current agreements on file or to sign a new one.
 
-You generally only need to submit a CLA once, so if you've already submitted one
-(even if it was for a different project), you probably don't need to do it
-again.
+You generally only need to submit a CLA once, so if you've already submitted one (even if it was for
+a different project), you probably don't need to do it again.
 
 ## Code reviews
 
-All submissions, including submissions by project members, require review. We
-use GitHub pull requests for this purpose. Consult
-[GitHub Help](https://help.github.com/articles/about-pull-requests/) for more
-information on using pull requests.
+All submissions, including submissions by project members, require review. We use GitHub pull
+requests for this purpose. Consult
+[GitHub Help](https://help.github.com/articles/about-pull-requests/) for more information on using
+pull requests.
 
 ## Community Guidelines
 
@@ -29,5 +27,6 @@ This project follows
 
 ## Contributor Documentation
 
-To know more about how to setup your environment, how Firebase internals work, and
-best practices, take a look at our detailed [contributor documentation](https://firebase.github.io/firebase-android-sdk/).
+To know more about how to setup your environment, how Firebase internals work, and best practices,
+take a look at our detailed
+[contributor documentation](https://firebase.github.io/firebase-android-sdk/).