Skip to content

Commit

Permalink
updated libssh-rs
Browse files Browse the repository at this point in the history
  • Loading branch information
mariotaku committed Jun 16, 2023
1 parent 48b1f40 commit d79ae9c
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 20 deletions.
12 changes: 6 additions & 6 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,4 @@ members = [
"ares-push",
"ares-launch",
"ares-device",
]

[patch.crates-io]
libssh-rs = { git = "https://github.com/wez/libssh-rs.git", rev = "74d845c1696b710b8b8388e193b3882c15edf2c1" }
libssh-rs-sys = { git = "https://github.com/wez/libssh-rs.git", rev = "74d845c1696b710b8b8388e193b3882c15edf2c1" }
]
4 changes: 2 additions & 2 deletions ares-device/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ cfg-if = "1.0.0"
[target.'cfg(target_os="windows")'.dependencies]
native-windows-gui = { version = "1.0.12" }
native-windows-derive = "1.0.3"
libssh-rs-sys = { version = "0.1.3", features = ["vendored-openssl", "libz-sys"] }
libssh-rs-sys = { version = "0.2.0", features = ["vendored-openssl", "libz-sys"] }

[target.'cfg(not(target_os="windows"))'.dependencies]
libssh-rs-sys = { version = "0.1.3", default-features = false }
libssh-rs-sys = { version = "0.2.0", default-features = false }

[target.'cfg(all(not(target_os="windows"), not(target_os="macos")))'.dependencies]
gtk = "0.17.1"
Expand Down
1 change: 1 addition & 0 deletions ares-device/src/picker/windows/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ impl PickPrompt for PickPromptWindows {
.iter()
.position(|d| d.as_ref().default.unwrap_or(false)),
);
ui.on_selection_change();

nwg::dispatch_thread_events();

Expand Down
2 changes: 1 addition & 1 deletion ares-install/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ common-connection = { path = "../common/connection" }
clap = { version = "4.2.4", features = ["derive", "env"] }
serde = { version = "1.0.160", features = ["derive"] }
serde_json = "1.0.96"
libssh-rs = { version = "0.1.8" }
libssh-rs = { version = "0.2.0" }
sha256 = "1.1.3"
regex = "1.8.1"

Expand Down
2 changes: 1 addition & 1 deletion ares-launch/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ common-connection = { path = "../common/connection" }
clap = { version = "4.2.4", features = ["derive", "env"] }
serde = { version = "1.0.160", features = ["derive"] }
serde_json = "1.0.96"
libssh-rs = { version = "0.1.8" }
libssh-rs = { version = "0.2.0" }

[package.metadata.deb]
section = "devel"
8 changes: 3 additions & 5 deletions common/connection/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,13 @@ name = "ares_connection_lib"
common-device = { path = "../device" }
serde = { version = "1.0.160", features = ["derive"] }
serde_json = "1.0.96"
libssh-rs = { version = "0.1.8" }
libssh-rs = { version = "0.2.0" }
reqwest = { version = "0.11.16", features = ["blocking"] }
snailquote = "0.3.1"
path-slash = "0.2.1"
openssl = { version = "=0.10.35" }
openssl-sys = { version = "=0.9.71" }

[target.'cfg(target_os="windows")'.dependencies]
libssh-rs-sys = { version = "0.1.3", features = ["vendored-openssl", "libz-sys"] }
libssh-rs-sys = { version = "0.2.0", features = ["vendored-openssl", "libz-sys"] }

[target.'cfg(not(target_os="windows"))'.dependencies]
libssh-rs-sys = { version = "0.1.3", default-features = false }
libssh-rs-sys = { version = "0.2.0", default-features = false }

0 comments on commit d79ae9c

Please sign in to comment.