deps: Unify iced version used by cosmic-comp and cosmic-time

Cargo.toml

@@ -30,10 +30,8 @@ libsystemd = { version = "0.5", optional = true }
 wayland-backend = "0.1.0"
 wayland-scanner = "0.30.0"
 cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", branch = "main", default-features = false, features = ["server"] }
-libcosmic = { git = "https://github.com/pop-os/libcosmic", rev = "31f7e97d5b", default-features = false, features = ["tiny_skia"] }
+libcosmic = { git = "https://github.com/pop-os/libcosmic", rev = "5765053", default-features = false, features = ["tiny_skia"] }
-iced_core = { git = "https://github.com/pop-os/libcosmic", rev = "31f7e97d5b" }
+iced_tiny_skia = { git = "https://github.com/pop-os/libcosmic", rev = "5765053" }
-iced_renderer = { git = "https://github.com/pop-os/libcosmic", rev = "31f7e97d5b" }
-iced_tiny_skia = { git = "https://github.com/pop-os/libcosmic", rev = "31f7e97d5b" }
 tiny-skia = "0.9"
 ordered-float = "3.0"
 glow = "0.11.2"
@@ -42,7 +40,7 @@ tracing-journald = "0.3.0"
 tracing = { version = "0.1.37", features = ["max_level_debug", "release_max_level_info"] }
 puffin = { version = "0.14.3", optional = true }
 puffin_egui = { version = "0.21.0", optional = true }
-cosmic-time = "0.2.0"
+cosmic-time = { git = "https://github.com/pop-os/cosmic-time", rev = "35dd0b8", default-features = false, features = ["libcosmic"] }
 
 [dependencies.id_tree]
 git = "https://github.com/Drakulix/id-tree.git"

src/shell/element/stack.rs

@@ -5,7 +5,7 @@ use crate::{
     wayland::handlers::screencopy::ScreencopySessions,
 };
 use calloop::LoopHandle;
-use cosmic::Element;
+use cosmic::{iced_core::Color, Element};
 use cosmic_protocols::screencopy::v1::server::zcosmic_screencopy_session_v1::InputType;
 use smithay::{
     backend::{
@@ -311,8 +311,8 @@ impl Program for CosmicStackInternal {
         mask.clone().unwrap()
     }
 
-    fn background_color(&self) -> iced_core::Color {
+    fn background_color(&self) -> Color {
-        iced_core::Color {
+        Color {
             r: 0.1176,
             g: 0.1176,
             b: 0.1176,

src/shell/element/window.rs

@@ -12,7 +12,7 @@ use crate::{
     wayland::handlers::screencopy::ScreencopySessions,
 };
 use calloop::LoopHandle;
-use cosmic::iced::Command;
+use cosmic::{iced::Command, iced_core::Color};
 use cosmic_protocols::screencopy::v1::server::zcosmic_screencopy_session_v1::InputType;
 use smithay::{
     backend::{
@@ -258,16 +258,16 @@ impl Program for CosmicWindowInternal {
         mask.clone().unwrap()
     }
 
-    fn background_color(&self) -> iced_core::Color {
+    fn background_color(&self) -> Color {
         if self.window.is_activated() {
-            iced_core::Color {
+            Color {
                 r: 0.1176,
                 g: 0.1176,
                 b: 0.1176,
                 a: 1.0,
             }
         } else {
-            iced_core::Color {
+            Color {
                 r: 0.153,
                 g: 0.153,
                 b: 0.153,

src/utils/iced.rs

@@ -13,6 +13,8 @@ use cosmic::{
         window::{Event as WindowEvent, Id},
         Command, Point as IcedPoint, Rectangle as IcedRectangle, Size as IcedSize,
     },
+    iced_core::{clipboard::Null as NullClipboard, renderer::Style, Color},
+    iced_renderer::Backend as BackendWrapper,
     iced_runtime::{
         command::Action,
         program::{Program as IcedProgram, State},
@@ -20,8 +22,6 @@ use cosmic::{
     },
     Renderer as IcedRenderer, Theme,
 };
-use iced_core::{renderer::Style, Color};
-use iced_renderer::Backend as BackendWrapper;
 use iced_tiny_skia::{
     graphics::{damage, Primitive, Viewport},
     Backend,
@@ -279,7 +279,7 @@ impl<P: Program + Send + 'static> IcedElementInternal<P> {
                 &Style {
                     text_color: self.theme.cosmic().on_bg_color().into(),
                 },
-                &mut iced_core::clipboard::Null,
+                &mut NullClipboard,
                 &mut self.debug,
             )
             .1