Skip to content

Commit e16fa07

Browse files
authored
Merge branch 'master' into andy/fix-windows-dpi-changed
2 parents 5c07ba4 + 675582b commit e16fa07

File tree

35 files changed

+1929
-1890
lines changed

35 files changed

+1929
-1890
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,19 @@ jobs:
7474
- { name: 'iOS Aarch64', target: aarch64-apple-ios, os: macos-latest, }
7575
- { name: 'Web', target: wasm32-unknown-unknown, os: ubuntu-latest, }
7676
exclude:
77-
# Web on nightly needs extra arguments
77+
# Web on nightly needs extra arguments
78+
79+
- toolchain: nightly
80+
platform: { name: 'Web' }
81+
# Rustup is broken.
7882
- toolchain: nightly
79-
platform: { name: 'Web', target: wasm32-unknown-unknown, os: ubuntu-latest }
83+
platform: { name: 'Windows 32bit GNU' }
8084
# Android is tested on stable-3
8185
- toolchain: '1.73'
82-
platform: { name: 'Android', target: aarch64-linux-android, os: ubuntu-latest, options: '--package=winit --features=android-native-activity', cmd: 'apk --' }
86+
platform: { name: 'Android' }
8387
# Redox OS doesn't follow MSRV
8488
- toolchain: '1.73'
85-
platform: { name: 'Redox OS', target: x86_64-unknown-redox, os: ubuntu-latest }
89+
platform: { name: 'Redox OS' }
8690
include:
8791
- toolchain: '1.73'
8892
platform: { name: 'Android', target: aarch64-linux-android, os: ubuntu-latest, options: '--package=winit --features=android-native-activity', cmd: 'apk --' }

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ objc2-ui-kit = { version = "0.3.0", default-features = false, features = [
242242
# Windows
243243
[target.'cfg(target_os = "windows")'.dependencies]
244244
unicode-segmentation = "1.7.1"
245-
windows-sys = { version = "0.52.0", features = [
245+
windows-sys = { version = "0.59.0", features = [
246246
"Win32_Devices_HumanInterfaceDevice",
247247
"Win32_Foundation",
248248
"Win32_Globalization",

0 commit comments

Comments
 (0)