Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(core): unpin all dependencies, closes #6944 #6966

Merged
merged 1 commit into from
May 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .changes/unpin-deps.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
'tauri': patch
'tauri-build': patch
'tauri-codegen': patch
'tauri-runtime': patch
'tauri-runtime-wry': patch
---

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.
8 changes: 8 additions & 0 deletions .github/workflows/test-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,5 +82,13 @@ jobs:
workspaces: core -> ../target
save-if: ${{ matrix.features.key == 'all' }}

- name: Downgrade crates with MSRV conflict
# The --precise flag can only be used once per invocation.
run: |
cargo update -p time --precise 0.3.15
cargo update -p ignore --precise 0.4.18
cargo update -p winnow --precise 0.4.1
cargo update -p raw-window-handle --precise 0.5.0

- name: test
run: cargo test --target ${{ matrix.platform.target }} ${{ matrix.features.args }}
1 change: 0 additions & 1 deletion core/tauri-build/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ quote = { version = "1", optional = true }
tauri-codegen = { version = "1.3.0", path = "../tauri-codegen", optional = true }
tauri-utils = { version = "1.3.0", path = "../tauri-utils", features = [ "build", "resources" ] }
cargo_toml = "0.15"
winnow = "=0.4.1"
serde = "1"
serde_json = "1"
heck = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion core/tauri-codegen/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ json-patch = "1.0"

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

[features]
default = [ "compression" ]
Expand Down
2 changes: 1 addition & 1 deletion core/tauri-runtime-wry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ tauri-runtime = { version = "0.13.0", path = "../tauri-runtime" }
tauri-utils = { version = "1.3.0", path = "../tauri-utils" }
uuid = { version = "1", features = [ "v4" ] }
rand = "0.8"
raw-window-handle = "=0.5.0"
raw-window-handle = "0.5"

[target."cfg(windows)".dependencies]
webview2-com = "0.19.1"
Expand Down
2 changes: 1 addition & 1 deletion core/tauri-runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ tauri-utils = { version = "1.3.0", path = "../tauri-utils" }
uuid = { version = "1", features = [ "v4" ] }
http = "0.2.4"
http-range = "0.1.4"
raw-window-handle = "=0.5.0"
raw-window-handle = "0.5"
rand = "0.8"
url = { version = "2" }

Expand Down
7 changes: 3 additions & 4 deletions core/tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ state = "0.5"
tar = "0.4.38"
tempfile = "3"
zip = { version = "0.6", default-features = false, optional = true }
ignore = "=0.4.18"
ignore = "0.4"
flate2 = "1.0"
http = "0.2"
dirs-next = "2.0"
Expand All @@ -73,9 +73,9 @@ attohttpc = { version = "0.22", features = [ "compress", "json", "form" ], optio
open = { version = "3.2", optional = true }
shared_child = { version = "1.0", optional = true }
os_pipe = { version = "1.0", optional = true }
raw-window-handle = "=0.5.0"
raw-window-handle = "0.5"
minisign-verify = { version = "0.2", optional = true }
time = { version = "=0.3.15", features = [ "parsing", "formatting" ], optional = true }
time = { version = "0.3", features = [ "parsing", "formatting" ], optional = true }
os_info = { version = "3", optional = true }
regex = { version = "1.6.0", optional = true }
glob = "0.3"
Expand Down Expand Up @@ -123,7 +123,6 @@ tauri = { path = ".", default-features = false, features = [ "wry" ] }
tokio-test = "0.4.2"
tokio = { version = "1", features = [ "full" ] }
cargo_toml = "0.11"
winnow = "=0.4.1"

[features]
default = [ "wry", "compression", "objc-exception" ]
Expand Down
2 changes: 1 addition & 1 deletion core/tests/app-updater/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ serde = { version = "1", features = ["derive"] }
serde_json = "1"
tiny_http = "0.11"
tauri = { path = "../../tauri", features = ["updater"] }
time = { version = "=0.3.15", features = ["formatting"] }
time = { version = "0.3", features = ["formatting"] }

[features]
default = ["custom-protocol"]
Expand Down
2 changes: 1 addition & 1 deletion tooling/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ heck = { version = "0.4", features = [ "unicode" ] }
dialoguer = "0.10"
url = { version = "2.3", features = [ "serde" ] }
os_pipe = "1"
ignore = "=0.4.18"
ignore = "0.4"
ctrlc = "3.2"
log = { version = "0.4.17", features = [ "kv_unstable", "kv_unstable_std" ] }
env_logger = "0.9.1"
Expand Down