diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ce9501525..5e099e3e9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Unreleased +- Updated winit dependency to 0.23.0. See [winit's CHANGELOG](https://github.com/rust-windowing/winit/blob/master/CHANGELOG.md#0230-2020-10-02) for more info. - Avoid loading libEGL.dll from PATH on Windows. # Version 0.24.1 (2020-05-26) diff --git a/glutin/Cargo.toml b/glutin/Cargo.toml index 6d5a1aa7bd..477bfcc76a 100644 --- a/glutin/Cargo.toml +++ b/glutin/Cargo.toml @@ -18,12 +18,12 @@ serde = ["winit/serde"] [dependencies] lazy_static = "1.3" -winit = "0.22.0" +winit = "0.23.0" [target.'cfg(target_os = "android")'.dependencies] android_glue = "0.2" glutin_egl_sys = { version = "0.1.4", path = "../glutin_egl_sys" } -parking_lot = "0.10" +parking_lot = "0.11" [target.'cfg(target_os = "emscripten")'.dependencies] glutin_emscripten_sys = { version = "0.1.1", path = "../glutin_emscripten_sys" } @@ -34,8 +34,8 @@ glutin_gles2_sys = { version = "0.1.4", path = "../glutin_gles2_sys" } [target.'cfg(target_os = "macos")'.dependencies] cgl = "0.3" -cocoa = "0.20" -core-foundation = "0.7" +cocoa = "0.23" +core-foundation = "0.9" [target.'cfg(target_os = "windows")'.dependencies.winapi] version = "0.3" @@ -50,14 +50,14 @@ features = [ libloading = "0.6.1" glutin_wgl_sys = { version = "0.1.4", path = "../glutin_wgl_sys" } glutin_egl_sys = { version = "0.1.4", path = "../glutin_egl_sys" } -parking_lot = "0.10" +parking_lot = "0.11" [target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os = "dragonfly", target_os = "netbsd", target_os = "openbsd"))'.dependencies] osmesa-sys = "0.1" -wayland-client = { version = "0.27", features = ["dlopen"] } -wayland-egl = "0.27" +wayland-client = { version = "0.28", features = ["dlopen"] } +wayland-egl = "0.28" libloading = "0.6.1" glutin_egl_sys = { version = "0.1.4", path = "../glutin_egl_sys" } glutin_glx_sys = { version = "0.1.6", path = "../glutin_glx_sys" } -parking_lot = "0.10" +parking_lot = "0.11" log = "0.4" diff --git a/glutin_examples/Cargo.toml b/glutin_examples/Cargo.toml index a205be8c7e..63e4e2f8a5 100644 --- a/glutin_examples/Cargo.toml +++ b/glutin_examples/Cargo.toml @@ -12,7 +12,7 @@ publish = false [dependencies] glutin = { path = "../glutin" } -winit = "0.20.0" +winit = "0.23.0" takeable-option = "0.4" image = "0.21" diff --git a/glutin_examples/examples/fullscreen.rs b/glutin_examples/examples/fullscreen.rs index 4f38580f65..4285edc9be 100644 --- a/glutin_examples/examples/fullscreen.rs +++ b/glutin_examples/examples/fullscreen.rs @@ -24,7 +24,7 @@ fn main() { 1 => Fullscreen::Exclusive(prompt_for_video_mode(&prompt_for_monitor( &el, ))), - 2 => Fullscreen::Borderless(prompt_for_monitor(&el)), + 2 => Fullscreen::Borderless(Some(prompt_for_monitor(&el))), _ => panic!("Please enter a valid number"), });