Update to winit 0.15.0 + release glutin 0.16.0 (rust-windowing#1021)

CHANGELOG.md

@@ -1,8 +1,13 @@
 # Unreleased
 
+# Version 0.16.0 (2018-05-09)
+
+- Update winit dependency to 0.14.0. See [winit's CHANGELOG](https://github.com/tomaka/winit/blob/v0.14.0/CHANGELOG.md#version-0140-2018-05-09) for more info.
+- Update winit dependency to 0.15.0. See [winit's CHANGELOG](https://github.com/tomaka/winit/blob/v0.15.0/CHANGELOG.md#version-0150-2018-05-22) for more info.
+
 # Version 0.15.0 (2018-04-25)
 
-- Update winit dependency to 0.13.0. See [winit's CHANGELOG](https://github.com/tomaka/winit/blob/v0.13.0/CHANGELOG.md) for more info.
+- Update winit dependency to 0.13.0. See [winit's CHANGELOG](https://github.com/tomaka/winit/blob/v0.13.0/CHANGELOG.md#version-0130-2018-04-25) for more info.
 
 # Version 0.14.0 (2018-04-06)
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "glutin"
-version = "0.15.0"
+version = "0.16.0"
 authors = ["The glutin contributors, Pierre Krieger <pierre.krieger1708@gmail.com>"]
 description = "Cross-platform OpenGL context provider."
 keywords = ["windowing", "opengl"]
@@ -10,11 +10,14 @@ repository = "https://github.com/tomaka/glutin"
 documentation = "https://docs.rs/glutin"
 build = "build.rs"
 
+[features]
+icon_loading = ["winit/icon_loading"]
+
 [dependencies]
 lazy_static = "1"
 libc = "0.2"
 shared_library = "0.1.0"
-winit = "0.13.1"
+winit = "0.15.0"
 
 [build-dependencies]
 gl_generator = "0.9"
@@ -28,9 +31,9 @@ objc = "0.2"
 [target.'cfg(target_os = "macos")'.dependencies]
 objc = "0.2"
 cgl = "0.2"
-cocoa = "0.14"
-core-foundation = "0.5"
-core-graphics = "0.13"
+cocoa = "0.15"
+core-foundation = "0.6"
+core-graphics = "0.14"
 
 [target.'cfg(target_os = "windows")'.dependencies.winapi]
 version = "0.3.2"
@@ -43,5 +46,5 @@ features = [
 
 [target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os="dragonfly", target_os="openbsd"))'.dependencies]
 osmesa-sys = "0.1.0"
-wayland-client = { version = "0.12", features = ["egl", "dlopen"] }
+wayland-client = { version = "0.20.4", features = ["egl", "dlopen"] }
 x11-dl = "2.17.5"

src/lib.rs

@@ -62,13 +62,37 @@ extern crate x11_dl;
 extern crate wayland_client;
 
 pub use headless::{HeadlessRendererBuilder, HeadlessContext};
-pub use winit::{AvailableMonitorsIter, AxisId, ButtonId, ControlFlow,
-                CreationError as WindowCreationError, CursorState, DeviceEvent, DeviceId,
-                ElementState, Event, EventsLoop, EventsLoopClosed, EventsLoopProxy,
-                KeyboardInput, ModifiersState,
-                MonitorId, MouseButton, MouseCursor, MouseScrollDelta, ScanCode,
-                Touch, TouchPhase, VirtualKeyCode, Window, WindowAttributes, WindowBuilder,
-                WindowEvent, WindowId};
+pub use winit::{
+    AvailableMonitorsIter,
+    AxisId,
+    ButtonId,
+    ControlFlow,
+    CreationError as WindowCreationError,
+    CursorState,
+    DeviceEvent,
+    DeviceId,
+    ElementState,
+    Event,
+    EventsLoop,
+    EventsLoopClosed,
+    EventsLoopProxy,
+    Icon,
+    KeyboardInput,
+    ModifiersState,
+    MonitorId,
+    MouseButton,
+    MouseCursor,
+    MouseScrollDelta,
+    ScanCode,
+    Touch,
+    TouchPhase,
+    VirtualKeyCode,
+    Window,
+    WindowAttributes,
+    WindowBuilder,
+    WindowEvent,
+    WindowId,
+};
 
 use std::io;
 
@@ -744,4 +768,3 @@ impl<S> Default for GlAttributes<S> {
         }
     }
 }
-

src/os/unix.rs

@@ -5,6 +5,7 @@ pub use api::glx::ffi::GLXContext;
 pub use platform::RawHandle;
 
 pub use winit::os::unix::XNotSupported;
+pub use winit::os::unix::XWindowType;
 pub use winit::os::unix::EventsLoopExt;
 pub use winit::os::unix::MonitorIdExt;
 pub use winit::os::unix::WindowBuilderExt;

src/os/windows.rs

@@ -1,7 +1,7 @@
 #![cfg(target_os = "windows")]
 
 pub use winapi::shared::windef::HGLRC;
-pub use winit::os::windows::{WindowBuilderExt, WindowExt, MonitorIdExt};
+pub use winit::os::windows::{DeviceIdExt, WindowBuilderExt, WindowExt, MonitorIdExt};
 
 pub use api::egl::ffi::EGLContext;
 pub use platform::RawHandle;