winit-24 feature flag, limit versions of some crates to fix build issues

Author: aclysma

.github/workflows/ci.yml

@@ -55,6 +55,14 @@ jobs:
           CARGO_INCREMENTAL: 0
           RUSTFLAGS: "-C debuginfo=0 -D warnings"
 
+      # Verify winit 0.24 build works
+      - name: Build winit 0.24
+        run: cargo check --no-default-features --features=winit-24,skulpin_winit
+        if: ${{ runner.os == 'Linux' }}
+        env:
+          CARGO_INCREMENTAL: 0
+          RUSTFLAGS: "-C debuginfo=0 -D warnings"
+
       # Run tests
       - name: Run tests
         run: cargo test --workspace

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.11.1
+
+ * Add winit-24 feature flag
+ * Limit some open-ended versions to fix build issues
+
 ## 0.11.0
 
  * Refactor the API integrations to use ash_window, simplifying the code and removing a lot of platform-specific code
@@ -9,6 +14,10 @@
  * Added feature flags winit-21, winit-22, winit-23, and winit-latest for easier control of what winit version to pull
    in. This also allows us to have version-specific code (for example to handle upstream changes in winit API)
 
+## 0.10.1
+
+ * Limit some open-ended versions to fix build issues
+
 ## 0.10.0
 
  * Improvements to validation layer handling
@@ -130,4 +139,4 @@
  * Adjusted some log levels
 
 ## 0.2.0
- * Changes prior to 0.2.0 were not tracked.
+ * Changes prior to 0.2.0 were not tracked.

Cargo.toml

@@ -50,6 +50,7 @@ skulpin_sdl2 = ["skulpin-renderer-sdl2"]
 winit-21 = ["skulpin-renderer-winit/winit-21", "skulpin-app-winit/winit-21"]
 winit-22 = ["skulpin-renderer-winit/winit-22", "skulpin-app-winit/winit-22"]
 winit-23 = ["skulpin-renderer-winit/winit-23", "skulpin-app-winit/winit-23"]
+winit-24 = ["skulpin-renderer-winit/winit-24", "skulpin-app-winit/winit-24"]
 winit-latest = ["skulpin-renderer-winit/winit-latest", "skulpin-app-winit/winit-latest"]
 
 default = ["skulpin_winit", "skulpin_sdl2", "skia_complete", "winit-22"]
@@ -72,9 +73,10 @@ nphysics2d = "0.12"
 
 # The skulpin-renderer-sdl2 crate doesn't specify any features, but downstream libraries can do so by including sdl2
 # for themselves. Examples will use the features added here
-sdl2 = { version = ">=0.33", features = ["bundled", "static-link"] }
+sdl2-sys = { version = ">=0.33, <=0.34.2"}
+sdl2 = { version = ">=0.33, <=0.34.2", features = ["bundled", "static-link"] }
 
 # Used for the imgui example only
 imgui = "0.5"
 imgui-winit-support = "0.5"
-skulpin-plugin-imgui = { version = "0.7", path = "skulpin-plugin-imgui"}
+skulpin-plugin-imgui = { version = "0.7", path = "skulpin-plugin-imgui"}

README.md

@@ -99,6 +99,7 @@ feature does not get included.
 * `winit-21`
 * `winit-22`
 * `winit-23`
+* `winit-24`
 * `winit-latest`
 
 (These feature names match the imgui-rs crate.)

skulpin-app-winit/Cargo.toml

@@ -22,4 +22,5 @@ log="0.4"
 winit-21 = ["skulpin-renderer-winit/winit-21"]
 winit-22 = ["skulpin-renderer-winit/winit-22"]
 winit-23 = ["skulpin-renderer-winit/winit-23"]
+winit-24 = ["skulpin-renderer-winit/winit-24"]
 winit-latest = ["skulpin-renderer-winit/winit-latest"]

skulpin-app-winit/src/input_state.rs

@@ -532,7 +532,7 @@ impl InputState {
                     );
                 }
 
-                #[cfg(any(feature = "winit-23", feature = "winit-latest"))]
+                #[cfg(any(feature = "winit-23", feature = "winit-24", feature = "winit-latest"))]
                 {
                     self.mouse_wheel_delta = MouseScrollDelta::PixelDelta(
                         PhysicalPosition::<f64>::new(d1.x + d2.x, d1.y + d2.y),
@@ -677,7 +677,7 @@ impl InputState {
                 0 => MouseButton::Left,
                 1 => MouseButton::Right,
                 2 => MouseButton::Middle,
-                _ => MouseButton::Other((index - 3) as u8),
+                _ => MouseButton::Other((index - 3) as _),
             };
 
             Some(button)

skulpin-renderer-sdl2/Cargo.toml

@@ -12,7 +12,8 @@ categories = ["graphics", "gui", "multimedia", "rendering", "visualization"]
 
 [dependencies]
 skulpin-renderer = { version = "0.5", path = "../skulpin-renderer" }
-sdl2 = { version = ">=0.33", features = ["raw-window-handle"] }
+sdl2 = { version = ">=0.33, <=0.34.2", features = ["raw-window-handle"] }
+sdl2-sys = { version = ">=0.33, <=0.34.2"}
 ash-window = "0.5.0"
 raw-window-handle = "0.3"
 log="0.4"

skulpin-renderer-winit/Cargo.toml

@@ -15,6 +15,7 @@ skulpin-renderer = { version = "0.5", path = "../skulpin-renderer" }
 winit-21 = { package = "winit", version = "0.21", optional = true }
 winit-22 = { package = "winit", version = "0.22", optional = true }
 winit-23 = { package = "winit", version = "0.23", optional = true }
+winit-24 = { package = "winit", version = "0.24", optional = true }
 winit-latest = { package = "winit", version = ">=0.23", optional = true }
 ash-window = "0.5.0"
 raw-window-handle = "0.3"

skulpin-renderer-winit/src/lib.rs

@@ -4,6 +4,8 @@ pub use winit_21 as winit;
 pub use winit_22 as winit;
 #[cfg(feature = "winit-23")]
 pub use winit_23 as winit;
+#[cfg(feature = "winit-24")]
+pub use winit_24 as winit;
 #[cfg(feature = "winit-latest")]
 pub use winit_latest as winit;
 

skulpin-renderer/Cargo.toml

@@ -24,7 +24,7 @@ complete = ["skia-safe/textlayout"]
 [dependencies]
 ash = ">=0.30"
 
-skia-safe = { version = ">=0.30.1", features = ["vulkan"] }
-skia-bindings = { version = ">=0.30.1" }
+skia-safe = { version = ">=0.30.1, <0.37", features = ["vulkan"] }
+skia-bindings = { version = ">=0.30.1, <0.37" }
 
 log="0.4"