Skip to content

Upgrade Flutter to 3.27 and upgrade its dependencies as well #3868

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 20, 2025
Merged

Upgrade Flutter to 3.27 and upgrade its dependencies as well #3868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa1f2d8
upgrade flutter to 3.27.2
andrei-toterman Jan 7, 2025
442ffc0
upgrade flutter dependencies
andrei-toterman Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 3rd-party/flutter
Open in desktop
Submodule flutter updated 2038 files
8 changes: 4 additions & 4 deletions src/client/gui/linux/flutter/generated_plugin_registrant.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <file_selector_linux/file_selector_plugin.h>
#include <hotkey_manager_linux/hotkey_manager_linux_plugin.h>
#include <local_notifier/local_notifier_plugin.h>
#include <screen_retriever/screen_retriever_plugin.h>
#include <screen_retriever_linux/screen_retriever_linux_plugin.h>
#include <tray_menu/tray_menu_plugin.h>
#include <url_launcher_linux/url_launcher_plugin.h>
#include <window_manager/window_manager_plugin.h>
Expand All @@ -25,9 +25,9 @@ void fl_register_plugins(FlPluginRegistry* registry) {
g_autoptr(FlPluginRegistrar) local_notifier_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "LocalNotifierPlugin");
local_notifier_plugin_register_with_registrar(local_notifier_registrar);
g_autoptr(FlPluginRegistrar) screen_retriever_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "ScreenRetrieverPlugin");
screen_retriever_plugin_register_with_registrar(screen_retriever_registrar);
g_autoptr(FlPluginRegistrar) screen_retriever_linux_registrar =
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this platform specific call stems from the flutter apis change?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One of the plugins that we used has split up into 3 different plugins, one per platform. That's why the changes say it changed from just screen_retriever to screen_retriever_linux, and from ScreenRetriever to ScreenRetrieverMacos and ScreenRetrieverWindows. It's an approach in Flutter called a 'federated plugin' which allows you to override the plugin implementation for each individual platform more easily.

fl_plugin_registry_get_registrar_for_plugin(registry, "ScreenRetrieverLinuxPlugin");
screen_retriever_linux_plugin_register_with_registrar(screen_retriever_linux_registrar);
g_autoptr(FlPluginRegistrar) tray_menu_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "TrayMenuPlugin");
tray_menu_plugin_register_with_registrar(tray_menu_registrar);
Expand Down
2 changes: 1 addition & 1 deletion src/client/gui/linux/flutter/generated_plugins.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
file_selector_linux
hotkey_manager_linux
local_notifier
screen_retriever
screen_retriever_linux
tray_menu
url_launcher_linux
window_manager
Expand Down
4 changes: 2 additions & 2 deletions src/client/gui/macos/Flutter/GeneratedPluginRegistrant.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import file_selector_macos
import hotkey_manager_macos
import local_notifier
import path_provider_foundation
import screen_retriever
import screen_retriever_macos
import shared_preferences_foundation
import tray_menu
import url_launcher_macos
Expand All @@ -21,7 +21,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
HotkeyManagerMacosPlugin.register(with: registry.registrar(forPlugin: "HotkeyManagerMacosPlugin"))
LocalNotifierPlugin.register(with: registry.registrar(forPlugin: "LocalNotifierPlugin"))
PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
ScreenRetrieverPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverPlugin"))
ScreenRetrieverMacosPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverMacosPlugin"))
SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
TrayMenuPlugin.register(with: registry.registrar(forPlugin: "TrayMenuPlugin"))
UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
Expand Down
Loading
Loading