Merge pull request pop-os#618 from pop-os/libcosmic-rebase

Update libcosmic/iced

Author: jackpot51

Cargo.lock

@@ -63,19 +63,18 @@ uzers = "0.12.0"
 [dependencies.libcosmic]
 git = "https://github.com/pop-os/libcosmic.git"
 default-features = false
-features = ["a11y", "clipboard", "multi-window", "tokio"]
+features = ["a11y", "multi-window", "tokio", "winit"]
 
 [dependencies.smol_str]
 version = "0.2.1"
 features = ["serde"]
 
 [features]
-default = ["bzip2", "desktop", "gvfs", "liblzma", "notify", "winit", "wgpu"]
+default = ["bzip2", "desktop", "gvfs", "liblzma", "notify", "wgpu"]
 desktop = ["libcosmic/desktop", "dep:xdg"]
 gvfs = ["dep:gio", "dep:glib"]
 notify = ["dep:notify-rust"]
 wayland = ["libcosmic/wayland", "dep:wayland-client"]
-winit = ["libcosmic/winit"]
 wgpu = ["libcosmic/wgpu"]
 
 [profile.dev]

Cargo.toml

@@ -1,7 +1,7 @@
 use cosmic::{
-    app::{self, Command, Core, Settings},
+    app::{self, Core, Settings, Task},
     executor,
-    iced::{subscription::Subscription, window},
+    iced::{window, Subscription},
     widget, Application, Element,
 };
 use cosmic_files::dialog::{Dialog, DialogKind, DialogMessage, DialogResult};
@@ -42,18 +42,18 @@ impl Application for App {
         &mut self.core
     }
 
-    fn init(core: Core, _flags: Self::Flags) -> (Self, Command<Message>) {
+    fn init(core: Core, _flags: Self::Flags) -> (Self, Task<Message>) {
         (
             Self {
                 core,
                 dialog_opt: None,
                 result_opt: None,
             },
-            Command::none(),
+            Task::none(),
         )
     }
 
-    fn update(&mut self, message: Message) -> Command<Message> {
+    fn update(&mut self, message: Message) -> Task<Message> {
         match message {
             Message::DialogMessage(dialog_message) => {
                 if let Some(dialog) = &mut self.dialog_opt {
@@ -78,7 +78,7 @@ impl Application for App {
             }
         }
 
-        Command::none()
+        Task::none()
     }
 
     fn view_window(&self, window_id: window::Id) -> Element<Message> {