Skip to content

Commit

Permalink
updated versions
Browse files Browse the repository at this point in the history
  • Loading branch information
mariotaku committed Nov 10, 2024
1 parent b00c300 commit d97ba96
Show file tree
Hide file tree
Showing 11 changed files with 671 additions and 594 deletions.
1,209 changes: 643 additions & 566 deletions Cargo.lock

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ members = [
]

[workspace.dependencies]
clap = "4.4.6"
serde = "1.0.160"
serde_json = "1.0.96"
clap = { version = "4.4.6", features = ["derive", "env"] }
serde = { version = "1.0.214", features = ["derive"] }
serde_json = "1.0.132"
libssh-rs = "0.3.3"
libssh-rs-sys = { version = "0.2.4", default-features = false }
sha256 = "1.1.3"
regex = "1.9.6"
indicatif = "0.17.7"
reqwest = "0.12.7"
sha256 = "1.5.0"
regex = "1.11.1"
indicatif = "0.17.8"
reqwest = "0.12.9"
8 changes: 4 additions & 4 deletions ares-device/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ares-device"
version = "0.1.1"
version = "0.1.2"
edition = "2021"
authors = ["Mariotaku Lee <[email protected]>"]
license = "Apache-2.0"
Expand All @@ -9,12 +9,12 @@ description = "Tools for getting device information"
[dependencies]
common-device = { path = "../common/device" }
common-connection = { path = "../common/connection" }
clap = { workspace = true, features = ["derive", "env"] }
clap = { workspace = true }
cfg-if = "1.0.0"

[target.'cfg(target_os="windows")'.dependencies]
native-windows-gui = { version = "1.0.12" }
native-windows-derive = "1.0.3"
native-windows-gui = { version = "1.0.13" }
native-windows-derive = "1.0.5"
libssh-rs-sys = { workspace = true, features = ["vendored-openssl", "libz-sys"] }

[target.'cfg(not(target_os="windows"))'.dependencies]
Expand Down
5 changes: 2 additions & 3 deletions ares-device/src/picker/windows/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,8 @@ impl PickPrompt for PickPromptWindows {

nwg::dispatch_thread_events();

devices
.get(ui.index.lock().unwrap().clone() as usize)
.map(|d| d.as_ref().clone())
let index = ui.index.lock().unwrap().clone() as usize;
devices.get(index).map(|d| d.as_ref()).cloned()
}
}

Expand Down
4 changes: 2 additions & 2 deletions ares-install/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ares-install"
version = "0.1.4"
version = "0.1.5"
edition = "2021"
authors = ["Mariotaku Lee <[email protected]>"]
license = "Apache-2.0"
Expand All @@ -11,7 +11,7 @@ description = "Install or Remove app from a device"
[dependencies]
common-device = { path = "../common/device" }
common-connection = { path = "../common/connection" }
clap = { workspace = true, features = ["derive", "env"] }
clap = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
libssh-rs = { workspace = true }
Expand Down
1 change: 0 additions & 1 deletion ares-install/src/install.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use std::fmt::Write;
use std::fs::File;
use std::io::{Error as IoError, ErrorKind};
use std::path::Path;
Expand Down
4 changes: 2 additions & 2 deletions ares-launch/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ares-launch"
version = "0.1.1"
version = "0.1.2"
edition = "2021"
authors = ["Mariotaku Lee <[email protected]>"]
license = "Apache-2.0"
Expand All @@ -10,7 +10,7 @@ license = "Apache-2.0"
[dependencies]
common-device = { path = "../common/device" }
common-connection = { path = "../common/connection" }
clap = { workspace = true, features = ["derive", "env"] }
clap = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
libssh-rs = { workspace = true }
Expand Down
8 changes: 4 additions & 4 deletions ares-package/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
[package]
name = "ares-package"
version = "0.1.3"
version = "0.1.4"
edition = "2021"
authors = ["Mariotaku Lee <[email protected]>"]
license = "Apache-2.0"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
clap = { version = "4.2.4", features = ["derive", "env"] }
clap = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
ar = "0.9.0"
tar = "0.4.41"
flate2 = "1.0.33"
tar = "0.4.43"
flate2 = "1.0.34"
path-slash = "0.2.1"
elf = "0.7.4"
regex = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion ares-push/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ares-push"
version = "0.1.3"
version = "0.1.4"
edition = "2021"
authors = ["Mariotaku Lee <[email protected]>"]
license = "Apache-2.0"
Expand Down
6 changes: 4 additions & 2 deletions ares-push/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,14 @@ struct Cli {
device: Option<String>,
#[arg(
value_name = "SOURCE",
help = "Path in the host machine, where files exist."
help = "Path in the host machine, where files exist.",
required = true
)]
source: Vec<PathBuf>,
#[arg(
value_name = "DESTINATION",
help = "Path in the DEVICE, where multiple files can be copied"
help = "Path in the DEVICE, where multiple files can be copied",
required = true
)]
destination: String,
}
Expand Down
4 changes: 2 additions & 2 deletions ares-shell/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ares-shell"
version = "0.1.0"
version = "0.1.1"
edition = "2021"
authors = ["Mariotaku Lee <[email protected]>"]
license = "Apache-2.0"
Expand All @@ -10,5 +10,5 @@ common-device = { path = "../common/device" }
common-connection = { path = "../common/connection" }
clap = { workspace = true, features = ["derive", "env"] }
libssh-rs = { workspace = true }
crossbeam-channel = "0.5.8"
crossbeam-channel = "0.5.13"
crossterm = "0.28.1"

0 comments on commit d97ba96

Please sign in to comment.