diff --git a/crdt_sync_flutter/lib/src/bootstrap.dart b/crdt_sync_flutter/lib/src/bootstrap.dart index ef8baff..cc9da37 100644 --- a/crdt_sync_flutter/lib/src/bootstrap.dart +++ b/crdt_sync_flutter/lib/src/bootstrap.dart @@ -67,9 +67,9 @@ Future openSync( // A stored refresh token IS a signed-in device, even with no account // marker beside it. Treating the marker as the source of truth made a // phone with a live session sync over the mirror and fail forever. - return _clientFromStoredSession(app, storage: storage); + return await _clientFromStoredSession(app, storage: storage); } - return firebaseClientFor( + return await firebaseClientFor( config: app.project.configFor(account.email), store: keystoreCredentialStore(storage: storage), // A Google-provisioned account stores an empty password. Passing '' diff --git a/crdt_sync_flutter/lib/src/google_any_sign_in.dart b/crdt_sync_flutter/lib/src/google_any_sign_in.dart index 0e61a08..28b7fae 100644 --- a/crdt_sync_flutter/lib/src/google_any_sign_in.dart +++ b/crdt_sync_flutter/lib/src/google_any_sign_in.dart @@ -85,9 +85,9 @@ Future googleAnyIdToken({ // flow, and whether any runs at all -- is pure and fully covered. // coverage:ignore-start case GoogleFlow.plugin: - return googleIdToken(serverClientId: serverClientId); + return await googleIdToken(serverClientId: serverClientId); case GoogleFlow.desktop: - return googleDesktopIdToken(clientId: desktopClientId); + return await googleDesktopIdToken(clientId: desktopClientId); // coverage:ignore-end case GoogleFlow.none: return null; diff --git a/crdt_sync_flutter/lib/src/google_sign_in.dart b/crdt_sync_flutter/lib/src/google_sign_in.dart index 2f56a8b..8c25daf 100644 --- a/crdt_sync_flutter/lib/src/google_sign_in.dart +++ b/crdt_sync_flutter/lib/src/google_sign_in.dart @@ -46,7 +46,7 @@ Future googleIdToken({ required String serverClientId, Future Function()? signInFn, }) async { - if (signInFn != null) return signInFn(); + if (signInFn != null) return await signInFn(); if (serverClientId.isEmpty) { log( 'Google sign-in unavailable: no server client id was compiled in; ' diff --git a/crdt_sync_flutter/pubspec.yaml b/crdt_sync_flutter/pubspec.yaml index c2de001..d6f1f90 100644 --- a/crdt_sync_flutter/pubspec.yaml +++ b/crdt_sync_flutter/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: crypto: 3.0.7 flutter: sdk: flutter - flutter_secure_storage: 11.0.0 + flutter_secure_storage: 11.1.1 # A real dependency, not a dev one: lib/testing/ ships the keystore fake so # consuming apps can test their own sync wiring without rebuilding it. flutter_test: @@ -34,4 +34,4 @@ dependencies: uuid: 4.6.0 dev_dependencies: - very_good_analysis: ^10.3.0 + very_good_analysis: ^11.0.0 diff --git a/design_system/pubspec.yaml b/design_system/pubspec.yaml index adc9721..168cc52 100644 --- a/design_system/pubspec.yaml +++ b/design_system/pubspec.yaml @@ -17,6 +17,6 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - very_good_analysis: ^10.3.0 + very_good_analysis: ^11.0.0 flutter: diff --git a/github_device_auth/pubspec.lock b/github_device_auth/pubspec.lock index f7273e3..46ee6b9 100644 --- a/github_device_auth/pubspec.lock +++ b/github_device_auth/pubspec.lock @@ -281,10 +281,10 @@ packages: dependency: "direct dev" description: name: very_good_analysis - sha256: "481af67ab5877af20325251dc215a4ebac7666a1c8cf09198ffd457bc612b33d" + sha256: "0bd5eb8d6be76aa0d71e70cbdae6cac8f784f761170568e3c2214a6948c7f6d3" url: "https://pub.dev" source: hosted - version: "10.3.0" + version: "11.0.0" vm_service: dependency: transitive description: @@ -302,5 +302,5 @@ packages: source: hosted version: "1.1.1" sdks: - dart: ">=3.12.2 <4.0.0" + dart: ">=3.13.0 <4.0.0" flutter: ">=3.44.0" diff --git a/github_device_auth/pubspec.yaml b/github_device_auth/pubspec.yaml index 627f327..c5c379f 100644 --- a/github_device_auth/pubspec.yaml +++ b/github_device_auth/pubspec.yaml @@ -18,6 +18,6 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - very_good_analysis: ^10.3.0 + very_good_analysis: ^11.0.0 flutter: diff --git a/sync_settings_ui/pubspec.yaml b/sync_settings_ui/pubspec.yaml index 087d13e..497d45b 100644 --- a/sync_settings_ui/pubspec.yaml +++ b/sync_settings_ui/pubspec.yaml @@ -22,6 +22,6 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - very_good_analysis: ^10.3.0 + very_good_analysis: ^11.0.0 flutter: