Skip to content

Commit

Permalink
feat: Use the zbus-backed of notify-rust (#6332)
Browse files Browse the repository at this point in the history
Co-authored-by: Lucas Nogueira <lucas@tauri.studio>
  • Loading branch information
zeenix and lucasfernog authored Mar 31, 2023
1 parent 1487b18 commit 5fdc616
Show file tree
Hide file tree
Showing 29 changed files with 45 additions and 33 deletions.
13 changes: 13 additions & 0 deletions .changes/msrv-1.60.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
"cli.rs": minor
"tauri-bundler": minor
"tauri": minor
"tauri-build": minor
"tauri-codegen": minor
"tauri-macros": minor
"tauri-utils": minor
"tauri-runtime": minor
"tauri-runtime-wry": minor
---

Bump minimum supported Rust version to 1.60.
4 changes: 2 additions & 2 deletions .github/workflows/test-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ jobs:
- {
target: x86_64-unknown-linux-gnu,
os: ubuntu-latest,
toolchain: '1.59.0'
toolchain: '1.60.0'
}
- {
target: x86_64-apple-darwin,
os: macos-latest,
toolchain: '1.59.0'
toolchain: '1.60.0'
}
features:
- {
Expand Down
2 changes: 1 addition & 1 deletion core/tauri-build/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ homepage = "https://tauri.app"
repository = "https://github.com/tauri-apps/tauri/tree/dev/core/tauri-build"
description = "build time code to pair with https://crates.io/crates/tauri"
edition = "2021"
rust-version = "1.59"
rust-version = "1.60"
exclude = [ "CHANGELOG.md", "/target" ]
readme = "README.md"

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 @@ -8,7 +8,7 @@ homepage = "https://tauri.app"
repository = "https://github.com/tauri-apps/tauri/tree/dev/core/tauri-codegen"
description = "code generation meant to be consumed inside of `tauri` through `tauri-build` or `tauri-macros`"
edition = "2021"
rust-version = "1.59"
rust-version = "1.60"
exclude = [ "CHANGELOG.md", "/target" ]
readme = "README.md"

Expand Down
2 changes: 1 addition & 1 deletion core/tauri-macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ homepage = "https://tauri.app"
repository = "https://github.com/tauri-apps/tauri"
description = "Macros for the tauri crate."
edition = "2021"
rust-version = "1.59"
rust-version = "1.60"
exclude = [ "CHANGELOG.md", "/target" ]
readme = "README.md"

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 @@ -8,7 +8,7 @@ homepage = "https://tauri.app"
repository = "https://github.com/tauri-apps/tauri"
description = "Wry bindings to the Tauri runtime"
edition = "2021"
rust-version = "1.59"
rust-version = "1.60"
exclude = [ "CHANGELOG.md", "/target" ]
readme = "README.md"

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 @@ -8,7 +8,7 @@ homepage = "https://tauri.app"
repository = "https://github.com/tauri-apps/tauri"
description = "Runtime for Tauri applications"
edition = "2021"
rust-version = "1.59"
rust-version = "1.60"
exclude = [ "CHANGELOG.md", "/target" ]
readme = "README.md"

Expand Down
2 changes: 1 addition & 1 deletion core/tauri-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ homepage = "https://tauri.app"
repository = "https://github.com/tauri-apps/tauri"
description = "Utilities for Tauri"
edition = "2021"
rust-version = "1.59"
rust-version = "1.60"
exclude = [ "CHANGELOG.md", "/target" ]
readme = "README.md"

Expand Down
7 changes: 3 additions & 4 deletions core/tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ authors = [ "Tauri Programme within The Commons Conservancy" ]
categories = [ "gui", "web-programming" ]
description = "Make tiny, secure apps for all desktop platforms with Tauri"
edition = "2021"
rust-version = "1.59"
rust-version = "1.60"
exclude = [ "/test", "/.scripts", "CHANGELOG.md", "/target" ]
homepage = "https://tauri.app"
license = "Apache-2.0 OR MIT"
Expand Down Expand Up @@ -76,7 +76,7 @@ os_pipe = { version = "1.0", optional = true }
raw-window-handle = "=0.5.0"
minisign-verify = { version = "0.2", optional = true }
time = { version = "=0.3.15", features = [ "parsing", "formatting" ], optional = true }
os_info = { version = "=3.5.0", optional = true }
os_info = { version = "3", optional = true }
regex = { version = "1.6.0", optional = true }
glob = "0.3"
data-url = { version = "0.2", optional = true }
Expand All @@ -88,7 +88,7 @@ encoding_rs = "0.8.31"

[target."cfg(any(target_os = \"macos\", windows, target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
rfd = { version = "0.10", optional = true, features=["gtk3", "common-controls-v6"] }
notify-rust = { version = "4.5", default-features = false, features = [ "d" ], optional = true }
notify-rust = { version = "4.5", optional = true }

[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 All @@ -115,7 +115,6 @@ once_cell = "1"
[dev-dependencies]
mockito = "0.31"
proptest = "1.0.0"
unarray = "=0.1.3"
quickcheck = "1.0.3"
quickcheck_macros = "1.0.0"
serde = { version = "1.0", features = [ "derive" ] }
Expand Down
2 changes: 1 addition & 1 deletion examples/api/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "api"
version = "0.1.0"
description = "An example Tauri Application showcasing the api"
edition = "2021"
rust-version = "1.59"
rust-version = "1.60"
license = "Apache-2.0 OR MIT"

[lib]
Expand Down
2 changes: 1 addition & 1 deletion examples/resources/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "resources"
version = "0.1.0"
description = "A Tauri application that uses Node.js with app resources"
edition = "2021"
rust-version = "1.59"
rust-version = "1.60"

[build-dependencies]
tauri-build = { path = "../../../core/tauri-build", features = [ "codegen" ] }
Expand Down
2 changes: 1 addition & 1 deletion examples/sidecar/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "sidecar"
version = "0.1.0"
description = "A Tauri application with a sidecar binary"
edition = "2021"
rust-version = "1.59"
rust-version = "1.60"

[build-dependencies]
tauri-build = { path = "../../../core/tauri-build", features = ["codegen"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/tauri-dynamic-lib/src-app1/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "app1"
version = "0.1.0"
description = "A simple app that makes a dll call"
edition = "2021"
rust-version = "1.59"
rust-version = "1.60"

[workspace]

Expand Down
2 changes: 1 addition & 1 deletion examples/tauri-dynamic-lib/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "tauri_app"
version = "0.1.0"
description = "A very simple Dll Library that runs tauri and launches a webview window"
edition = "2021"
rust-version = "1.59"
rust-version = "1.60"

[workspace]

Expand Down
2 changes: 1 addition & 1 deletion examples/updater/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "updater-example"
version = "0.1.0"
description = "A very simple Tauri Application"
edition = "2021"
rust-version = "1.59"
rust-version = "1.60"
license = "Apache-2.0 OR MIT"

[build-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion examples/web/core/tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ license = ""
repository = ""
default-run = "app"
edition = "2021"
rust-version = "1.59"
rust-version = "1.60"

[build-dependencies]
tauri-build = { path = "../../../../core/tauri-build", features = [] }
Expand Down
2 changes: 1 addition & 1 deletion examples/workspace/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ license = ""
repository = ""
default-run = "app"
edition = "2021"
rust-version = "1.59"
rust-version = "1.60"

[build-dependencies]
tauri-build = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion tooling/bench/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name = "tauri_bench"
version = "0.1.0"
authors = [ "Tauri Programme within The Commons Conservancy" ]
edition = "2021"
rust-version = "1.59"
rust-version = "1.60"
license = "Apache-2.0 OR MIT"
description = "Cross-platform WebView rendering library"
repository = "https://github.com/tauri-apps/wry"
Expand Down
2 changes: 1 addition & 1 deletion tooling/bench/tests/cpu_intensive/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "bench_cpu_intensive"
version = "0.1.0"
description = "A very simple Tauri Application"
edition = "2021"
rust-version = "1.59"
rust-version = "1.60"

[build-dependencies]
tauri-build = { path = "../../../../../core/tauri-build", features = [ "codegen" ] }
Expand Down
2 changes: 1 addition & 1 deletion tooling/bench/tests/files_transfer/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "bench_files_transfer"
version = "0.1.0"
description = "A very simple Tauri Application"
edition = "2021"
rust-version = "1.59"
rust-version = "1.60"

[build-dependencies]
tauri-build = { path = "../../../../../core/tauri-build", features = [ "codegen" ] }
Expand Down
2 changes: 1 addition & 1 deletion tooling/bench/tests/helloworld/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "bench_helloworld"
version = "0.1.0"
description = "A very simple Tauri Application"
edition = "2021"
rust-version = "1.59"
rust-version = "1.60"

[build-dependencies]
tauri-build = { path = "../../../../../core/tauri-build", features = [ "codegen" ] }
Expand Down
2 changes: 1 addition & 1 deletion tooling/bundler/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ keywords = [ "bundle", "cargo", "tauri" ]
repository = "https://github.com/tauri-apps/tauri"
description = "Wrap rust executables in OS-specific app bundles for Tauri"
edition = "2021"
rust-version = "1.59"
rust-version = "1.60"
exclude = [ "CHANGELOG.md", "/target", "rustfmt.toml" ]

[dependencies]
Expand Down
4 changes: 2 additions & 2 deletions tooling/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name = "tauri-cli"
version = "1.2.3"
authors = [ "Tauri Programme within The Commons Conservancy" ]
edition = "2021"
rust-version = "1.59"
rust-version = "1.60"
categories = [ "gui", "web-programming" ]
license = "Apache-2.0 OR MIT"
homepage = "https://tauri.app"
Expand Down Expand Up @@ -59,7 +59,7 @@ include_dir = "0.7"
minisign = "0.7"
base64 = "0.21.0"
ureq = "2.5"
os_info = "3.5"
os_info = "3"
semver = "1.0"
regex = "1.6.0"
unicode-width = "0.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ authors = [ "Tauri Programme within The Commons Conservancy" ]
license = ""
repository = ""
edition = "2021"
rust-version = "1.59"
rust-version = "1.60"

[package.metadata.bundle]
identifier = "com.tauri.dev"
Expand Down
2 changes: 1 addition & 1 deletion tooling/cli/templates/app/src-tauri/Cargo.crate-manifest
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ license = ""
repository = ""
default-run = "app"
edition = "2021"
rust-version = "1.59"
rust-version = "1.60"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
2 changes: 1 addition & 1 deletion tooling/cli/templates/plugin/backend/Cargo.crate-manifest
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = [ "{{ author }}" ]
description = ""
edition = "2021"
rust-version = "1.59"
rust-version = "1.60"
exclude = ["/examples"]

[dependencies]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description = "A Tauri App"
authors = [ "{{ author }}" ]
repository = ""
edition = "2021"
rust-version = "1.59"
rust-version = "1.60"

[dependencies]
serde_json = "1.0"
Expand Down
2 changes: 1 addition & 1 deletion tooling/cli/templates/plugin/with-api/Cargo.crate-manifest
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.0"
authors = [ "{{ author }}" ]
description = ""
edition = "2021"
rust-version = "1.59"
rust-version = "1.60"
exclude = ["/examples", "/webview-dist", "/webview-src", "node_modules"]

[dependencies]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ authors = ["you"]
license = ""
repository = ""
edition = "2021"
rust-version = "1.59"
rust-version = "1.60"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down

0 comments on commit 5fdc616

Please sign in to comment.