Skip to content

Commit

Permalink
fix(core): raw-window-handle dependency, closes #2460 (#2465)
Browse files Browse the repository at this point in the history
  • Loading branch information
lucasfernog committed Aug 17, 2021
1 parent 8d1fe0e commit aecdfaf
Show file tree
Hide file tree
Showing 17 changed files with 7,374 additions and 37 deletions.
5 changes: 5 additions & 0 deletions .changes/raw-window-handle-dependency.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"tauri": patch
---

Fix `raw-window-handle` dependency declaration.
18 changes: 5 additions & 13 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,12 @@ members = [
"core/tauri-macros",
"core/tauri-utils",
"core/tauri-build",
"core/tauri-codegen",

# examples
"core/tauri-codegen"
]
exclude = [
# examples that can be compiled with the tauri CLI
"examples/api/src-tauri",
"examples/commands/src-tauri",
"examples/helloworld/src-tauri",
"examples/multiwindow/src-tauri",
"examples/navigation/src-tauri",
"examples/splashscreen/src-tauri",
"examples/state/src-tauri",
"examples/sidecar/src-tauri",
"examples/resources/src-tauri",
# used to build updater artifacts
"examples/updater/src-tauri",
"examples/updater/src-tauri"
]

# default to small, optimized workspace release binaries
Expand Down
34 changes: 31 additions & 3 deletions core/tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ open = { version = "2.0", optional = true }
shared_child = { version = "0.3", optional = true }
os_pipe = { version = "0.9", optional = true }
rfd = { version = "0.4.3", features = [ "parent" ] }
raw-window-handle = { version = "0.3.3", optional = true }
raw-window-handle = "0.3.3"
minisign-verify = { version = "0.1", optional = true }
os_info = { version = "3.0.6", optional = true }
futures-lite = "1.12"
Expand Down Expand Up @@ -129,10 +129,38 @@ shell-all = [ "shell-open", "shell-execute" ]
shell-execute = [ "shared_child", "os_pipe" ]
shell-open = [ "open" ]
dialog-all = [ "dialog-open", "dialog-save" ]
dialog-open = [ "raw-window-handle" ]
dialog-save = [ "raw-window-handle" ]
dialog-open = [ ]
dialog-save = [ ]
http-all = [ ]
http-request = [ ]
notification-all = [ "notify-rust" ]
global-shortcut-all = [ ]
os-all = [ "os_info" ]

[[example]]
name = "commands"
path = "../../examples/commands/src-tauri/src/main.rs"

[[example]]
name = "helloworld"
path = "../../examples/helloworld/src-tauri/src/main.rs"

[[example]]
name = "multiwindow"
path = "../../examples/multiwindow/src-tauri/src/main.rs"

[[example]]
name = "navigation"
path = "../../examples/navigation/src-tauri/src/main.rs"

[[example]]
name = "splashscreen"
path = "../../examples/splashscreen/src-tauri/src/main.rs"

[[example]]
name = "state"
path = "../../examples/state/src-tauri/src/main.rs"

[[example]]
name = "resources"
path = "../../examples/resources/src-tauri/src/main.rs"
1 change: 1 addition & 0 deletions core/tauri/src/api/process/command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,7 @@ impl Command {
let (mut rx, _child) = self.spawn()?;
let code = crate::async_runtime::block_on(async move {
let mut code = None;
#[allow(clippy::collapsible_match)]
while let Some(event) = rx.recv().await {
if let CommandEvent::Terminated(payload) = event {
code = payload.code;
Expand Down
2 changes: 0 additions & 2 deletions core/tauri/src/updater/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -410,8 +410,6 @@ pub(crate) async fn check_update_with_dialog<R: Runtime>(
EVENT_STATUS_ERROR,
Some(dialog.err().unwrap().to_string()),
);

return;
}
}
}
Expand Down
Loading

0 comments on commit aecdfaf

Please sign in to comment.