Skip to content

Commit ac2f31b

Browse files
thatfiredevthatfiredev
committed
Merge remote-tracking branch 'origin/main' into rpf-vertex-ai-snippets
2 parents 35dc407 + 2d9d956 commit ac2f31b

File tree

5 files changed

+87
-72
lines changed

5 files changed

+87
-72
lines changed

‎.github/workflows/ci.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,23 @@ on:
1313

1414
jobs:
1515
android:
16-
runs-on: macos-latest
16+
runs-on: ubuntu-latest
1717
timeout-minutes: 30
1818
steps:
1919

2020
- name: "Git Checkout"
2121
uses: actions/checkout@v2
2222

23+
- name: Enable KVM
24+
run: |
25+
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
26+
sudo udevadm control --reload-rules
27+
sudo udevadm trigger --name-match=kvm
28+
2329
- name: "Install Node"
2430
uses: actions/setup-node@v2
2531
with:
26-
node-version: '16'
32+
node-version: '20'
2733

2834
- uses: actions/setup-java@v2
2935
name: "Install Java"
@@ -50,8 +56,9 @@ jobs:
5056
with:
5157
api-level: 28
5258
arch: x86_64
59+
disable-animations: true
5360
# Firebase Firestore works without Google Play Services, so we don't use the `googleapis`
5461
# emulator target as it's considerably slower on CI.
5562
target: default
5663
profile: Nexus 5X
57-
script: sh ./.github/workflows/scripts/drive-app.sh firebase_snippets_app
64+
script: bash ./.github/workflows/scripts/drive-app.sh firebase_snippets_app

