chore(cargo): update dependencies

app/Cargo.toml

@@ -6,7 +6,6 @@ license = "GPL-3.0"
 rust-version = "1.65.0"
 
 [dependencies]
-apply = "0.3.0"
 async-channel = "2.1.1"
 color-eyre = "0.6.2"
 cosmic-bg-config = { workspace = true }
@@ -33,12 +32,11 @@ cosmic-comp-config = { workspace = true }
 cosmic-panel-config = { workspace = true }
 tracing = "0.1.40"
 tracing-subscriber = "0.3.18"
-log = "0.4"
 url = "2.5.0"
 freedesktop-desktop-entry = "0.5.0"
 notify = "6.1.1"
 anyhow = "1.0"
-image = "0.24.8"
+image = "0.25"
 serde = { version = "1.0.196", features = ["derive"] }
 ashpd = { version = "0.7", default-features = false }
 ron = "0.8"

app/src/pages/desktop/dock/mod.rs

@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use apply::Apply;
+use cosmic::Apply;
 use cosmic::{
     cosmic_config::{ConfigSet, CosmicConfigEntry},
     widget::{settings, text, toggler},
@@ -8,8 +8,8 @@ use cosmic::{
 };
 use cosmic_panel_config::{CosmicPanelConfig, CosmicPanelContainerConfig};
 use cosmic_settings_page::{self as page, section, Section};
-use log::error;
 use slotmap::SlotMap;
+use tracing::error;
 
 use crate::pages::desktop::panel::inner::{
     add_panel, behavior_and_position, configuration, reset_button, style,

app/src/pages/desktop/options.rs

@@ -2,12 +2,11 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 use super::Message;
-use apply::Apply;
 use cosmic::{
     iced::Length,
     theme,
     widget::{button, container, horizontal_space, icon, row, settings, toggler},
-    Element,
+    Apply, Element,
 };
 
 use cosmic_settings_page::Section;

app/src/pages/desktop/panel/inner.rs

@@ -9,7 +9,7 @@ use cosmic::{
     Element,
 };
 
-use apply::Apply;
+use cosmic::Apply;
 use cosmic_panel_config::{
     AutoHide, CosmicPanelBackground, CosmicPanelConfig, CosmicPanelContainerConfig,
     CosmicPanelOuput, PanelAnchor, PanelSize,

app/src/pages/desktop/wallpaper/mod.rs

@@ -14,8 +14,7 @@ use std::{
     sync::Arc,
 };
 
-use apply::Apply;
-use cosmic::{command, Command};
+use cosmic::{command, Apply, Command};
 use cosmic::{
     dialog::file_chooser,
     widget::{

app/src/pages/desktop/workspaces.rs

@@ -3,12 +3,11 @@
 
 // TODO make settings work
 
-use apply::Apply;
 use cosmic::widget::settings;
 use cosmic::{
     cosmic_config::{self, ConfigGet, ConfigSet},
     widget::radio,
-    Element,
+    Apply, Element,
 };
 use cosmic_comp_config::workspace::{WorkspaceConfig, WorkspaceLayout, WorkspaceMode};
 use cosmic_settings_page::Section;

app/src/pages/display/graphics.rs

@@ -3,11 +3,10 @@
 
 use super::{Message, NightLight};
 use crate::pages;
-use apply::Apply;
 use cosmic::iced_core::{Alignment, Length, Padding};
 use cosmic::prelude::CollectionWidget;
 use cosmic::widget::{button, column, icon, list_column, row, toggler};
-use cosmic::{Command, Element};
+use cosmic::{Apply, Command, Element};
 use std::sync::Arc;
 
 pub const INTEGRATED: &str = "integrated";

app/src/pages/display/mod.rs

@@ -6,14 +6,13 @@ pub mod graphics;
 pub mod text;
 
 use crate::{app, pages};
-use apply::Apply;
 use arrangement::Arrangement;
 use cosmic::iced::{Alignment, Length};
 use cosmic::iced_widget::scrollable::{Direction, Properties, RelativeOffset};
 use cosmic::widget::{
     column, container, dropdown, list_column, segmented_button, tab_bar, toggler,
 };
-use cosmic::{command, Command, Element};
+use cosmic::{command, Apply, Command, Element};
 use cosmic_randr_shell::{List, Output, OutputKey, Transform};
 use cosmic_settings_page::{self as page, section, Section};
 use slotmap::{Key, SlotMap};

app/src/pages/input/keyboard/mod.rs

@@ -1,4 +1,3 @@
-use apply::Apply;
 use cosmic::{
     iced::{
         self,
@@ -8,6 +7,7 @@ use cosmic::{
     iced_core::Border,
     iced_style, theme,
     widget::{button, container, icon, radio, settings},
+    Apply,
 };
 use cosmic_settings_page::{self as page, section, Section};
 use once_cell::sync::Lazy;

app/src/pages/input/mouse.rs

@@ -1,7 +1,6 @@
-use apply::Apply;
 use cosmic::iced::Alignment;
 use cosmic::widget::{self, row, settings, text};
-use cosmic::Element;
+use cosmic::{Apply, Element};
 use cosmic_comp_config::input::AccelProfile;
 use cosmic_settings_page::Section;
 use cosmic_settings_page::{self as page, section};

app/src/pages/time/date.rs

@@ -1,10 +1,10 @@
 // Copyright 2023 System76 <info@system76.com>
 // SPDX-License-Identifier: GPL-3.0-only
 
-use apply::Apply;
 use cosmic::{
     iced::{widget::horizontal_space, Length},
     widget::settings,
+    Apply,
 };
 use cosmic_settings_page::Section;
 use cosmic_settings_page::{self as page, section};