Merge branch 'main' into rl.agp.bump

Author: rlazo

.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/**'

.github/workflows/dataconnect_demo_app.yml

@@ -106,12 +106,19 @@ jobs:
           set -x
           firebase-dataconnect/demo/gradlew \
           --project-dir firebase-dataconnect/demo \
-          --no-daemon \
           ${{ (inputs.gradleInfoLog && '--info') || '' }} \
           --profile \
           -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/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,4 +1,7 @@
 # Unreleased
+
+
+# 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)
@@ -11,7 +14,6 @@
     * **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
  Vertex AI in Firebase SDK (`firebase-vertexai`) to accommodate the evolving set of supported
@@ -29,3 +31,4 @@
 
  Note: This feature is in Public Preview, which means that it is not subject to any SLA or
  deprecation policy and could change in backwards-incompatible ways.
+

firebase-ai/api.txt

@@ -245,15 +245,15 @@ package com.google.firebase.ai.type {
   }
 
   public final class CountTokensResponse {
-    ctor public CountTokensResponse(int totalTokens, Integer? totalBillableCharacters = null, java.util.List<com.google.firebase.ai.type.ModalityTokenCount> promptTokensDetails = emptyList());
+    ctor public CountTokensResponse(int totalTokens, @Deprecated Integer? totalBillableCharacters = null, java.util.List<com.google.firebase.ai.type.ModalityTokenCount> promptTokensDetails = emptyList());
     method public operator int component1();
     method public operator Integer? component2();
     method public operator java.util.List<com.google.firebase.ai.type.ModalityTokenCount>? component3();
     method public java.util.List<com.google.firebase.ai.type.ModalityTokenCount> getPromptTokensDetails();
-    method public Integer? getTotalBillableCharacters();
+    method @Deprecated public Integer? getTotalBillableCharacters();
     method public int getTotalTokens();
     property public final java.util.List<com.google.firebase.ai.type.ModalityTokenCount> promptTokensDetails;
-    property public final Integer? totalBillableCharacters;
+    property @Deprecated public final Integer? totalBillableCharacters;
     property public final int totalTokens;
   }
 

firebase-ai/gradle.properties

@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=16.2.0
-latestReleasedVersion=16.1.0
+version=16.2.1
+latestReleasedVersion=16.2.0

firebase-ai/src/main/kotlin/com/google/firebase/ai/type/Schema.kt

@@ -309,15 +309,13 @@ internal constructor(
      *
      * Example: A field that can hold either a simple userID or a more detailed user object.
      *
-     * Schema.anyOf( listOf( Schema.integer(description = "User ID"), Schema.obj(mapOf(
-     *
      * ```
+     * Schema.anyOf( listOf( Schema.integer(description = "User ID"), Schema.obj( mapOf(
      *     "userID" to Schema.integer(description = "User ID"),
      *     "username" to Schema.string(description = "Username")
+     * )))
      * ```
      *
-     * )) )
-     *
      * @param schemas The list of valid schemas which could be here
      */
     @JvmStatic