Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Transition to iced 0.10 and other version bumps #196

Merged
merged 1 commit into from
Nov 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3,296 changes: 2,091 additions & 1,205 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion fonts/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ authors = ["Atlantis Sports <maintainers@atlantissports.org>"]
edition = "2021"

[dependencies]
embedded-graphics = "0.7"
embedded-graphics = "0.8"
2 changes: 1 addition & 1 deletion fonts/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pub mod fonts {
($name:ident, $file:literal, $w:literal, $h:literal, $spacing:literal, $base:literal) => {
pub const $name: embedded_graphics::mono_font::MonoFont =
embedded_graphics::mono_font::MonoFont {
image: embedded_graphics::image::ImageRaw::new_binary(
image: embedded_graphics::image::ImageRaw::new(
core::include_bytes!(core::concat!(core::env!("OUT_DIR"), "/", $file)),
$w * 8,
),
Expand Down
10 changes: 5 additions & 5 deletions matrix-drawing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ std = ["arrayvec/std", "serde/std", "uwh-common/std"]
[dependencies]
arrayref = "0.3"
arrayvec = { version = "0.7", default-features = false }
embedded-graphics = "0.7"
fonts = { version = "0.1", path = "../fonts" }
more-asserts = "0.2"
serde = { version = "1.0", default-features = false }
serde_derive = "1.0"
embedded-graphics = "0.8"
fonts = { version = "0.1.4", path = "../fonts" }
more-asserts = "0.3"
serde = { version = "1", default-features = false }
serde_derive = "1"
uwh-common = { version = "0.1.4", path = "../uwh-common", default-features = false }
31 changes: 17 additions & 14 deletions refbox/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,24 @@ arrayref = "0.3"
collect_array = "0.1"
clap = { version = "4", features = ["derive"] }
confy = "0.5"
conquer-once = "0.3"
derivative = "2.2"
directories = "4"
embedded-graphics = "0.7"
enum-derive-2018 = "2"
conquer-once = "0.4"
derivative = "2"
directories = "5"
embedded-graphics = "0.8"
enum-derive-2018 = "3"
env_logger = "0.9"
futures-lite = "1"
iced = { version = "0.4", default-features = false, features = ["canvas", "glow", "pure", "tokio"] }
iced_futures = { version = "0.4", features = ["async-std"] }
iced_native = "0.5"
iced = { version = "0.10", default-features = false, features = ["canvas", "svg", "tokio", "wgpu"] }
iced_core = "0.10"
iced_futures = { version = "0.7", features = ["async-std"] }
# iced_native = "0.10"
iced_renderer = "0.1"
iced_runtime = "0.1"
log = "0.4"
log4rs = { version = "1", default-features = false, features = ["background_rotation", "compound_policy", "console_appender", "fixed_window_roller", "gzip", "pattern_encoder", "rolling_file_appender", "size_trigger"]}
log-panics = { version = "2", features = ["with-backtrace"]}
macro-attr-2018 = "2"
more-asserts = "0.2"
macro-attr-2018 = "3"
more-asserts = "0.3"
paste = "1"
reqwest = { version = "0.11", features = ["json"] }
serde = "1"
Expand All @@ -40,10 +43,10 @@ thiserror = "1"
time = { version = "0.3", features = ["local-offset", "macros", "serde", "serde-human-readable"] }
tokio = { version = "1", features = ["io-util", "macros", "net", "sync", "time"] }
tokio-serial = "5"
toml = "0.5"
uwh-common = { version = "0.1", path = "../uwh-common"}
matrix-drawing = { version = "0.1", path = "../matrix-drawing"}
web-audio-api = { version = "0.26", default-features = false, features = ["cpal"] }
toml = "0.8"
uwh-common = { version = "0.1.3", path = "../uwh-common"}
matrix-drawing = { version = "0.1.3", path = "../matrix-drawing"}
web-audio-api = { version = "0.34", default-features = false, features = ["cpal"] }

[target.'cfg(target_os = "linux")'.dependencies]
rppal = "0.14"
Expand Down
Binary file modified refbox/resources/Roboto-Medium.ttf
Binary file not shown.
9 changes: 9 additions & 0 deletions refbox/resources/arrow_drop_down.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions refbox/resources/arrow_drop_up.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions refbox/resources/backspace.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions refbox/resources/pause.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions refbox/resources/play_arrow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading