Skip to content

Commit 6e40a19

Browse files
committed
Merge branch 'dl/grounding' of https://github.com/firebase/firebase-android-sdk into dl/grounding
2 parents 04119ad + 6b5fa44 commit 6e40a19

File tree

104 files changed

+591
-7413
lines changed

Some content is hidden

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

104 files changed

+591
-7413
lines changed

.github/workflows/ci_tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,5 +169,6 @@ jobs:
169169

170170
- name: Publish Test Results
171171
uses: EnricoMi/publish-unit-test-result-action@170bf24d20d201b842d7a52403b73ed297e6645b # v2.18.0
172+
if: always()
172173
with:
173174
files: "artifacts/**/*.xml"

.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/plugins-check.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ jobs:
3030
./gradlew plugins:check
3131
- name: Publish Test Results
3232
uses: EnricoMi/publish-unit-test-result-action@170bf24d20d201b842d7a52403b73ed297e6645b # v2.18.0
33+
if: always()
3334
with:
3435
files: "**/build/test-results/**/*.xml"
3536
check_name: "plugins test results"

.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/fireciplugins/macrobenchmark/run/runner.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ def _process_changed_modules(path: Path) -> List[str]:
119119
":firebase-components": ["Firebase", "ComponentDiscovery", "Runtime"],
120120
":firebase-database": ["fire-rtdb"],
121121
":firebase-datatransport": ["fire-transport"],
122-
":firebase-dynamic-links": ["fire-dl"],
123122
":firebase-crashlytics": ["fire-cls"],
124123
":firebase-crashlytics-ndk": ["fire-cls"],
125124
":firebase-firestore": ["fire-fst"],

ci/fireci/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ 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",

docs/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ in your app:
2626

2727
* [`firebase-common`](ktx/common.md)
2828
* [`firebase-crashlytics`](ktx/crashlytics.md)
29-
* [`firebase-dynamic-links`](ktx/dynamic-links.md)
3029
* [`firebase-firestore`](ktx/firestore.md)
3130
* [`firebase-functions`](ktx/functions.md)
3231
* [`firebase-inappmessaging`](ktx/inappmessaging.md)

docs/ktx/dynamic-links.md

Lines changed: 0 additions & 170 deletions
This file was deleted.

firebase-ai/CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# Unreleased
22
* [feature] **Breaking Change**: Add support for Grounding with Google Search (#7042).
33
* **Action Required:** Update all references of `groundingAttributions`, `webSearchQueries`, `retrievalQueries` in `GroundingMetadata` to be non-optional.
4+
5+
6+
# 16.2.0
47
* [changed] Deprecate the `totalBillableCharacters` field (only usable with pre-2.0 models). (#7042)
58
* [feature] Added support for extra schema properties like `title`, `minItems`, `maxItems`, `minimum`
69
and `maximum`. As well as support for the `anyOf` schema. (#7013)
@@ -13,7 +16,6 @@
1316
* **Action Required:** Update all references of `SpeechConfig` initialization to use `Voice` class.
1417
* [fixed] Fix incorrect model name in count token requests to the developer API backend
1518

16-
1719
# 16.0.0
1820
* [feature] Initial release of the Firebase AI SDK (`firebase-ai`). This SDK *replaces* the previous
1921
Vertex AI in Firebase SDK (`firebase-vertexai`) to accommodate the evolving set of supported
@@ -31,3 +33,4 @@
3133

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

0 commit comments

Comments
 (0)