me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into feat/multi-window-support

Browse source 
# Conflicts:
#	examples/events/src/main.rs
#	glutin/src/application.rs
#	native/src/window.rs
#	winit/src/window.rs
This commit is contained in:
Bingus 2023-01-18 15:01:17 -08:00
commit 70d487ba20
No known key found for this signature in database
GPG key ID: 5F84D2AA40A9F170
57 changed files with 815 additions and 446 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "iced"
version = "0.6.0"
version = "0.7.0"
authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
edition = "2021"
description = "A cross-platform GUI library inspired by Elm"
@ -68,13 +68,13 @@ members = [
]
[dependencies]
iced_core = { version = "0.6", path = "core" }
iced_core = { version = "0.7", path = "core" }
iced_futures = { version = "0.5", path = "futures" }
iced_native = { version = "0.7", path = "native" }
iced_graphics = { version = "0.5", path = "graphics" }
iced_winit = { version = "0.6", path = "winit", features = ["application"] }
iced_glutin = { version = "0.5", path = "glutin", optional = true }
iced_glow = { version = "0.5", path = "glow", optional = true }
iced_native = { version = "0.8", path = "native" }
iced_graphics = { version = "0.6", path = "graphics" }
iced_winit = { version = "0.7", path = "winit", features = ["application"] }
iced_glutin = { version = "0.6", path = "glutin", optional = true }
iced_glow = { version = "0.6", path = "glow", optional = true }
thiserror = "1.0"
[dependencies.image_rs]
@ -83,10 +83,10 @@ package = "image"
optional = true
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
iced_wgpu = { version = "0.7", path = "wgpu", optional = true }
iced_wgpu = { version = "0.8", path = "wgpu", optional = true }
[target.'cfg(target_arch = "wasm32")'.dependencies]
iced_wgpu = { version = "0.7", path = "wgpu", features = ["webgl"], optional = true }
iced_wgpu = { version = "0.8", path = "wgpu", features = ["webgl"], optional = true }
[package.metadata.docs.rs]
rustdoc-args = ["--cfg", "docsrs"]