Upgrade packages

bostrot · Nov 11, 2024 · dae7af6 · dae7af6
1 parent e6ce8af
commit dae7af6
Show file tree

Hide file tree

Showing 6 changed files with 81 additions and 44 deletions.
diff --git a/lib/nav/panelist.dart b/lib/nav/panelist.dart
@@ -14,7 +14,9 @@ final List<NavigationPaneItem> originalItems = [
     title: Text('homepage-text'.i18n()),
     body: const SizedBox.shrink(),
     onTap: () {
-      if (router.location != '/') router.pushNamed('home');
+      if (router.routerDelegate.currentConfiguration.uri.toString() != '/') {
+        router.pushNamed('home');
+      }
     },
   ),
   PaneItem(
@@ -23,7 +25,8 @@ final List<NavigationPaneItem> originalItems = [
     title: Text('managequickactions-text'.i18n()),
     body: const SizedBox.shrink(),
     onTap: () {
-      if (router.location != '/quickactions') {
+      if (router.routerDelegate.currentConfiguration.uri.toString() !=
+          '/quickactions') {
         router.pushNamed('quickactions');
       }
     },
@@ -34,7 +37,8 @@ final List<NavigationPaneItem> originalItems = [
     title: Text('templates-text'.i18n()),
     body: const SizedBox.shrink(),
     onTap: () {
-      if (router.location != '/templates') {
+      if (router.routerDelegate.currentConfiguration.uri.toString() !=
+          '/templates') {
         router.pushNamed('templates');
       }
     },
@@ -63,7 +67,8 @@ final List<NavigationPaneItem> footerItems = [
     title: Text('settings-text'.i18n()),
     body: const SizedBox.shrink(),
     onTap: () {
-      if (router.location != '/settings') router.pushNamed('settings');
+      if (router.routerDelegate.currentConfiguration.uri.toString() !=
+          '/settings') router.pushNamed('settings');
     },
   ),
   LinkPaneItemAction(

diff --git a/lib/nav/root_screen.dart b/lib/nav/root_screen.dart
@@ -105,7 +105,7 @@ class RootPageState extends State<RootPage> with WindowListener {
   }
 
   int _calculateSelectedIndex(BuildContext context) {
-    final location = router.location;
+    final location = router.routerDelegate.currentConfiguration.uri.toString();
     int indexOriginal = originalItems
         .toList()
         .indexWhere((element) => element.key == Key(location));

diff --git a/pubspec.lock b/pubspec.lock
@@ -109,10 +109,10 @@ packages:
     dependency: transitive
     description:
       name: dart_pubspec_licenses
-      sha256: "0617752e2b1d3b28fd874891c7780416c70673ea5ce283f8df4e1c25635eec13"
+      sha256: a488baa010044452b208bc35c6dd62ac072a1ea918f796e4381d5aa1b21cfa41
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.3"
+    version: "3.0.1"
   desktop_window:
     dependency: "direct main"
     description:
@@ -194,18 +194,18 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04
+      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.3"
+    version: "5.0.0"
   flutter_localization:
     dependency: "direct main"
     description:
       name: flutter_localization
-      sha256: a65ae241b865f2780f2ef624a4cdd019ca894d0b7df0a0b77190746ef0b9c8fa
+      sha256: "9b3b8825146a3850297a0ec3686b326d618328dca4cd5178b764af9303a26379"
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.14"
+    version: "0.2.2"
   flutter_localizations:
     dependency: "direct main"
     description: flutter
@@ -215,18 +215,18 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_markdown
-      sha256: "04c4722cc36ec5af38acc38ece70d22d3c2123c61305d555750a091517bbe504"
+      sha256: f0e599ba89c9946c8e051780f0ec99aba4ba15895e0380a7ab68f420046fc44e
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.23"
+    version: "0.7.4+1"
   flutter_oss_licenses:
     dependency: "direct dev"
     description:
       name: flutter_oss_licenses
-      sha256: "44d359662281a4e8c2ee110ab8d9274782e368323fe6fbb389a79adbf81c5899"
+      sha256: "1219e0e03faac80e68a554b79447d4936c79081d698abca912cc123fb77094aa"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.3"
+    version: "3.0.2"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
@@ -265,10 +265,10 @@ packages:
     dependency: "direct main"
     description:
       name: go_router
-      sha256: "2cb236ba3f923043fdbe14a6a3a796b8c250e85658e28caee3e86c0c275847e5"
+      sha256: ce89c5a993ca5eea74535f798478502c30a625ecb10a1de4d7fef5cd1bcac2a4
       url: "https://pub.dev"
     source: hosted
-    version: "8.2.0"
+    version: "14.4.1"
   http:
     dependency: "direct main"
     description:
@@ -353,10 +353,10 @@ packages:
     dependency: transitive
     description:
       name: lints
-      sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452"
+      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "5.0.0"
   localization:
     dependency: "direct main"
     description:
@@ -457,18 +457,18 @@ packages:
     dependency: "direct main"
     description:
       name: package_info_plus
-      sha256: "7e76fad405b3e4016cd39d08f455a4eb5199723cf594cd1b8916d47140d93017"
+      sha256: da8d9ac8c4b1df253d1a328b7bf01ae77ef132833479ab40763334db13b91cce
       url: "https://pub.dev"
     source: hosted
-    version: "4.2.0"
+    version: "8.1.1"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
       name: package_info_plus_platform_interface
-      sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6"
+      sha256: ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.1"
   path:
     dependency: transitive
     description:
@@ -553,10 +553,10 @@ packages:
     dependency: "direct main"
     description:
       name: re_editor
-      sha256: bbe54f2b3778b2b350876d59cb43734e60ffc6c22483643b5b38e0b854f4d2e6
+      sha256: "2169c114c7877bcaae72d6e8b69cdaa2a9cded69a51e3cf26209dad4a3ed2b9c"
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.0"
+    version: "0.6.0"
   re_highlight:
     dependency: "direct main"
     description:
@@ -577,10 +577,42 @@ packages:
     dependency: transitive
     description:
       name: screen_retriever
-      sha256: "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90"
+      sha256: "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.0"
+  screen_retriever_linux:
+    dependency: transitive
+    description:
+      name: screen_retriever_linux
+      sha256: f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.0"
+  screen_retriever_macos:
+    dependency: transitive
+    description:
+      name: screen_retriever_macos
+      sha256: "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149"
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.9"
+    version: "0.2.0"
+  screen_retriever_platform_interface:
+    dependency: transitive
+    description:
+      name: screen_retriever_platform_interface
+      sha256: ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.0"
+  screen_retriever_windows:
+    dependency: transitive
+    description:
+      name: screen_retriever_windows
+      sha256: "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.0"
   scroll_pos:
     dependency: transitive
     description:
@@ -710,10 +742,10 @@ packages:
     dependency: "direct main"
     description:
       name: system_theme
-      sha256: "1f208db140a3d1e1eac2034b54920d95699c1534df576ced44b3312c5de3975f"
+      sha256: "5f93485401689601d4636a695f99f7c70a30873ee68c1d95025d908a3386be7e"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "3.1.2"
   system_theme_web:
     dependency: transitive
     description:
@@ -854,10 +886,10 @@ packages:
     dependency: "direct main"
     description:
       name: window_manager
-      sha256: "8699323b30da4cdbe2aa2e7c9de567a6abd8a97d9a5c850a3c86dcd0b34bbfbf"
+      sha256: "732896e1416297c63c9e3fb95aea72d0355f61390263982a47fd519169dc5059"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.9"
+    version: "0.4.3"
   xdg_directories:
     dependency: transitive
     description:

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -20,30 +20,30 @@ dependencies:
   file_picker: ^8.0.3
   fluent_ui: ^4.7.2
   flutter_acrylic: ^1.1.3
-  flutter_localization: ^0.1.13
-  flutter_markdown: ^0.6.17+1
-  go_router: ^8.0.1
+  flutter_localization: ^0.2.2
+  flutter_markdown: ^0.7.4+1
+  go_router: ^14.4.1
   http: ^1.1.0
   localization: ^2.1.0
-  package_info_plus: ^4.1.0
+  package_info_plus: ^8.1.1
   plausible_analytics: ^0.3.0
   provider: ^6.0.5
   shared_preferences: ^2.2.0
   shelf: ^1.4.1
   shelf_static: ^1.1.2
   system_info2: ^4.0.0
-  system_theme: ^2.3.1
+  system_theme: ^3.1.2
   url_launcher: ^6.1.12
-  window_manager: ^0.3.5
+  window_manager: ^0.4.3
   yaml: ^3.1.2
-  re_editor: ^0.2.0
+  re_editor: ^0.6.0
   re_highlight: ^0.0.3
 dependency_overrides:
   http: ^1.1.0
 
 dev_dependencies:
-  flutter_lints: ^2.0.1
-  flutter_oss_licenses: ^2.0.1
+  flutter_lints: ^5.0.0
+  flutter_oss_licenses: ^3.0.2
   flutter_test:
     sdk: flutter
   msix: ^3.14.2

diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc
@@ -9,7 +9,7 @@
 #include <desktop_window/desktop_window_plugin.h>
 #include <flutter_acrylic/flutter_acrylic_plugin.h>
 #include <flutter_localization/flutter_localization_plugin_c_api.h>
-#include <screen_retriever/screen_retriever_plugin.h>
+#include <screen_retriever_windows/screen_retriever_windows_plugin_c_api.h>
 #include <system_theme/system_theme_plugin.h>
 #include <url_launcher_windows/url_launcher_windows.h>
 #include <window_manager/window_manager_plugin.h>
@@ -21,8 +21,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
       registry->GetRegistrarForPlugin("FlutterAcrylicPlugin"));
   FlutterLocalizationPluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("FlutterLocalizationPluginCApi"));
-  ScreenRetrieverPluginRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("ScreenRetrieverPlugin"));
+  ScreenRetrieverWindowsPluginCApiRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("ScreenRetrieverWindowsPluginCApi"));
   SystemThemePluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("SystemThemePlugin"));
   UrlLauncherWindowsRegisterWithRegistrar(

diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake
@@ -6,7 +6,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
   desktop_window
   flutter_acrylic
   flutter_localization
-  screen_retriever
+  screen_retriever_windows
   system_theme
   url_launcher_windows
   window_manager