diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2bc12ba..733933a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,7 +47,7 @@ jobs: ${{ runner.os }}-target-lint- - run: cargo clippy --workspace --all-targets # supported winit versions - - run: cargo clippy --manifest-path imgui-winit-support/Cargo.toml --features winit-19 --features winit-20 --features winit-22 --features winit-23/default --features winit-24/default --all-targets + - run: cargo clippy --manifest-path imgui-winit-support/Cargo.toml --all-features --all-targets - run: cargo clippy --manifest-path imgui-winit-support/Cargo.toml --no-default-features --features winit-19 --all-targets - run: cargo clippy --manifest-path imgui-winit-support/Cargo.toml --no-default-features --features winit-20 --all-targets - run: cargo clippy --manifest-path imgui-winit-support/Cargo.toml --no-default-features --features winit-22 --all-targets diff --git a/imgui-winit-support/Cargo.toml b/imgui-winit-support/Cargo.toml index 7358841..4ddf28a 100644 --- a/imgui-winit-support/Cargo.toml +++ b/imgui-winit-support/Cargo.toml @@ -18,7 +18,8 @@ winit-23 = { version = "0.23", package = "winit", default-features = false, opti winit-24 = { version = "0.24", package = "winit", default-features = false, optional = true } [features] -default = ["winit-25"] +default = ["winit-24"] +test = ["winit-23/default", "winit-24/default"] # This is phrased as a negative (unlike most features) so that it needs to be # explicitly disabled (and `default-features = false` won't do it). To avoid diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 59149cd..30e3772 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -41,7 +41,13 @@ fn lint_all() -> Result<()> { "cargo clippy --manifest-path imgui-winit-support/Cargo.toml --all-features --all-targets" ) .run()?; - let winits = &["winit-19", "winit-20", "winit-22", "winit-23", "winit-24"]; + let winits = &[ + "winit-19", + "winit-20", + "winit-22", + "winit-23/default", + "winit-24/default", + ]; for &winit in winits { xshell::cmd!("cargo clippy --manifest-path imgui-winit-support/Cargo.toml --no-default-features --features {winit} --all-targets").run()?; } @@ -52,7 +58,13 @@ fn lint_all() -> Result<()> { fn test_all() -> Result<()> { xshell::cmd!("cargo test --workspace --all-targets").run()?; xshell::cmd!("cargo test --workspace --doc").run()?; - let winits = &["winit-19", "winit-20", "winit-22", "winit-23", "winit-24"]; + let winits = &[ + "winit-19", + "winit-20", + "winit-22", + "winit-23/default", + "winit-24/default", + ]; for &winit in winits { xshell::cmd!("cargo test --manifest-path imgui-winit-support/Cargo.toml --no-default-features --features {winit} --all-targets").run()?; }