chore: Update calloop (#173)
* chore: Update calloop * chore: Allow compiling without windowing system * CI: Add test without any features
This commit is contained in:
parent
e1d1b0bad5
commit
f91287dec2
4 changed files with 8 additions and 6 deletions
1
.github/workflows/ci.yml
vendored
1
.github/workflows/ci.yml
vendored
|
|
@ -41,6 +41,7 @@ jobs:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
features:
|
features:
|
||||||
|
- "" # for cosmic-comp, don't remove!
|
||||||
- 'winit_debug'
|
- 'winit_debug'
|
||||||
- 'winit_tokio'
|
- 'winit_tokio'
|
||||||
- winit
|
- winit
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ subscription = ["iced_futures"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
atomicwrites = "0.4.0"
|
atomicwrites = "0.4.0"
|
||||||
calloop = { version = "0.10.5", optional = true }
|
calloop = { version = "0.12.2", optional = true }
|
||||||
dirs = "5.0.1"
|
dirs = "5.0.1"
|
||||||
notify = "6.0.0"
|
notify = "6.0.0"
|
||||||
ron = "0.8.0"
|
ron = "0.8.0"
|
||||||
|
|
|
||||||
2
iced
2
iced
|
|
@ -1 +1 @@
|
||||||
Subproject commit 92fe8260f80b3a9cb79ae2e707b844219bc4809d
|
Subproject commit a11053272d8c489514d91b0cf0dde574e25da297
|
||||||
|
|
@ -3,21 +3,22 @@
|
||||||
|
|
||||||
#![allow(clippy::module_name_repetitions)]
|
#![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"))]
|
#[cfg(all(feature = "wayland", feature = "winit"))]
|
||||||
compile_error!("cannot use `wayland` feature with `winit");
|
compile_error!("cannot use `wayland` feature with `winit");
|
||||||
|
|
||||||
/// Recommended default imports.
|
/// Recommended default imports.
|
||||||
pub mod prelude {
|
pub mod prelude {
|
||||||
pub use crate::ext::*;
|
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};
|
pub use apply::{Also, Apply};
|
||||||
|
|
||||||
|
#[cfg(any(feature = "winit", feature = "wayland"))]
|
||||||
pub mod app;
|
pub mod app;
|
||||||
|
#[cfg(any(feature = "winit", feature = "wayland"))]
|
||||||
pub use app::{Application, ApplicationExt};
|
pub use app::{Application, ApplicationExt};
|
||||||
|
|
||||||
#[cfg(feature = "applet")]
|
#[cfg(feature = "applet")]
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue