Skip to content

Commit

Permalink
Update egui to 0.30 and Rust to 1.80 (#69)
Browse files Browse the repository at this point in the history
* Update egui to 0.30 and Rust to 1.80

* Enable `syn` feature `full`

* Pin `home` to 0.5.9

* Pin `home` to 0.5.9 correctly

* add x11 and wayload features to eframe

* revert adding the `full` feature to syn
  • Loading branch information
abey79 authored Dec 17, 2024
1 parent 807ebf4 commit 620c365
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ resolver = "2"
[workspace.package]
license = "MIT OR Apache-2.0"
edition = "2021"
rust-version = "1.76" # Follows egui
rust-version = "1.80" # Follows egui
version = "0.18.0"
repository = "https://github.com/lampsitter/egui_commonmark"

[workspace.dependencies]
egui_extras = { version = "0.29", default-features = false }
egui = { version = "0.29", default-features = false }
egui_extras = { version = "0.30", default-features = false }
egui = { version = "0.30", default-features = false }

egui_commonmark_backend = { version = "0.18.0", path = "egui_commonmark_backend", default-features = false }
egui_commonmark_macros = { version = "0.18.0", path = "egui_commonmark_macros", default-features = false }
Expand Down
3 changes: 2 additions & 1 deletion egui_commonmark/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,10 @@ fetch = ["egui_extras/http"]
embedded_image = ["egui_commonmark_backend/embedded_image"]

[dev-dependencies]
eframe = { version = "0.29", default-features = false, features = ["default_fonts", "glow"] }
eframe = { version = "0.30", default-features = false, features = ["default_fonts", "glow", "wayland", "x11"] }
image = { version = "0.25", default-features = false, features = ["png"] }
egui_commonmark_macros = { workspace = true } # Tests won't build otherswise
home = "=0.5.9" # pinned for Rust 1.80.0, keep in sync with eframe

[package.metadata.docs.rs]
features = ["better_syntax_highlighting", "document-features", "macros"]
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "1.76.0"
channel = "1.80.0"
components = ["rustfmt", "clippy"]

0 comments on commit 620c365

Please sign in to comment.