Skip to content

Commit 35d87ee

Browse files
author
Jeremy
committed
Merge branch 'main' into safety-rating-parse-compatibilty
* main: (31 commits) making sure vertex instance will differentiate with location (firebase#17664) fix(firebaseai): Added token details parsing for Dev API (firebase#17609) feat(firebaseai): add thinking feature (firebase#17652) feat(firebaseai): Add app check limited use token (firebase#17645) fix(firebaseai): remove candidateCount from LiveGenerationConfig since the connection fails silently when it is set (firebase#17647) fix(firebaseai): Export `UnknownPart` (firebase#17655) fix(firebase_ai): Add `GroundingMetadata` parsing for Developer API (firebase#17657) fix(app_check, iOS): correctly parse `forceRefresh` argument using `boolValue` (firebase#17627) feat(firebaseai): imagen editing (firebase#17556) feat(firebaseai): add responseJsonSchema to GenerationConfig (firebase#17564) chore(firebaseai): fix error message test failure (firebase#17644) ci(apple): fix CI runners with explicit Xcode version (firebase#17634) chore(firebaseai): Minor fix for error message wording (firebase#17639) chore: fix warnings after latest flutter version (firebase#17640) Update CHANGELOG.md, put live api entry back for the official announcment (firebase#17635) fix(ci): ignore .gradle files in license check (firebase#17625) Remove `generateContent` call from count tokens page (firebase#17613) Update CHANGELOG.md (firebase#17621) Update CONTRIBUTING.md to add API change rule (firebase#17619) chore(release): publish packages (firebase#17618) ...
2 parents 3529107 + bf84c6a commit 35d87ee

File tree

125 files changed

+3636
-663
lines changed

Some content is hidden

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

125 files changed

+3636
-663
lines changed

.github/workflows/all_plugins.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ jobs:
124124
"flutter build web"
125125
swift-integration:
126126
runs-on: macos-15
127-
timeout-minutes: 30
127+
timeout-minutes: 45
128128
env:
129129
FLUTTER_DEPENDENCIES: "cloud_firestore firebase_remote_config cloud_functions firebase_database firebase_auth firebase_storage firebase_analytics firebase_messaging firebase_app_check firebase_in_app_messaging firebase_performance firebase_crashlytics firebase_ml_model_downloader firebase_app_installations"
130130
PR_HEAD_REPO: ${{ github.event.pull_request.head.repo.full_name }}
@@ -133,6 +133,8 @@ jobs:
133133
- uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff
134134
with:
135135
channel: 'stable'
136+
- name: Xcode
137+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
136138
- name: Setup firebase_core example app to test Swift integration
137139
# run this before running melos boostrap to ensure the example app is set up
138140
run: |

.github/workflows/android.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
arch: x86_64
9090
working-directory: ${{ matrix.working_directory }}
9191
script: |
92-
flutter test integration_test/e2e_test.dart --dart-define=CI=true -d emulator-5554
92+
flutter test integration_test/e2e_test.dart --ignore-timeouts --dart-define=CI=true -d emulator-5554
9393
- name: Ensure Appium is shut down
9494
# Required because of below issue where emulator failing to shut down properly causes tests to fail
9595
# https://github.com/ReactiveCircus/android-emulator-runner/issues/385

.github/workflows/e2e_tests_fdc.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ jobs:
100100
name: Install Node.js 20
101101
with:
102102
node-version: '20'
103+
- name: Xcode
104+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
103105
- uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
104106
with:
105107
distribution: 'temurin'

.github/workflows/ios.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ on:
2727
jobs:
2828
ios:
2929
runs-on: macos-15
30-
timeout-minutes: 45
30+
timeout-minutes: 60
3131
strategy:
3232
fail-fast: false
3333
matrix:
@@ -39,6 +39,8 @@ jobs:
3939
name: Install Node.js 20
4040
with:
4141
node-version: '20'
42+
- name: Xcode
43+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
4244
- uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
4345
with:
4446
distribution: 'temurin'
@@ -115,4 +117,4 @@ jobs:
115117
run: |
116118
# Uncomment following line to have simulator logs printed out for debugging purposes.
117119
# xcrun simctl spawn booted log stream --predicate 'eventMessage contains "flutter"' &
118-
flutter test integration_test/e2e_test.dart -d "$SIMULATOR" --dart-define=CI=true
120+
flutter test integration_test/e2e_test.dart -d "$SIMULATOR" --ignore-timeouts --dart-define=CI=true

.github/workflows/macos.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,4 +96,5 @@ jobs:
9696
flutter test \
9797
integration_test/e2e_test.dart \
9898
-d macos \
99-
--dart-define=CI=true
99+
--dart-define=CI=true \
100+
--ignore-timeouts

0 commit comments

Comments
 (0)