Skip to content

Commit

Permalink
feat(core): update windows-rs to 0.37.0 (#4199)
Browse files Browse the repository at this point in the history
  • Loading branch information
lucasfernog authored May 24, 2022
1 parent 6830a73 commit 2326be3
Show file tree
Hide file tree
Showing 14 changed files with 2,106 additions and 2,551 deletions.
7 changes: 7 additions & 0 deletions .changes/update-windows.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"tauri-runtime-wry": patch
"tauri": patch
"tauri-runtime": patch
---

Update `windows-rs` to `0.37.0`, which requires Rust 1.61.0+.
2 changes: 1 addition & 1 deletion .scripts/update-lockfiles.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# SPDX-License-Identifier: Apache-2.0
# SPDX-License-Identifier: MIT

declare -a examples=("api" "sidecar" "updater" "resources", "tauri-dynamic-lib")
declare -a examples=("api" "sidecar" "updater" "resources" "tauri-dynamic-lib")
declare -a tooling=("bench" "cli" "webdriver")

for example in "${examples[@]}"
Expand Down
10 changes: 5 additions & 5 deletions core/tauri-runtime-wry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ exclude = [ ".license_template", "CHANGELOG.md", "/target" ]
readme = "README.md"

[dependencies]
wry = { version = "0.16.2", default-features = false, features = [ "file-drop", "protocol" ] }
wry = { version = "0.17.0", default-features = false, features = [ "file-drop", "protocol" ] }
tauri-runtime = { version = "0.5.1", path = "../tauri-runtime" }
tauri-utils = { version = "1.0.0-rc.7", path = "../tauri-utils" }
uuid = { version = "1", features = [ "v4" ] }
rand = "0.8"

[target."cfg(windows)".dependencies]
webview2-com = "0.13.0"
webview2-com = "0.16.0"

[target."cfg(windows)".dependencies.windows]
version = "0.30.0"
features = [ "Win32_Foundation" ]
[target."cfg(windows)".dependencies.windows]
version = "0.37.0"
features = [ "Win32_Foundation" ]

[target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
gtk = { version = "0.15", features = [ "v3_20" ] }
Expand Down
4 changes: 2 additions & 2 deletions core/tauri-runtime-wry/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3018,7 +3018,7 @@ fn create_webview<T: UserEvent>(
let proxy_ = proxy.clone();
let mut token = EventRegistrationToken::default();
unsafe {
controller.GotFocus(
controller.add_GotFocus(
FocusChangedEventHandler::create(Box::new(move |_, _| {
let _ = proxy_.send_event(Message::Webview(
window_id,
Expand All @@ -3031,7 +3031,7 @@ fn create_webview<T: UserEvent>(
}
.unwrap();
unsafe {
controller.LostFocus(
controller.add_LostFocus(
FocusChangedEventHandler::create(Box::new(move |_, _| {
let _ = proxy.send_event(Message::Webview(
window_id,
Expand Down
4 changes: 2 additions & 2 deletions core/tauri-runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ http-range = "0.1.4"
infer = "0.7"

[target."cfg(windows)".dependencies]
webview2-com = "0.13.0"
webview2-com = "0.16.0"

[target."cfg(windows)".dependencies.windows]
version = "0.30.0"
version = "0.37.0"
features = [ "Win32_Foundation" ]

[target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
Expand Down
8 changes: 4 additions & 4 deletions core/tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,11 @@ cocoa = "0.24"
objc = "0.2"

[target."cfg(windows)".dependencies]
webview2-com = "0.13.0"
webview2-com = "0.16.0"

[target."cfg(windows)".dependencies.windows]
version = "0.30.0"
features = [ "Win32_Foundation" ]
[target."cfg(windows)".dependencies.windows]
version = "0.37.0"
features = [ "Win32_Foundation" ]

[build-dependencies]
heck = "0.4"
Expand Down
Loading

0 comments on commit 2326be3

Please sign in to comment.