Merge branch 'main' into davidmotson.imagen_editing

Author: David Motsonashvili

.github/workflows/ci_tests.yml

@@ -169,5 +169,8 @@ jobs:
 
       - name: Publish Test Results
         uses: EnricoMi/publish-unit-test-result-action@170bf24d20d201b842d7a52403b73ed297e6645b # v2.18.0
+        if: always()
         with:
           files: "artifacts/**/*.xml"
+          comment_mode: off
+          compare_to_earlier_commit: false

.github/workflows/dataconnect.yml

@@ -13,6 +13,15 @@ on:
   pull_request:
     paths:
       - .github/workflows/dataconnect.yml
+      - gradlew
+      - build.gradle.kts
+      - gradle.properties
+      - gradlew.bat
+      - settings.gradle.kts
+      - subprojects.cfg
+      - 'gradle/**'
+      - 'plugins/**'
+      - '!plugins/**/*.md'
       - 'firebase-dataconnect/**'
       - '!firebase-dataconnect/demo/**'
       - '!firebase-dataconnect/scripts/**'
@@ -25,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.5.1' }}
+  FDC_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion || '14.11.0' }}
   FDC_FIREBASE_TOOLS_DIR: /tmp/firebase-tools
   FDC_FIREBASE_COMMAND: /tmp/firebase-tools/node_modules/.bin/firebase
   FDC_PYTHON_VERSION: ${{ inputs.pythonVersion || '3.13' }}

.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.5.1' }}
+  FDC_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion || '14.11.0' }}
   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
@@ -106,12 +106,19 @@ jobs:
           set -x
           firebase-dataconnect/demo/gradlew \
           --project-dir firebase-dataconnect/demo \
-          --no-daemon \
           ${{ (inputs.gradleInfoLog && '--info') || '' }} \
           --profile \
-          -PdataConnect.minimalApp.firebaseCommand=${{ env.FDC_FIREBASE_COMMAND }} \
+          -PdataConnect.demo.firebaseCommand=${{ env.FDC_FIREBASE_COMMAND }} \
           assemble test
 
+      - name: gradle dokkaGeneratePublicationHtml
+        run: |
+          set -x
+          firebase-dataconnect/demo/gradlew \
+          --project-dir firebase-dataconnect/demo \
+          ${{ (inputs.gradleInfoLog && '--info') || '' }} \
+          dokkaGeneratePublicationHtml
+
       - uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
         with:
           name: apks
@@ -126,6 +133,13 @@ jobs:
           if-no-files-found: warn
           compression-level: 9
 
+      - uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
+        with:
+          name: ktdoc
+          path: firebase-dataconnect/demo/build/dokka/html
+          if-no-files-found: warn
+          compression-level: 9
+
   spotlessCheck:
     continue-on-error: false
     runs-on: ubuntu-latest

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

@@ -2,15 +2,19 @@ name: Metalava SemVer Check
 
 on:
   pull_request:
+    branches:
+      - main
 
 jobs:
   semver-check:
     runs-on: ubuntu-latest
     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
@@ -19,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

.github/workflows/plugins-check.yml

@@ -30,6 +30,7 @@ jobs:
           ./gradlew plugins:check
       - name: Publish Test Results
         uses: EnricoMi/publish-unit-test-result-action@170bf24d20d201b842d7a52403b73ed297e6645b # v2.18.0
+        if: always()
         with:
           files: "**/build/test-results/**/*.xml"
           check_name: "plugins test results"

.github/workflows/update-cpp-sdk-on-release.yml

@@ -53,7 +53,7 @@ jobs:
       - name: Setup python
         uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
         with:
-          python-version: 3.7
+          python-version: 3.9
 
       - name: Check out firebase-cpp-sdk
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

README.md

@@ -27,7 +27,7 @@ https://firebase.google.com.
 
 ## Getting Started
 
-* Install the latest Android Studio (should be 3.0.1 or later)
+* Install the latest Android Studio (should be Meerkat | 2024.3.1 or later)
 * Clone the repo (`git clone --recurse-submodules git@github.com:firebase/firebase-android-sdk.git`)
     * When cloning the repo, it is important to get the submodules as well. If
     you have already cloned the repo without the submodules, you can update the

appcheck/firebase-appcheck-debug-testing/CHANGELOG.md

@@ -1,6 +1,9 @@
 # Unreleased
 
 
+# 19.0.0
+* [unchanged] Updated to keep [app_check] SDK versions aligned.
+
 # 18.0.0
 * [changed] Bump internal dependencies
 

appcheck/firebase-appcheck-debug-testing/firebase-appcheck-debug-testing.gradle

@@ -23,7 +23,6 @@ firebaseLibrary {
     releaseNotes {
         name.set("{{app_check}} Debug Testing")
         versionName.set("appcheck-debug-testing")
-        hasKTX.set(false)
     }
 }
 
@@ -55,8 +54,8 @@ dependencies {
     api project(':appcheck:firebase-appcheck')
     api project(':appcheck:firebase-appcheck-debug')
     api 'com.google.firebase:firebase-appcheck-interop:17.0.0'
-    api 'com.google.firebase:firebase-common:21.0.0'
-    api 'com.google.firebase:firebase-components:18.0.0'
+    api 'com.google.firebase:firebase-common:22.0.0'
+    api 'com.google.firebase:firebase-components:19.0.0'
 
     implementation libs.androidx.test.core
     implementation libs.playservices.base

appcheck/firebase-appcheck-debug-testing/gradle.properties

@@ -1,2 +1,2 @@
-version=18.0.1
-latestReleasedVersion=18.0.0
+version=19.0.1
+latestReleasedVersion=19.0.0