Merge branch 'main' into feature-1818

Author: laurentiu-git

.github/workflows/ci_tests.yml

@@ -56,18 +56,9 @@ jobs:
           distribution: temurin
           cache: gradle
 
-      - name: Pull genai-common
-        if: matrix.module == ':firebase-vertexai'
-        run: |
-          git clone https://github.com/google-gemini/generative-ai-android.git
-          cd generative-ai-android
-          ./gradlew :common:updateVersion common:publishToMavenLocal
-          cd ..
-
       - name: Clone mock responses
         if: matrix.module == ':firebase-vertexai'
-        run: |
-          firebase-vertexai/update_responses.sh
+        run: firebase-vertexai/update_responses.sh
 
       - name: Add google-services.json
         env:

.github/workflows/create_releases.yml

@@ -15,6 +15,9 @@ on:
 jobs:
   create-branches:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
@@ -25,6 +28,9 @@ jobs:
 
   create-pull-request:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
     steps:
       - uses: actions/[email protected]
         with:
@@ -40,7 +46,7 @@ jobs:
           ./gradlew generateReleaseConfig -PcurrentRelease=${{ inputs.name }} -PpastRelease=${{ inputs.past-name }} -PprintOutput=true
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f
         with:
           base: 'releases/${{ inputs.name }}'
           branch: 'releases/${{ inputs.name }}.release'

.github/workflows/dataconnect.yml

@@ -73,27 +73,35 @@ jobs:
           npm install --fund=false --audit=false --save --save-exact firebase-tools@${{ env.FDC_FIREBASE_TOOLS_VERSION }}
 
       - name: Restore Gradle cache
+        id: restore-gradle-cache
         uses: actions/cache/restore@v4
         if: github.event_name != 'schedule'
         with:
           path: |
             ~/.gradle/caches
             ~/.gradle/wrapper
-          key: gradle-cache-jqnvfzw6w7
+          key: gradle-cache-jqnvfzw6w7-${{ github.run_id }}
+          restore-keys: |
+            gradle-cache-jqnvfzw6w7-
 
       - name: tool versions
         continue-on-error: true
         run: |
-          set +e -v
-          uname -a
-          which java
-          java -version
-          which javac
-          javac -version
-          which node
-          node --version
-          ${{ env.FDC_FIREBASE_COMMAND }} --version
-          ./gradlew --version
+          function run_cmd {
+            echo "==============================================================================="
+            echo "Running Command: $*"
+            ("$@" 2>&1) || echo "WARNING: command failed with non-zero exit code $?: $*"
+          }
+
+          run_cmd uname -a
+          run_cmd which java
+          run_cmd java -version
+          run_cmd which javac
+          run_cmd javac -version
+          run_cmd which node
+          run_cmd node --version
+          run_cmd ${{ env.FDC_FIREBASE_COMMAND }} --version
+          run_cmd ./gradlew --version
 
       - name: Gradle assembleDebugAndroidTest
         run: |
@@ -116,7 +124,7 @@ jobs:
           path: |
             ~/.gradle/caches
             ~/.gradle/wrapper
-          key: gradle-cache-jqnvfzw6w7
+          key: ${{ steps.restore-gradle-cache.outputs.cache-primary-key }}
 
       - name: Enable KVM group permissions for Android Emulator
         run: |
@@ -128,24 +136,24 @@ jobs:
       - name: Restore AVD cache
         uses: actions/cache/restore@v4
         if: github.event_name != 'schedule'
