From f91287dec2297df41a339c1106850c4cf179f67f Mon Sep 17 00:00:00 2001
From: Victoria Brekenfeld <4404502+Drakulix@users.noreply.github.com>
Date: Mon, 2 Oct 2023 17:51:33 +0200
Subject: [PATCH] chore: Update calloop (#173)

* chore: Update calloop

* chore: Allow compiling without windowing system

* CI: Add test without any features
---
 .github/workflows/ci.yml | 1 +
 cosmic-config/Cargo.toml | 2 +-
 iced                     | 2 +-
 src/lib.rs               | 9 +++++----
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a31b53b3..7bd7bf50 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -41,6 +41,7 @@ jobs:
       fail-fast: false
       matrix:
         features:
+        - "" # for cosmic-comp, don't remove!
         - 'winit_debug'
         - 'winit_tokio'
         - winit
diff --git a/cosmic-config/Cargo.toml b/cosmic-config/Cargo.toml
index 84174405..9e9c73c5 100644
--- a/cosmic-config/Cargo.toml
+++ b/cosmic-config/Cargo.toml
@@ -10,7 +10,7 @@ subscription = ["iced_futures"]
 
 [dependencies]
 atomicwrites = "0.4.0"
-calloop = { version = "0.10.5", optional = true }
+calloop = { version = "0.12.2", optional = true }
 dirs = "5.0.1"
 notify = "6.0.0"
 ron = "0.8.0"
diff --git a/iced b/iced
index 92fe8260..a1105327 160000
--- a/iced
+++ b/iced
@@ -1 +1 @@
-Subproject commit 92fe8260f80b3a9cb79ae2e707b844219bc4809d
+Subproject commit a11053272d8c489514d91b0cf0dde574e25da297
diff --git a/src/lib.rs b/src/lib.rs
index 5c063539..2785e4e4 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -3,21 +3,22 @@
 
 #![allow(clippy::module_name_repetitions)]
 
-#[cfg(all(not(feature = "wayland"), not(feature = "winit")))]
-compile_error!("must define `wayland` or `winit` feature");
-
 #[cfg(all(feature = "wayland", feature = "winit"))]
 compile_error!("cannot use `wayland` feature with `winit");
 
 /// Recommended default imports.
 pub mod prelude {
     pub use crate::ext::*;
-    pub use crate::{Also, ApplicationExt, Apply, Element, Renderer, Theme};
+    #[cfg(any(feature = "winit", feature = "wayland"))]
+    pub use crate::ApplicationExt;
+    pub use crate::{Also, Apply, Element, Renderer, Theme};
 }
 
 pub use apply::{Also, Apply};
 
+#[cfg(any(feature = "winit", feature = "wayland"))]
 pub mod app;
+#[cfg(any(feature = "winit", feature = "wayland"))]
 pub use app::{Application, ApplicationExt};
 
 #[cfg(feature = "applet")]