diff --git a/Cargo.toml b/Cargo.toml index 387c1b5..cb38c53 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ readme = "README.md" [dependencies] implot-sys = { version = "0.5.0", path = "implot-sys" } -imgui = { version = "=0.6.0" } +imgui = { version = "=0.7.0" } bitflags = "1.0" parking_lot = "0.11" rustversion = "1.0.4" diff --git a/implot-examples/examples-shared/Cargo.toml b/implot-examples/examples-shared/Cargo.toml index c216e7e..9f20c75 100644 --- a/implot-examples/examples-shared/Cargo.toml +++ b/implot-examples/examples-shared/Cargo.toml @@ -8,4 +8,4 @@ edition = "2018" [dependencies] implot = { path = "../../" } -imgui = "=0.6.0" +imgui = "=0.7.0" diff --git a/implot-examples/implot-glium-demo/Cargo.lock b/implot-examples/implot-glium-demo/Cargo.lock index adf198c..11bb226 100644 --- a/implot-examples/implot-glium-demo/Cargo.lock +++ b/implot-examples/implot-glium-demo/Cargo.lock @@ -127,6 +127,12 @@ dependencies = [ "libc", ] +[[package]] +name = "chlorine" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd650552110e39b7c5058986cf177decd3365841836578ac50a286094eac0be6" + [[package]] name = "clipboard" version = "0.5.0" @@ -165,6 +171,22 @@ dependencies = [ "objc", ] +[[package]] +name = "cocoa" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63902e9223530efb4e26ccd0cf55ec30d592d3b42e21a28defc42a9586e832" +dependencies = [ + "bitflags", + "block", + "cocoa-foundation", + "core-foundation 0.9.1", + "core-graphics 0.22.2", + "foreign-types", + "libc", + "objc", +] + [[package]] name = "cocoa-foundation" version = "0.1.0" @@ -314,7 +336,7 @@ dependencies = [ "const_fn", "crossbeam-utils", "lazy_static", - "memoffset 0.6.1", + "memoffset", "scopeguard", ] @@ -486,29 +508,29 @@ dependencies = [ [[package]] name = "glium" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eeec7b733d14519e2541f4cc8a1230de9143d4ec439dd51b6c048d8ec991759" +checksum = "77623b4b688e68ec5ce256dd45614e374d4bee6ecec964b790733bf2c05f8732" dependencies = [ "backtrace", "fnv", "gl_generator", "glutin", "lazy_static", - "memoffset 0.5.6", + "memoffset", "smallvec", "takeable-option", ] [[package]] name = "glutin" -version = "0.25.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8bae26a39a728b003e9fad473ea89527de0de050143b4df866f18bb154bc86e" +checksum = "1ae1cbb9176b9151c4ce03f012e3cd1c6c18c4be79edeaeb3d99f5d8085c5fa3" dependencies = [ "android_glue", "cgl", - "cocoa", + "cocoa 0.23.0", "core-foundation 0.9.1", "glutin_egl_sys", "glutin_emscripten_sys", @@ -608,22 +630,20 @@ dependencies = [ [[package]] name = "imgui" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a714f73a3f08446d92c47a38b536a03deba500aa6bb6fa805e8c0b6f90945e4f" +checksum = "24cfcf6e3326886321c5d637caf1ce217006651059015fae372b1c49c0e722b2" dependencies = [ "bitflags", - "glium", "imgui-sys", - "lazy_static", "parking_lot", ] [[package]] name = "imgui-glium-renderer" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e832620df00e43f56a832299b9d91c118ae19839adc0bba1eaeeb876bd7a27ee" +checksum = "8c295c510c0d7209cf2304741808425bcd8e421142679d2448a38d4aa51762f3" dependencies = [ "glium", "imgui", @@ -631,18 +651,19 @@ dependencies = [ [[package]] name = "imgui-sys" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0522b693da8a64322afbb32c63c04f39d9b9435cc75199d630207eee48886fc1" +checksum = "85ca00be6b78bf02b57e91468cf19d08dfcc11d0fb3c2f3dc491c29404d8d330" dependencies = [ "cc", + "chlorine", ] [[package]] name = "imgui-winit-support" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e0fc247afc385ed9cd26860cdb7fae988d5c7e2ad1d70c70aef728ce9b78e85" +checksum = "d632440e05c964e8a7f00f2659c4f71c97897d8c38a77a0c2dc1f3fe8d632208" dependencies = [ "imgui", "winit", @@ -808,15 +829,6 @@ dependencies = [ "libc", ] -[[package]] -name = "memoffset" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" -dependencies = [ - "autocfg", -] - [[package]] name = "memoffset" version = "0.6.1" @@ -1536,12 +1548,12 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "winit" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5bc559da567d8aa671bbcd08304d49e982c7bf2cb91e10288b9188931c1b772" +checksum = "da4eda6fce0eb84bd0a33e3c8794eb902e1033d0a1d5a31bc4f19b1b4bbff597" dependencies = [ "bitflags", - "cocoa", + "cocoa 0.24.0", "core-foundation 0.9.1", "core-graphics 0.22.2", "core-video-sys", diff --git a/implot-examples/implot-glium-demo/Cargo.toml b/implot-examples/implot-glium-demo/Cargo.toml index c2e739a..5278bbe 100644 --- a/implot-examples/implot-glium-demo/Cargo.toml +++ b/implot-examples/implot-glium-demo/Cargo.toml @@ -11,12 +11,12 @@ publish = false [dependencies] clipboard = "0.5" -glium = { version = "0.28", default-features = true } +glium = { version = "0.29", default-features = true } image = "0.23" -imgui-sys = "0.6.0" -imgui = "=0.6.0" -imgui-glium-renderer = "=0.6.0" -imgui-winit-support = "=0.6.0" +imgui-sys = "0.7.0" +imgui = "=0.7.0" +imgui-glium-renderer = "=0.7.0" +imgui-winit-support = "=0.7.0" implot-sys = { path = "../../implot-sys" } implot = { path = "../../" } diff --git a/implot-sys-bindgen/Cargo.toml b/implot-sys-bindgen/Cargo.toml index 8e5f5f4..83f7863 100644 --- a/implot-sys-bindgen/Cargo.toml +++ b/implot-sys-bindgen/Cargo.toml @@ -6,4 +6,4 @@ edition = "2018" [dependencies] bindgen = "0.57" -imgui-sys = { version = "=0.6.0" } +imgui-sys = { version = "=0.7.0" } diff --git a/implot-sys/Cargo.toml b/implot-sys/Cargo.toml index 31a1dd1..f7796e4 100644 --- a/implot-sys/Cargo.toml +++ b/implot-sys/Cargo.toml @@ -12,7 +12,7 @@ build = "build.rs" links = "implot" [dependencies] -imgui-sys = "=0.6.0" +imgui-sys = "=0.7.0" [build-dependencies] cc = "1.0"