‎packages/firebase_snippets_app/android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ android {
4444

4545
defaultConfig {
4646
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
47-
applicationId "com.example.firestore_snippets"
47+
applicationId "com.example.firebase_snippets_app"
4848
minSdkVersion 21
4949
targetSdkVersion flutter.targetSdkVersion
5050
versionCode flutterVersionCode.toInteger()

‎packages/firebase_snippets_app/android/app/google-services.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"client_info": {
1010
"mobilesdk_app_id": "1:220375889386:android:1a16e85eeab0d5896bae93",
1111
"android_client_info": {
12-
"package_name": "com.example.firestore_snippets"
12+
"package_name": "com.example.firebase_snippets_app"
1313
}
1414
},
1515
"oauth_client": [

‎packages/firebase_snippets_app/pubspec.lock

Lines changed: 74 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,15 @@ packages:
240240
sha256: "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9"
241241
url: "https://pub.dev"
242242
source: hosted
243-
version: "2.3.6"
243+
version: "2.3.1"
244+
facebook_auth_desktop:
245+
dependency: transitive
246+
description:
247+
name: facebook_auth_desktop
248+
sha256: "0e4f147a57de8fdb8eaaee4836e6b9859482921143af0c350ffbf2a9bbd531a0"
249+
url: "https://pub.dev"
250+
source: hosted
251+
version: "2.0.0"
244252
fake_async:
245253
dependency: transitive
246254
description:
@@ -289,30 +297,6 @@ packages:
289297
url: "https://pub.dev"
290298
source: hosted
291299
version: "0.5.7+7"
292-
firebase_app_check:
293-
dependency: transitive
294-
description:
295-
name: firebase_app_check
296-
sha256: aac3b42cdf804b10cb1085c9902e5d1ef2f30e7cfc0c504e6f47519713d86829
297-
url: "https://pub.dev"
298-
source: hosted
299-
version: "0.2.2+7"
300-
firebase_app_check_platform_interface:
301-
dependency: transitive
302-
description:
303-
name: firebase_app_check_platform_interface
304-
sha256: d0b9e4676ee7a272160b989a9a899d6469e336fe3624b3935cdae77a476f00d1
305-
url: "https://pub.dev"
306-
source: hosted
307-
version: "0.1.0+29"
308-
firebase_app_check_web:
309-
dependency: transitive
310-
description:
311-
name: firebase_app_check_web
312-
sha256: f5359ba62111e4b28e5f1477b7c5c560dcfabe1ccc9e02e65ebdb428eda204ad
313-
url: "https://pub.dev"
314-
source: hosted
315-
version: "0.1.2+7"
316300
firebase_auth:
317301
dependency: "direct main"
318302
description:
@@ -529,14 +513,6 @@ packages:
529513
url: "https://pub.dev"
530514
source: hosted
531515
version: "3.9.7"
532-
firebase_vertexai:
533-
dependency: "direct main"
534-
description:
535-
name: firebase_vertexai
536-
sha256: "6eb4a201238198de74d54d465fd7b8f54e43c6bf714ff46440947a80d19adfec"
537-
url: "https://pub.dev"
538-
source: hosted
539-
version: "0.1.1"
540516
fixnum:
541517
dependency: transitive
542518
description:
@@ -559,26 +535,26 @@ packages:
559535
dependency: "direct main"
560536
description:
561537
name: flutter_facebook_auth
562-
sha256: fd1a6749dafbd5923585038671b63abdcedd4fe5923eb42fc154247dc5622519
538+
sha256: "54963951b21673194d534724de9df9aa18be6a1e90a5d0d90f4b89d8e1f0d93a"
563539
url: "https://pub.dev"
564540
source: hosted
565-
version: "6.0.4"
541+
version: "7.0.0"
566542
flutter_facebook_auth_platform_interface:
567543
dependency: transitive
568544
description:
569545
name: flutter_facebook_auth_platform_interface
570-
sha256: "86630c4dbba1c20fba26ea9e59ad0d48f5ff59e7373cacd36f916160186f9ce9"
546+
sha256: dc9d621dd45c4f0b341173a16e94f4b77155fa9c0f4326743f1251f2f445ba38
571547
url: "https://pub.dev"
572548
source: hosted
573-
version: "5.0.0"
549+
version: "6.0.0"
574550
flutter_facebook_auth_web:
575551
dependency: transitive
576552
description:
577553
name: flutter_facebook_auth_web
578-
sha256: "0e2960e9e23f2538e29b406495e18b047fbf233abfaed8d2b99acda17a2f7479"
554+
sha256: "947d93fc5a7cc5db1ce0274505254bb3b619cdd98176954f125f742964696804"
579555
url: "https://pub.dev"
580556
source: hosted
581-
version: "5.0.1"
557+
version: "6.0.0"
582558
flutter_lints:
583559
dependency: "direct dev"
584560
description:
@@ -587,6 +563,54 @@ packages:
587563
url: "https://pub.dev"
588564
source: hosted
589565
version: "4.0.0"
566+
flutter_secure_storage:
567+
dependency: transitive
568+
description:
569+
name: flutter_secure_storage
570+
sha256: "165164745e6afb5c0e3e3fcc72a012fb9e58496fb26ffb92cf22e16a821e85d0"
571+
url: "https://pub.dev"
572+
source: hosted
573+
version: "9.2.2"
574+
flutter_secure_storage_linux:
575+
dependency: transitive
576+
description:
577+
name: flutter_secure_storage_linux
578+
sha256: "4d91bfc23047422cbcd73ac684bc169859ee766482517c22172c86596bf1464b"
579+
url: "https://pub.dev"
580+
source: hosted
581+
version: "1.2.1"
582+
flutter_secure_storage_macos:
583+
dependency: transitive
584+
description:
585+
name: flutter_secure_storage_macos
586+
sha256: "1693ab11121a5f925bbea0be725abfcfbbcf36c1e29e571f84a0c0f436147a81"
587+
url: "https://pub.dev"
588+
source: hosted
589+
version: "3.1.2"
590+
flutter_secure_storage_platform_interface:
591+
dependency: transitive
592+
description:
593+
name: flutter_secure_storage_platform_interface
594+
sha256: cf91ad32ce5adef6fba4d736a542baca9daf3beac4db2d04be350b87f69ac4a8
595+
url: "https://pub.dev"
596+
source: hosted
597+
version: "1.1.2"
598+
flutter_secure_storage_web:
599+
dependency: transitive
600+
description:
601+
name: flutter_secure_storage_web
602+
sha256: f4ebff989b4f07b2656fb16b47852c0aab9fed9b4ec1c70103368337bc1886a9
603+
url: "https://pub.dev"
604+
source: hosted
605+
version: "1.2.1"
606+
flutter_secure_storage_windows:
607+
dependency: transitive
608+
description:
609+
name: flutter_secure_storage_windows
610+
sha256: b20b07cb5ed4ed74fc567b78a72936203f587eba460af1df11281c9326cd3709
611+
url: "https://pub.dev"
612+
source: hosted
613+
version: "3.1.2"
590614
flutter_test:
591615
dependency: "direct dev"
592616
description: flutter
@@ -626,14 +650,6 @@ packages:
626650
url: "https://pub.dev"
627651
source: hosted
628652
version: "2.1.2"
629-
google_generative_ai:
630-
dependency: transitive
631-
description:
632-
name: google_generative_ai
633-
sha256: "35072cb63e4c0b0bab11735b60d9d2335c2b463b60358fd6c456a7286e649a5e"
634-
url: "https://pub.dev"
635-
source: hosted
636-
version: "0.4.1"
637653
google_identity_services_web:
638654
dependency: transitive
639655
description:
@@ -750,7 +766,7 @@ packages:
750766
sha256: ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b
751767
url: "https://pub.dev"
752768
source: hosted
753-
version: "6.8.0"
769+
version: "6.7.0"
754770
leak_tracker:
755771
dependency: transitive
756772
description:
@@ -883,10 +899,10 @@ packages:
883899
dependency: transitive
884900
description:
885901
name: path_provider_windows
886-
sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170"
902+
sha256: "1cb68ba4cd3a795033de62ba1b7b4564dace301f952de6bfb3cd91b202b6ee96"
887903
url: "https://pub.dev"
888904
source: hosted
889-
version: "2.2.1"
905+
version: "2.1.7"
890906
platform:
891907
dependency: transitive
892908
description:
@@ -1124,23 +1140,15 @@ packages:
11241140
url: "https://pub.dev"
11251141
source: hosted
11261142
version: "0.5.1"
1127-
web_socket:
1128-
dependency: transitive
1129-
description:
1130-
name: web_socket
1131-
sha256: "24301d8c293ce6fe327ffe6f59d8fd8834735f0ec36e4fd383ec7ff8a64aa078"
1132-
url: "https://pub.dev"
1133-
source: hosted
1134-
version: "0.1.5"
11351143
web_socket_channel:
11361144
dependency: transitive
11371145
description:
1138-
name: web_socket_channel
1139-
sha256: a2d56211ee4d35d9b344d9d4ce60f362e4f5d1aafb988302906bd732bc731276
1146+
name: web
1147+
sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
11401148
url: "https://pub.dev"
11411149
source: hosted
1142-
version: "3.0.0"
1143-
webdriver:
1150+
version: "0.5.1"
1151+
web_socket:
11441152
dependency: transitive
11451153
description:
11461154
name: webdriver
@@ -1152,10 +1160,10 @@ packages:
11521160
dependency: transitive
11531161
description:
11541162
name: win32
1155-
sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4
1163+
sha256: f2add6fa510d3ae152903412227bda57d0d5a8da61d2c39c1fb022c9429a41c0
11561164
url: "https://pub.dev"
11571165
source: hosted
1158-
version: "5.5.1"
1166+
version: "5.0.6"
11591167
xdg_directories:
11601168
dependency: transitive
11611169
description:
@@ -1173,5 +1181,5 @@ packages:
11731181
source: hosted
11741182
version: "3.1.2"
11751183
sdks:
1176-
dart: ">=3.4.0 <4.0.0"
1177-
flutter: ">=3.22.0"
1184+
dart: ">=3.3.0 <4.0.0"
1185+
flutter: ">=3.19.0"

‎packages/firebase_snippets_app/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ dependencies:
3939
firebase_performance: ^0.9.2
4040
json_annotation: ^4.4.0
4141
google_sign_in: ^6.1.0
42-
flutter_facebook_auth: ^6.0.4
42+
flutter_facebook_auth: ^7.0.0
4343
twitter_login: ^4.1.0
4444
sign_in_with_apple: ^6.1.0
4545
crypto: ^3.0.1

0 commit comments

Comments
 (0)