Update everything to gtk-rs git, relm4 next

Now everything is in one workspace again. Hopefully this also builds on
CI.
This commit is contained in:
Ian Douglas Scott 2022-06-29 13:44:58 -07:00
parent fded103467
commit 061a891c5e
16 changed files with 329 additions and 169 deletions

View file

@ -5,11 +5,11 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
cosmic-panel-config = { git = "https://github.com/pop-os/cosmic-panel/", features = ["gtk4"] }
cosmic-panel-config = { git = "https://github.com/pop-os/cosmic-panel/", branch = "gtk-rs-git_nobuild", features = ["gtk4"] }
cascade = "1.0.0"
gtk4 = { version = "0.4.5", features = ["v4_4"] }
gio = "0.15.3"
libcosmic = { git = "https://github.com/pop-os/libcosmic" }
gtk4 = { git = "https://github.com/gtk-rs/gtk4-rs", features = ["v4_4"] }
gio = { git = "https://github.com/gtk-rs/gtk-rs-core" }
libcosmic = { git = "https://github.com/pop-os/libcosmic", branch = "relm4-next" }
relm4-macros = { git = "https://github.com/Relm4/Relm4.git", branch = "next" }
serde = "1.0.136"
serde_json = "1.0.78"
@ -18,7 +18,7 @@ futures = "0.3.19"
futures-util = "0.3.19"
once_cell = "1.9.0"
xdg = "2.4.0"
gsk4 = "0.4.6"
gsk4 = { git = "https://github.com/gtk-rs/gtk4-rs" }
pretty_env_logger = "0.4"
anyhow = "1.0.50"
i18n-embed = { version = "0.13.4", features = ["fluent-system", "desktop-requester"] }
@ -26,4 +26,4 @@ i18n-embed-fl = "0.6.4"
rust-embed = "6.3.0"
[build-dependencies]
gio = "0.15.10"
glib-build-tools = { git = "https://github.com/gtk-rs/gtk-rs-core" }

View file

@ -1,5 +1,5 @@
fn main() {
gio::compile_resources(
glib_build_tools::compile_resources(
"data/resources",
"data/resources/resources.gresource.xml",
"compiled.gresource",