-        id: avd-cache
+        id: restore-avd-cache
         with:
           path: |
             ~/.android/avd/*
             ~/.android/adb*
-          key: avd-cache-zhdsn586je-api${{ env.FDC_ANDROID_EMULATOR_API_LEVEL }}
-
-      - run: echo "github.event_name == '${{ github.event_name }}' steps.avd-cache.outputs.cache-hit == '${{ steps.avd-cache.outputs.cache-hit }}'"
+          key: avd-cache-zhdsn586je-api${{ env.FDC_ANDROID_EMULATOR_API_LEVEL }}-${{ github.run_id }}
+          restore-keys: |
+            avd-cache-zhdsn586je-api${{ env.FDC_ANDROID_EMULATOR_API_LEVEL }}-
 
       - name: Create AVD
-        if: github.event_name == 'schedule' || steps.avd-cache.outputs.cache-hit != 'true'
+        if: github.event_name == 'schedule' || steps.restore-avd-cache.outputs.cache-hit != 'true'
         uses: reactivecircus/android-emulator-runner@v2
         with:
           api-level: ${{ env.FDC_ANDROID_EMULATOR_API_LEVEL }}
           arch: x86_64
           force-avd-creation: false
           emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-          disable-animations: false
+          disable-animations: true
           script: echo "Generated AVD snapshot for caching."
 
       - name: Save AVD cache
@@ -155,7 +163,7 @@ jobs:
           path: |
             ~/.android/avd/*
             ~/.android/adb*
-          key: avd-cache-zhdsn586je-api${{ env.FDC_ANDROID_EMULATOR_API_LEVEL }}
+          key: ${{ steps.restore-avd-cache.outputs.cache-primary-key }}
 
       - name: Data Connect Emulator
         run: |
@@ -174,8 +182,16 @@ jobs:
           cd firebase-dataconnect/emulator
           ${{ env.FDC_FIREBASE_COMMAND }} emulators:start --only=auth >firebase.emulator.auth.log 2>&1 &
 
+      - name: Capture Logcat Logs
+        run: adb logcat >logcat.log &
+
       - name: Gradle connectedCheck
+        id: connectedCheck
         uses: reactivecircus/android-emulator-runner@v2
+        # Allow this GitHub Actions "job" to continue even if the tests fail so that logs from a
+        # failed test run get uploaded as "artifacts" and are available to investigate failed runs.
+        # A later step in this "job" will fail the job if this step fails
+        continue-on-error: true
         with:
           api-level: ${{ env.FDC_ANDROID_EMULATOR_API_LEVEL }}
           arch: x86_64
@@ -185,21 +201,28 @@ jobs:
           script: |
             set -eux && ./gradlew ${{ (inputs.gradleInfoLog && '--info') || '' }} :firebase-dataconnect:connectedCheck :firebase-dataconnect:connectors:connectedCheck
 
-      - uses: actions/upload-artifact@v4
-        if: true
+      - name: Upload log file artifacts
+        uses: actions/upload-artifact@v4
         with:
-          name: logs
+          name: integration_test_logs
           path: "**/*.log"
           if-no-files-found: warn
           compression-level: 9
 
-      - uses: actions/upload-artifact@v4
+      - name: Upload Gradle build report artifacts
+        uses: actions/upload-artifact@v4
         with:
-          name: gradle_build_reports
+          name: integration_test_gradle_build_reports
           path: firebase-dataconnect/**/build/reports/
           if-no-files-found: warn
           compression-level: 9
 
+      - name: Verify "Gradle connectedCheck" step was successful
+        if: steps.connectedCheck.outcome != 'success'
+        run: |
+          echo 'Failing because the outcome of the "Gradle connectedCheck" step ("${{ steps.connectedCheck.outcome }}") was not successful'
+          exit 1
+
   # Check this yml file with "actionlint": https://github.com/rhysd/actionlint
   # To run actionlint yourself, run `brew install actionlint` followed by
   # `actionlint .github/workflows/dataconnect.yml`

.github/workflows/dataconnect_demo_app.yml

@@ -89,15 +89,20 @@ jobs:
       - name: tool versions
         continue-on-error: true
         run: |
-          set +e -v
-          which java
-          java -version
-          which javac
-          javac -version
-          which node
-          node --version
-          ${{ env.FDC_FIREBASE_COMMAND }} --version
-          ./gradlew --version
+          function run_cmd {
+            echo "==============================================================================="
+            echo "Running Command: $*"
+            ("$@" 2>&1) || echo "WARNING: command failed with non-zero exit code $?: $*"
+          }
+
+          run_cmd which java
+          run_cmd java -version
+          run_cmd which javac
+          run_cmd javac -version
+          run_cmd which node
+          run_cmd node --version
+          run_cmd ${{ env.FDC_FIREBASE_COMMAND }} --version
+          run_cmd ./gradlew --version
 
       - name: ./gradlew assemble test
         run: |

.github/workflows/make-bom.yml

@@ -11,7 +11,9 @@ jobs:
         uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
         with:
           python-version: '3.10'
+
       - uses: actions/[email protected]
+
       - name: Set up JDK 17
         uses: actions/[email protected]
         with:
@@ -21,19 +23,25 @@ jobs:
 
       - name: Build
         run: |
-          ./ci/run.sh \
-          --artifact-target-dir=./logs/artifacts \
-          --artifact-patterns=bom.zip \
-          --artifact-patterns=bomReleaseNotes.md \
-          --artifact-patterns=recipeVersionUpdate.txt \
-          gradle \
-          -- \
-          --build-cache \
-          buildBomZip
-
-      - name: Upload generated artifacts
+          ./gradlew buildBomBundleZip
+
+      - name: Upload bom
+        uses: actions/[email protected]
+        with:
+          name: bom
+          path: build/bom/
+          retention-days: 15
+
+      - name: Upload release notes
+        uses: actions/[email protected]
+        with:
+          name: bom_release_notes
+          path: build/bomReleaseNotes.md
+          retention-days: 15
+
+      - name: Upload recipe version update
         uses: actions/[email protected]
         with:
