Skip to content

Commit 645d0aa

Browse files
authored
Merge branch 'main' into rl.agp.bump
2 parents e21b158 + 2bfc0a5 commit 645d0aa

File tree

47 files changed

+607
-219
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+607
-219
lines changed

.github/workflows/dataconnect.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,15 @@ on:
1313
pull_request:
1414
paths:
1515
- .github/workflows/dataconnect.yml
16+
- gradlew
17+
- build.gradle.kts
18+
- gradle.properties
19+
- gradlew.bat
20+
- settings.gradle.kts
21+
- subprojects.cfg
22+
- 'gradle/**'
23+
- 'plugins/**'
24+
- '!plugins/**/*.md'
1625
- 'firebase-dataconnect/**'
1726
- '!firebase-dataconnect/demo/**'
1827
- '!firebase-dataconnect/scripts/**'

.github/workflows/dataconnect_demo_app.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,19 @@ jobs:
106106
set -x
107107
firebase-dataconnect/demo/gradlew \
108108
--project-dir firebase-dataconnect/demo \
109-
--no-daemon \
110109
${{ (inputs.gradleInfoLog && '--info') || '' }} \
111110
--profile \
112111
-PdataConnect.demo.firebaseCommand=${{ env.FDC_FIREBASE_COMMAND }} \
113112
assemble test
114113
114+
- name: gradle dokkaGeneratePublicationHtml
115+
run: |
116+
set -x
117+
firebase-dataconnect/demo/gradlew \
118+
--project-dir firebase-dataconnect/demo \
119+
${{ (inputs.gradleInfoLog && '--info') || '' }} \
120+
dokkaGeneratePublicationHtml
121+
115122
- uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
116123
with:
117124
name: apks
@@ -126,6 +133,13 @@ jobs:
126133
if-no-files-found: warn
127134
compression-level: 9
128135

136+
- uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
137+
with:
138+
name: ktdoc
139+
path: firebase-dataconnect/demo/build/dokka/html
140+
if-no-files-found: warn
141+
compression-level: 9
142+
129143
spotlessCheck:
130144
continue-on-error: false
131145
runs-on: ubuntu-latest

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ name: Metalava SemVer Check
22

33
on:
44
pull_request:
5+
branches:
6+
- main
57

68
jobs:
79
semver-check:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
- name: Setup python
5454
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
5555
with:
56-
python-version: 3.7
56+
python-version: 3.9
5757

5858
- name: Check out firebase-cpp-sdk
5959
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ https://firebase.google.com.
2727

2828
## Getting Started
2929

30-
* Install the latest Android Studio (should be 3.0.1 or later)
30+
* Install the latest Android Studio (should be Meerkat | 2024.3.1 or later)
3131
* Clone the repo (`git clone --recurse-submodules [email protected]:firebase/firebase-android-sdk.git`)
3232
* When cloning the repo, it is important to get the submodules as well. If
3333
you have already cloned the repo without the submodules, you can update the

ci/fireci/pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ build-backend = "setuptools.build_meta"
66
name = "fireci"
77
version = "0.1"
88
dependencies = [
9-
"protobuf==3.20.3",
9+
"protobuf==4.25.8",
1010
"click==8.1.7",
1111
"google-cloud-storage==2.18.2",
1212
"mypy==1.6.0",
1313
"numpy==1.24.4",
1414
"pandas==1.5.3",
1515
"PyGithub==1.58.2",
1616
"pystache==0.6.0",
17-
"requests==2.32.2",
17+
"requests==2.32.4",
1818
"seaborn==0.12.2",
1919
"PyYAML==6.0.1",
2020
"termcolor==2.4.0",

firebase-ai/CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
# Unreleased
2+
3+
4+
# 16.2.0
25
* [changed] Deprecate the `totalBillableCharacters` field (only usable with pre-2.0 models). (#7042)
36
* [feature] Added support for extra schema properties like `title`, `minItems`, `maxItems`, `minimum`
47
and `maximum`. As well as support for the `anyOf` schema. (#7013)
@@ -11,7 +14,6 @@
1114
* **Action Required:** Update all references of `SpeechConfig` initialization to use `Voice` class.
1215
* [fixed] Fix incorrect model name in count token requests to the developer API backend
1316

14-
1517
# 16.0.0
1618
* [feature] Initial release of the Firebase AI SDK (`firebase-ai`). This SDK *replaces* the previous
1719
Vertex AI in Firebase SDK (`firebase-vertexai`) to accommodate the evolving set of supported
@@ -29,3 +31,4 @@
2931

3032
Note: This feature is in Public Preview, which means that it is not subject to any SLA or
3133
deprecation policy and could change in backwards-incompatible ways.
34+

firebase-ai/api.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,15 +245,15 @@ package com.google.firebase.ai.type {
245245
}
246246

247247
public final class CountTokensResponse {
248-
ctor public CountTokensResponse(int totalTokens, Integer? totalBillableCharacters = null, java.util.List<com.google.firebase.ai.type.ModalityTokenCount> promptTokensDetails = emptyList());
248+
ctor public CountTokensResponse(int totalTokens, @Deprecated Integer? totalBillableCharacters = null, java.util.List<com.google.firebase.ai.type.ModalityTokenCount> promptTokensDetails = emptyList());
249249
method public operator int component1();
250250
method public operator Integer? component2();
251251
method public operator java.util.List<com.google.firebase.ai.type.ModalityTokenCount>? component3();
252252
method public java.util.List<com.google.firebase.ai.type.ModalityTokenCount> getPromptTokensDetails();
253-
method public Integer? getTotalBillableCharacters();
253+
method @Deprecated public Integer? getTotalBillableCharacters();
254254
method public int getTotalTokens();
255255
property public final java.util.List<com.google.firebase.ai.type.ModalityTokenCount> promptTokensDetails;
256-
property public final Integer? totalBillableCharacters;
256+
property @Deprecated public final Integer? totalBillableCharacters;
257257
property public final int totalTokens;
258258
}
259259

firebase-ai/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
version=16.2.0
16-
latestReleasedVersion=16.1.0
15+
version=16.2.1
16+
latestReleasedVersion=16.2.0

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -309,15 +309,13 @@ internal constructor(
309309
*
310310
* Example: A field that can hold either a simple userID or a more detailed user object.
311311
*
312-
* Schema.anyOf( listOf( Schema.integer(description = "User ID"), Schema.obj(mapOf(
313-
*
314312
* ```
313+
* Schema.anyOf( listOf( Schema.integer(description = "User ID"), Schema.obj( mapOf(
315314
* "userID" to Schema.integer(description = "User ID"),
316315
* "username" to Schema.string(description = "Username")
316+
* )))
317317
* ```
318318
*
319-
* )) )
320-
*
321319
* @param schemas The list of valid schemas which could be here
322320
*/
323321
@JvmStatic

0 commit comments

Comments
 (0)