diff --git a/Cargo.lock b/Cargo.lock index 2ecdfeb..08bf11d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -103,6 +103,18 @@ checksum = "b588b76d00fde79687d7646a9b5bdf3cc0f655e0bbd080335a95d7e96f3587da" [[package]] name = "bread-shared" version = "0.7.0" +source = "git+https://git.breadway.dev/Breadway/bread?tag=v0.7.0#22e34e2cf2202305d7960759dfccb54dc79f948b" +dependencies = [ + "dirs", + "serde", + "serde_json", + "toml 0.8.23", +] + +[[package]] +name = "bread-shared" +version = "0.7.0" +source = "git+https://git.breadway.dev/Breadway/bread?branch=dev#8a794c03bfc7f2f294ff89d92494ad324afc30f5" dependencies = [ "dirs", "serde", @@ -112,8 +124,8 @@ dependencies = [ [[package]] name = "bread-theme" -version = "0.2.3" -source = "git+https://github.com/Breadway/bread-ecosystem?tag=v0.2.10#17d1bb85801b9a8c195b64c02d288cd662c9c780" +version = "0.3.1" +source = "git+https://github.com/Breadway/bread-ecosystem?branch=dev#77bca8a1cf90d7fd38745270d2deb291b8b22bfe" dependencies = [ "dirs", "gtk4", @@ -124,8 +136,9 @@ dependencies = [ [[package]] name = "bread-utils" version = "0.3.1" +source = "git+https://git.breadway.dev/Breadway/bread-ecosystem?branch=dev#77bca8a1cf90d7fd38745270d2deb291b8b22bfe" dependencies = [ - "bread-shared", + "bread-shared 0.7.0 (git+https://git.breadway.dev/Breadway/bread?tag=v0.7.0)", "dirs", "serde", "serde_json", @@ -135,7 +148,7 @@ dependencies = [ name = "breadbar" version = "0.3.0" dependencies = [ - "bread-shared", + "bread-shared 0.7.0 (git+https://git.breadway.dev/Breadway/bread?branch=dev)", "bread-theme", "bread-utils", "futures-lite", diff --git a/Cargo.toml b/Cargo.toml index 673a8c9..02275a7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,13 +10,13 @@ keywords = ["wayland", "hyprland", "bar", "status-bar", "gtk4"] categories = ["gui"] [dependencies] -bread-theme = { git = "https://github.com/Breadway/bread-ecosystem", tag = "v0.2.10", features = ["gtk"] } +bread-theme = { git = "https://github.com/Breadway/bread-ecosystem", branch = "dev", features = ["gtk"] } # Widget rendering client: bread-utils::BreadClient (emit/request/subscribe) # for talking to breadd's IPC socket, and bread-shared purely for the # WidgetSpec/WidgetNode wire types so we deserialize into real structs # instead of hand-parsing serde_json::Value. See src/widgets/. -bread-utils = { git = "https://git.breadway.dev/Breadway/bread-ecosystem", tag = "v0.3.1", features = ["bread-client"] } -bread-shared = { git = "https://git.breadway.dev/Breadway/bread", tag = "v0.7.0" } +bread-utils = { git = "https://git.breadway.dev/Breadway/bread-ecosystem", branch = "dev", features = ["bread-client"] } +bread-shared = { git = "https://git.breadway.dev/Breadway/bread", branch = "dev" } gtk4 = { version = "0.11", features = ["v4_12"] } gtk4-layer-shell = "0.8" relm4 = { version = "0.11", features = ["macros"] } @@ -30,15 +30,6 @@ serde_json = "1" # are vector-only). Needed because librsvg dropped its gdk-pixbuf SVG loader. resvg = { version = "0.44", default-features = false } -# TEMPORARY local-dev override: the widget feature's bread-shared/bread-utils -# changes aren't tagged/released yet, so point the git deps above at the -# local checkouts instead. Remove this section (and bump the tags above) -# once bread-ecosystem and bread have real release tags for this work. -[patch."https://git.breadway.dev/Breadway/bread-ecosystem"] -bread-utils = { path = "../bread-ecosystem/bread-utils" } -[patch."https://git.breadway.dev/Breadway/bread"] -bread-shared = { path = "../bread/bread-shared" } - [profile.release] lto = "thin" codegen-units = 1