Merge branch 'main' of github.com:firebase/firebase-android-sdk into rpf/add-thinking-budget-support

# Conflicts:
#	firebase-ai/CHANGELOG.md
#	firebase-ai/gradle.properties

Author: thatfiredev

.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.2.0' }}
+  FDC_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion || '14.5.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' }}

.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.2.0' }}
+  FDC_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion || '14.5.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
@@ -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,6 +2,8 @@ name: Metalava SemVer Check
 
 on:
   pull_request:
+    branches:
+      - main
 
 jobs:
   semver-check:

.github/workflows/sessions-e2e.yml

@@ -23,7 +23,7 @@ jobs:
       - name: set up JDK 17
         uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: gradle
 
@@ -39,4 +39,4 @@ jobs:
         env:
           FTL_RESULTS_BUCKET: fireescape
         run: |
-          ./gradlew :firebase-sessions:test-app:deviceCheck withErrorProne -PtargetBackend="prod" -PtriggerCrashes
+          ./gradlew :firebase-sessions:test-app:deviceCheck withErrorProne -PtargetBackend="prod"

.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 [email protected]: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

ci/fireci/pyproject.toml

@@ -6,15 +6,15 @@ build-backend = "setuptools.build_meta"
 name = "fireci"
 version = "0.1"
 dependencies = [
-  "protobuf==3.20.3",
+  "protobuf==4.25.8",
   "click==8.1.7",
   "google-cloud-storage==2.18.2",
   "mypy==1.6.0",
   "numpy==1.24.4",
   "pandas==1.5.3",
   "PyGithub==1.58.2",
   "pystache==0.6.0",
-  "requests==2.32.2",
+  "requests==2.32.4",
   "seaborn==0.12.2",
   "PyYAML==6.0.1",
   "termcolor==2.4.0",

firebase-ai/CHANGELOG.md

@@ -1,8 +1,18 @@
 # Unreleased
-
 * [feat] Added support for setting thinking budget for the Gemini models that support it. (#6990)
+
+# 16.2.0
+* [changed] Deprecate the `totalBillableCharacters` field (only usable with pre-2.0 models). (#7042)
+* [feature] Added support for extra schema properties like `title`, `minItems`, `maxItems`, `minimum`
+ and `maximum`. As well as support for the `anyOf` schema. (#7013)
+
+# 16.1.0
 * [fixed] Fixed `FirebaseAI.getInstance` StackOverflowException (#6971)
-* [fixed] Fixed an issue that was causing the SDK to send empty `FunctionDeclaration` descriptions to the API. 
+* [fixed] Fixed an issue that was causing the SDK to send empty `FunctionDeclaration` descriptions to the API.
+* [changed] Introduced the `Voice` class, which accepts a voice name, and deprecated the `Voices` class.
+* [changed] **Breaking Change**: Updated `SpeechConfig` to take in `Voice` class instead of `Voices` class.
+    * **Action Required:** Update all references of `SpeechConfig` initialization to use `Voice` class.
+* [fixed] Fix incorrect model name in count token requests to the developer API backend
 
 # 16.0.0
 * [feature] Initial release of the Firebase AI SDK (`firebase-ai`). This SDK *replaces* the previous