diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2f81ab1..733933a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -51,8 +51,8 @@ jobs: - 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 - - run: cargo clippy --manifest-path imgui-winit-support/Cargo.toml --no-default-features --features winit-23 --all-targets - - run: cargo clippy --manifest-path imgui-winit-support/Cargo.toml --no-default-features --features winit-24 --all-targets + - run: cargo clippy --manifest-path imgui-winit-support/Cargo.toml --no-default-features --features winit-23/default --all-targets + - run: cargo clippy --manifest-path imgui-winit-support/Cargo.toml --no-default-features --features winit-24/default --all-targets rustfmt: name: Check rustfmt runs-on: ubuntu-latest @@ -138,8 +138,8 @@ jobs: - run: cargo test --manifest-path imgui-winit-support/Cargo.toml --no-default-features --features winit-19 - run: cargo test --manifest-path imgui-winit-support/Cargo.toml --no-default-features --features winit-20 - run: cargo test --manifest-path imgui-winit-support/Cargo.toml --no-default-features --features winit-22 - - run: cargo test --manifest-path imgui-winit-support/Cargo.toml --no-default-features --features winit-23 - - run: cargo test --manifest-path imgui-winit-support/Cargo.toml --no-default-features --features winit-24 + - run: cargo test --manifest-path imgui-winit-support/Cargo.toml --no-default-features --features winit-23/default + - run: cargo test --manifest-path imgui-winit-support/Cargo.toml --no-default-features --features winit-24/default # Run unreasonably slow tests under release, but only the crates that have # them, and don't bother doing this on most platforms. - run: cargo test -p imgui --release -- --ignored diff --git a/imgui-winit-support/Cargo.toml b/imgui-winit-support/Cargo.toml index 80e444e..7358841 100644 --- a/imgui-winit-support/Cargo.toml +++ b/imgui-winit-support/Cargo.toml @@ -11,9 +11,9 @@ categories = ["gui"] [dependencies] imgui = { version = "0.7.0", path = "../imgui" } -winit-19 = { version = ">= 0.16, < 0.20", package = "winit", default-features = false, optional = true } -winit-20 = { version = ">= 0.20, < 0.22", package = "winit", default-features = false, optional = true } -winit-22 = { version = "0.22", package = "winit", default-features = false, optional = true } +winit-19 = { version = ">= 0.16, < 0.20", package = "winit", optional = true } +winit-20 = { version = ">= 0.20, < 0.22", package = "winit", optional = true } +winit-22 = { version = "0.22", package = "winit", optional = true } winit-23 = { version = "0.23", package = "winit", default-features = false, optional = true } winit-24 = { version = "0.24", package = "winit", default-features = false, optional = true }