Skip to content

Commit d2710e9

Browse files
authored
fix(core): unpin all dependencies, closes #6944 (#6966)
1 parent 3700793 commit d2710e9

File tree

9 files changed

+25
-10
lines changed

9 files changed

+25
-10
lines changed

.changes/unpin-deps.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
'tauri': patch
3+
'tauri-build': patch
4+
'tauri-codegen': patch
5+
'tauri-runtime': patch
6+
'tauri-runtime-wry': patch
7+
---
8+
9+
Unpin `time`, `ignore`, `winnow`, and `ignore` crate versions. Developers now have to pin crates if needed themselves. A list of crates that need pinning to adhere to Tauri's MSRV will be visible in Tauri's GitHub workflow: https://github.com/tauri-apps/tauri/blob/dev/.github/workflows/test-core.yml#L85.

.github/workflows/test-core.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,5 +82,13 @@ jobs:
8282
workspaces: core -> ../target
8383
save-if: ${{ matrix.features.key == 'all' }}
8484

85+
- name: Downgrade crates with MSRV conflict
86+
# The --precise flag can only be used once per invocation.
87+
run: |
88+
cargo update -p time --precise 0.3.15
89+
cargo update -p ignore --precise 0.4.18
90+
cargo update -p winnow --precise 0.4.1
91+
cargo update -p raw-window-handle --precise 0.5.0
92+
8593
- name: test
8694
run: cargo test --target ${{ matrix.platform.target }} ${{ matrix.features.args }}

core/tauri-build/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ quote = { version = "1", optional = true }
2222
tauri-codegen = { version = "1.3.0", path = "../tauri-codegen", optional = true }
2323
tauri-utils = { version = "1.3.0", path = "../tauri-utils", features = [ "build", "resources" ] }
2424
cargo_toml = "0.15"
25-
winnow = "=0.4.1"
2625
serde = "1"
2726
serde_json = "1"
2827
heck = "0.4"

core/tauri-codegen/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ json-patch = "1.0"
3232

3333
[target."cfg(target_os = \"macos\")".dependencies]
3434
plist = "1"
35-
time = { version = "=0.3.15", features = [ "parsing", "formatting" ] }
35+
time = { version = "0.3", features = [ "parsing", "formatting" ] }
3636

3737
[features]
3838
default = [ "compression" ]

core/tauri-runtime-wry/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ tauri-runtime = { version = "0.13.0", path = "../tauri-runtime" }
1818
tauri-utils = { version = "1.3.0", path = "../tauri-utils" }
1919
uuid = { version = "1", features = [ "v4" ] }
2020
rand = "0.8"
21-
raw-window-handle = "=0.5.0"
21+
raw-window-handle = "0.5"
2222

2323
[target."cfg(windows)".dependencies]
2424
webview2-com = "0.19.1"

core/tauri-runtime/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ tauri-utils = { version = "1.3.0", path = "../tauri-utils" }
3030
uuid = { version = "1", features = [ "v4" ] }
3131
http = "0.2.4"
3232
http-range = "0.1.4"
33-
raw-window-handle = "=0.5.0"
33+
raw-window-handle = "0.5"
3434
rand = "0.8"
3535
url = { version = "2" }
3636

core/tauri/Cargo.toml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ state = "0.5"
6060
tar = "0.4.38"
6161
tempfile = "3"
6262
zip = { version = "0.6", default-features = false, optional = true }
63-
ignore = "=0.4.18"
63+
ignore = "0.4"
6464
flate2 = "1.0"
6565
http = "0.2"
6666
dirs-next = "2.0"
@@ -73,9 +73,9 @@ attohttpc = { version = "0.22", features = [ "compress", "json", "form" ], optio
7373
open = { version = "3.2", optional = true }
7474
shared_child = { version = "1.0", optional = true }
7575
os_pipe = { version = "1.0", optional = true }
76-
raw-window-handle = "=0.5.0"
76+
raw-window-handle = "0.5"
7777
minisign-verify = { version = "0.2", optional = true }
78-
time = { version = "=0.3.15", features = [ "parsing", "formatting" ], optional = true }
78+
time = { version = "0.3", features = [ "parsing", "formatting" ], optional = true }
7979
os_info = { version = "3", optional = true }
8080
regex = { version = "1.6.0", optional = true }
8181
glob = "0.3"
@@ -123,7 +123,6 @@ tauri = { path = ".", default-features = false, features = [ "wry" ] }
123123
tokio-test = "0.4.2"
124124
tokio = { version = "1", features = [ "full" ] }
125125
cargo_toml = "0.11"
126-
winnow = "=0.4.1"
127126

128127
[features]
129128
default = [ "wry", "compression", "objc-exception" ]

core/tests/app-updater/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ serde = { version = "1", features = ["derive"] }
1111
serde_json = "1"
1212
tiny_http = "0.11"
1313
tauri = { path = "../../tauri", features = ["updater"] }
14-
time = { version = "=0.3.15", features = ["formatting"] }
14+
time = { version = "0.3", features = ["formatting"] }
1515

1616
[features]
1717
default = ["custom-protocol"]

tooling/cli/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ heck = { version = "0.4", features = [ "unicode" ] }
6868
dialoguer = "0.10"
6969
url = { version = "2.3", features = [ "serde" ] }
7070
os_pipe = "1"
71-
ignore = "=0.4.18"
71+
ignore = "0.4"
7272
ctrlc = "3.2"
7373
log = { version = "0.4.17", features = [ "kv_unstable", "kv_unstable_std" ] }
7474
env_logger = "0.9.1"

0 commit comments

Comments
 (0)