From eba9e6f76312ccea41ba3cdbd9c58e819273074b Mon Sep 17 00:00:00 2001 From: Fabian Freund Date: Sun, 25 May 2025 22:48:33 +0200 Subject: [PATCH] upgrade deps and fix lints --- .../features/geckoview/domain/providers.dart | 6 +++-- .../presentation/dialogs/web_page_dialog.dart | 8 +++--- .../widgets/browser_modules/browser_view.dart | 4 +-- .../candidates/open_image_new_tab.dart | 4 +-- .../presentation/candidates/open_new_tab.dart | 4 +-- .../presentation/hooks/on_initialization.dart | 2 +- app/pubspec.yaml | 25 +++++++++++++------ app/pubspec_overrides.yaml | 7 +++++- 8 files changed, 38 insertions(+), 22 deletions(-) diff --git a/app/lib/features/geckoview/domain/providers.dart b/app/lib/features/geckoview/domain/providers.dart index df313e33..d40a2239 100644 --- a/app/lib/features/geckoview/domain/providers.dart +++ b/app/lib/features/geckoview/domain/providers.dart @@ -51,8 +51,10 @@ GeckoSelectionActionService selectionActionService(Ref ref) { logger.e('No default search bang found'); } }), - FindInPageAction((text) { - ref.read(findInPageControllerProvider.notifier).findAll(text: text); + FindInPageAction((text) async { + await ref + .read(findInPageControllerProvider.notifier) + .findAll(text: text); }), ShareAction((text) async { await SharePlus.instance.share(ShareParams(text: text)); diff --git a/app/lib/features/geckoview/features/browser/presentation/dialogs/web_page_dialog.dart b/app/lib/features/geckoview/features/browser/presentation/dialogs/web_page_dialog.dart index 6733c84b..f3ad0b3f 100644 --- a/app/lib/features/geckoview/features/browser/presentation/dialogs/web_page_dialog.dart +++ b/app/lib/features/geckoview/features/browser/presentation/dialogs/web_page_dialog.dart @@ -146,8 +146,8 @@ class WebPageDialog extends HookConsumerWidget { ui_helper.showTabSwitchMessage( context, - onSwitch: () { - repo.selectTab(tabId); + onSwitch: () async { + await repo.selectTab(tabId); }, ); @@ -171,8 +171,8 @@ class WebPageDialog extends HookConsumerWidget { ui_helper.showTabSwitchMessage( context, - onSwitch: () { - repo.selectTab(tabId); + onSwitch: () async { + await repo.selectTab(tabId); }, ); diff --git a/app/lib/features/geckoview/features/browser/presentation/widgets/browser_modules/browser_view.dart b/app/lib/features/geckoview/features/browser/presentation/widgets/browser_modules/browser_view.dart index 7c0274ee..c191597d 100644 --- a/app/lib/features/geckoview/features/browser/presentation/widgets/browser_modules/browser_view.dart +++ b/app/lib/features/geckoview/features/browser/presentation/widgets/browser_modules/browser_view.dart @@ -68,8 +68,8 @@ class _BrowserViewState extends ConsumerState useOnInitialization(() async { await ref.read(generalSettingsRepositoryProvider.notifier).fetch().then(( settings, - ) { - ref + ) async { + await ref .read(browserDataServiceProvider.notifier) .deleteDataOnEngineStart(settings.deleteBrowsingDataOnQuit); }); diff --git a/app/lib/features/geckoview/features/contextmenu/presentation/candidates/open_image_new_tab.dart b/app/lib/features/geckoview/features/contextmenu/presentation/candidates/open_image_new_tab.dart index c2e804de..cc5214b3 100644 --- a/app/lib/features/geckoview/features/contextmenu/presentation/candidates/open_image_new_tab.dart +++ b/app/lib/features/geckoview/features/contextmenu/presentation/candidates/open_image_new_tab.dart @@ -40,8 +40,8 @@ class OpenImageInNewTab extends HookConsumerWidget { showTabSwitchMessage( context, - onSwitch: () { - repo.selectTab(tabId); + onSwitch: () async { + await repo.selectTab(tabId); }, ); diff --git a/app/lib/features/geckoview/features/contextmenu/presentation/candidates/open_new_tab.dart b/app/lib/features/geckoview/features/contextmenu/presentation/candidates/open_new_tab.dart index ff24b5d1..c422e58e 100644 --- a/app/lib/features/geckoview/features/contextmenu/presentation/candidates/open_new_tab.dart +++ b/app/lib/features/geckoview/features/contextmenu/presentation/candidates/open_new_tab.dart @@ -40,8 +40,8 @@ class OpenInNewTab extends HookConsumerWidget { showTabSwitchMessage( context, - onSwitch: () { - repo.selectTab(tabId); + onSwitch: () async { + await repo.selectTab(tabId); }, ); diff --git a/app/lib/presentation/hooks/on_initialization.dart b/app/lib/presentation/hooks/on_initialization.dart index 878dc8f6..2a2a5f46 100644 --- a/app/lib/presentation/hooks/on_initialization.dart +++ b/app/lib/presentation/hooks/on_initialization.dart @@ -4,7 +4,7 @@ import 'package:flutter_hooks/flutter_hooks.dart'; void useOnInitialization(FutureOr Function() callback) { useEffect(() { - Future.microtask(callback); + unawaited(Future.microtask(callback)); return null; }, []); } diff --git a/app/pubspec.yaml b/app/pubspec.yaml index 58abed76..eb138915 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -24,14 +24,13 @@ dependencies: flutter_material_design_icons: ^1.1.7447 flutter_mozilla_components: path: ../packages/flutter_mozilla_components - flutter_reorderable_grid_view: - path: ../../flutter-reorderable-grid-view + flutter_reorderable_grid_view: ^5.5.0 flutter_secure_storage: ^10.0.0-beta.4 flutter_slidable: ^4.0.0 flutter_svg: ^2.1.0 go_router: ^15.1.2 google_fonts: ^6.2.1 - home_widget: ^0.7.0+1 + home_widget: ^0.8.0 hooks_riverpod: ^2.6.1 html: ^0.15.6 http: ^1.4.0 @@ -55,11 +54,12 @@ dependencies: share_plus: ^11.0.0 simple_intent_receiver: path: ../packages/simple_intent_receiver - skeletonizer: ^1.4.3 + skeletonizer: ^2.0.1 sliver_tools: ^0.2.12 speech_to_text_google_dialog: git: url: https://github.com/FaFre/speech_to_text_google_dialog.git + sqlite3: ^2.7.6 sqlite3_flutter_libs: ^0.5.33 text_scroll: ^0.2.0 timeago: ^3.7.1 @@ -74,19 +74,28 @@ dependencies: url_launcher: ^6.3.1 uuid: ^4.5.1 + +dependency_overrides: + analyzer_plugin: + git: + url: https://github.com/dart-lang/sdk.git + ref: 8c5e06206103f8b2fd7d434ece9248ce9ac31ba4 + path: pkg/analyzer_plugin + dev_dependencies: + analyzer_plugin: ^0.13.1-wip build_runner: ^2.4.15 copy_with_extension_gen: ^6.0.1 - custom_lint: ^0.7.3 + custom_lint: ^0.7.5 dependency_validator: ^5.0.2 drift_dev: ^2.26.1 - fast_equatable_lint: ^0.3.1 + fast_equatable_lint: ^0.3.2 flutter_launcher_icons: ^0.14.3 go_router_builder: ^2.9.0 json_serializable: ^6.9.5 lint: ^2.8.0 - riverpod_generator: ^2.6.4 - riverpod_lint: ^2.6.4 + riverpod_generator: ^2.6.5 + riverpod_lint: ^2.6.5 flutter: uses-material-design: true diff --git a/app/pubspec_overrides.yaml b/app/pubspec_overrides.yaml index d1cf0013..0eeaab94 100644 --- a/app/pubspec_overrides.yaml +++ b/app/pubspec_overrides.yaml @@ -1,5 +1,10 @@ -# melos_managed_dependency_overrides: flutter_mozilla_components,simple_intent_receiver +# melos_managed_dependency_overrides: flutter_mozilla_components,simple_intent_receiver,analyzer_plugin dependency_overrides: + analyzer_plugin: + git: + url: https://github.com/dart-lang/sdk.git + ref: 8c5e06206103f8b2fd7d434ece9248ce9ac31ba4 + path: pkg/analyzer_plugin flutter_mozilla_components: path: ../packages/flutter_mozilla_components simple_intent_receiver: