diff --git a/backpack/cli/Cargo.toml b/backpack/cli/Cargo.toml index 8bbc5e8..50b39a9 100644 --- a/backpack/cli/Cargo.toml +++ b/backpack/cli/Cargo.toml @@ -10,10 +10,10 @@ repository = "https://github.com/yonasBSD/github-rs" [dependencies] github-rs-lib = { package = "github-rs-lib", path = "../lib" } -tokio = { version = "1.45.1", features = ["full", "macros"] } +tokio = { version = "1.48.0", features = ["full", "macros"] } clap = { version = "*", features = ["derive"] } -tracing = { version = "0.1.41", features = ["log"] } -tracing-subscriber = { version = "0.3.19", features = ["env-filter", "json"] } +tracing = { version = "0.1.44", features = ["log"] } +tracing-subscriber = { version = "0.3.22", features = ["env-filter", "json"] } terminal-banner = { version = "0.4.1", features = ["color"] } console-subscriber = "0.5.0" @@ -25,7 +25,7 @@ path = "src/main.rs" coverage = [] [dev-dependencies] -test-log = { version = "0.2.17", features = ["trace", "color"] } +test-log = { version = "0.2.19", features = ["trace", "color"] } [package.metadata.binstall.signing] algorithm = "minisign" diff --git a/backpack/e2e/Cargo.toml b/backpack/e2e/Cargo.toml index 852f3ef..2f66eed 100644 --- a/backpack/e2e/Cargo.toml +++ b/backpack/e2e/Cargo.toml @@ -11,7 +11,7 @@ repository = "https://github.com/yonasBSD/github-rs" [dev-dependencies] github-rs-lib = { package = "github-rs-lib", path = "../lib" } cucumber = { version = "0.22.0", features = ["libtest", "output-json", "output-junit", "timestamps", "tracing"] } -tokio = { version = "1.45.1", features = ["full", "macros"] } +tokio = { version = "1.48.0", features = ["full", "macros"] } [[test]] name = "token" diff --git a/backpack/lib/Cargo.toml b/backpack/lib/Cargo.toml index 8945787..58a1b02 100644 --- a/backpack/lib/Cargo.toml +++ b/backpack/lib/Cargo.toml @@ -13,18 +13,18 @@ coverage = [] [dependencies] octocrab = { version = "*", git = "https://github.com/yonasBSD/octocrab", branch = "yonasBSD" } -tokio = { version = "1.45.1", features = ["full", "macros"] } +tokio = { version = "1.48.0", features = ["full", "macros"] } clap = { version = "*", features = ["derive"] } colored = "3.0.0" which = "8.0.0" -config = "0.15.4" +config = "0.15.19" xdg = "3.0.0" -reqwest = { version = "0.12.9", default-features = false, features = ["blocking", "hickory-dns", "json", "rustls-tls"] } -env_logger = "0.11.5" -tracing = { version = "0.1.41", features = ["log"] } -tracing-subscriber = { version = "0.3.19", features = ["env-filter", "json"] } +reqwest = { version = "0.12.27", default-features = false, features = ["blocking", "hickory-dns", "json", "rustls-tls"] } +env_logger = "0.11.8" +tracing = { version = "0.1.44", features = ["log"] } +tracing-subscriber = { version = "0.3.22", features = ["env-filter", "json"] } terminal-banner = { version = "0.4.1", features = ["color"] } serde_json5 = "0.2.1" [dev-dependencies] -test-log = { version = "0.2.17", features = ["trace", "color"] } +test-log = { version = "0.2.19", features = ["trace", "color"] } diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml index a2210b9..274c955 100644 --- a/xtask/Cargo.toml +++ b/xtask/Cargo.toml @@ -11,11 +11,11 @@ license = "MIT" [dependencies] -clap = "3" +clap = "4" anyhow = "1" -xshell = "^0.2.2" -duct = "1.0.0" -glob = "0.3.0" +xshell = "^0.2.7" +duct = "1.1.1" +glob = "0.3.3" fs_extra = "1" dialoguer = "^0.12.0" xtaskops = "0.4.2" diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 514fae8..2637750 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -1,22 +1,21 @@ // SPDX-License-Identifier: MIT // SPDX-FileCopyrightText: 2025 yonasBSD -#![allow(dead_code)] - -use clap::{AppSettings, Arg, Command}; +use clap::{Arg, Command}; use xtaskops::ops; use xtaskops::tasks; fn main() -> Result<(), anyhow::Error> { let cli = Command::new("xtask") - .setting(AppSettings::SubcommandRequiredElseHelp) + .subcommand_required(true) + .arg_required_else_help(true) .subcommand( Command::new("coverage").arg( Arg::new("dev") .short('d') .long("dev") .help("generate an html report") - .takes_value(false), + .action(clap::ArgAction::SetTrue), ), ) .subcommand(Command::new("vars")) @@ -25,11 +24,15 @@ fn main() -> Result<(), anyhow::Error> { .subcommand(Command::new("bloat-deps")) .subcommand(Command::new("bloat-time")) .subcommand(Command::new("docs")); + let matches = cli.get_matches(); let root = ops::root_dir(); let res = match matches.subcommand() { - Some(("coverage", sm)) => tasks::coverage(sm.is_present("dev")), + Some(("coverage", sm)) => { + let dev = sm.get_flag("dev"); + tasks::coverage(dev) + } Some(("vars", _)) => { println!("root: {root:?}"); Ok(()) @@ -41,5 +44,6 @@ fn main() -> Result<(), anyhow::Error> { Some(("bloat-time", _)) => tasks::bloat_time("backpack"), _ => unreachable!("unreachable branch"), }; + res }