-          name: artifacts
-          path: ./logs/artifacts/
-          retention-days: 5
+          name: recipe_version
+          path: build/recipeVersionUpdate.txt
+          retention-days: 15

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

@@ -0,0 +1,34 @@
+name: Metalava SemVer Check
+
+on:
+  pull_request:
+
+jobs:
+  semver-check:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+      - name: Checkout main
+        uses: actions/[email protected]
+        with:
+          ref: ${{ github.base_ref }}
+
+      - name: Set up JDK 17
+        uses: actions/[email protected]
+        with:
+          java-version: 17
+          distribution: temurin
+          cache: gradle
+
+      - name: Copy previous api.txt files
+        run: ./gradlew copyApiTxtFile
+
+      - name: Checkout PR
+        uses: actions/[email protected]
+        with:
+          ref: ${{ github.head_ref }}
+          clean: false
+
+      - name: Run Metalava SemVer check
+        run: ./gradlew metalavaSemver

appcheck/firebase-appcheck-debug-testing/api.txt

@@ -1,10 +1,10 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package com.google.firebase.appcheck.debug.testing {
 
   public final class DebugAppCheckTestHelper {
-    method @NonNull public static com.google.firebase.appcheck.debug.testing.DebugAppCheckTestHelper fromInstrumentationArgs();
-    method public <E extends java.lang.Throwable> void withDebugProvider(@NonNull com.google.firebase.appcheck.debug.testing.DebugAppCheckTestHelper.MaybeThrowingRunnable<E>) throws E;
-    method public <E extends java.lang.Throwable> void withDebugProvider(@NonNull com.google.firebase.FirebaseApp, @NonNull com.google.firebase.appcheck.debug.testing.DebugAppCheckTestHelper.MaybeThrowingRunnable<E>) throws E;
+    method public static com.google.firebase.appcheck.debug.testing.DebugAppCheckTestHelper fromInstrumentationArgs();
+    method public <E extends java.lang.Throwable> void withDebugProvider(com.google.firebase.appcheck.debug.testing.DebugAppCheckTestHelper.MaybeThrowingRunnable<E!>) throws E;
+    method public <E extends java.lang.Throwable> void withDebugProvider(com.google.firebase.FirebaseApp, com.google.firebase.appcheck.debug.testing.DebugAppCheckTestHelper.MaybeThrowingRunnable<E!>) throws E;
   }
 
   public static interface DebugAppCheckTestHelper.MaybeThrowingRunnable<E extends java.lang.Throwable> {

appcheck/firebase-appcheck-debug/api.txt

@@ -1,9 +1,9 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package com.google.firebase.appcheck.debug {
 
   public class DebugAppCheckProviderFactory implements com.google.firebase.appcheck.AppCheckProviderFactory {
-    method @NonNull public com.google.firebase.appcheck.AppCheckProvider create(@NonNull com.google.firebase.FirebaseApp);
-    method @NonNull public static com.google.firebase.appcheck.debug.DebugAppCheckProviderFactory getInstance();
+    method public com.google.firebase.appcheck.AppCheckProvider create(com.google.firebase.FirebaseApp);
+    method public static com.google.firebase.appcheck.debug.DebugAppCheckProviderFactory getInstance();
   }
 
 }

appcheck/firebase-appcheck-interop/api.txt

@@ -1,18 +1,18 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package com.google.firebase.appcheck {
 
   public abstract class AppCheckTokenResult {
     ctor public AppCheckTokenResult();
-    method @Nullable public abstract Exception getError();
-    method @NonNull public abstract String getToken();
+    method public abstract Exception? getError();
+    method public abstract String getToken();
   }
 
 }
 
 package com.google.firebase.appcheck.interop {
 
   public interface AppCheckTokenListener {
-    method public void onAppCheckTokenChanged(@NonNull com.google.firebase.appcheck.AppCheckTokenResult);
+    method public void onAppCheckTokenChanged(com.google.firebase.appcheck.AppCheckTokenResult);
   }
 
 }

appcheck/firebase-appcheck-playintegrity/api.txt

@@ -1,10 +1,10 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package com.google.firebase.appcheck.playintegrity {
 
   public class PlayIntegrityAppCheckProviderFactory implements com.google.firebase.appcheck.AppCheckProviderFactory {
     ctor public PlayIntegrityAppCheckProviderFactory();
-    method @NonNull public com.google.firebase.appcheck.AppCheckProvider create(@NonNull com.google.firebase.FirebaseApp);
-    method @NonNull public static com.google.firebase.appcheck.playintegrity.PlayIntegrityAppCheckProviderFactory getInstance();
+    method public com.google.firebase.appcheck.AppCheckProvider create(com.google.firebase.FirebaseApp);
+    method public static com.google.firebase.appcheck.playintegrity.PlayIntegrityAppCheckProviderFactory getInstance();
   }
 
 }