feat: Use the zbus-backed of notify-rust (tauri-apps#6332)

Co-authored-by: Lucas Nogueira <[email protected]>
korneliuszw · Mar 31, 2023 · 5fdc616 · 5fdc616
1 parent 1487b18
commit 5fdc616
Show file tree

Hide file tree

Showing 29 changed files with 45 additions and 33 deletions.
diff --git a/.changes/msrv-1.60.md b/.changes/msrv-1.60.md
@@ -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.
diff --git a/.github/workflows/test-core.yml b/.github/workflows/test-core.yml
@@ -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:
           - {

diff --git a/core/tauri-build/Cargo.toml b/core/tauri-build/Cargo.toml
@@ -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"
 

diff --git a/core/tauri-codegen/Cargo.toml b/core/tauri-codegen/Cargo.toml
@@ -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"
 

diff --git a/core/tauri-macros/Cargo.toml b/core/tauri-macros/Cargo.toml
@@ -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"
 

diff --git a/core/tauri-runtime-wry/Cargo.toml b/core/tauri-runtime-wry/Cargo.toml
@@ -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"
 

diff --git a/core/tauri-runtime/Cargo.toml b/core/tauri-runtime/Cargo.toml
@@ -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"
 

diff --git a/core/tauri-utils/Cargo.toml b/core/tauri-utils/Cargo.toml
@@ -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"
 

diff --git a/core/tauri/Cargo.toml b/core/tauri/Cargo.toml
@@ -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"
@@ -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 }
@@ -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" ] }
@@ -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" ] }

diff --git a/examples/api/src-tauri/Cargo.toml b/examples/api/src-tauri/Cargo.toml
@@ -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]

diff --git a/examples/resources/src-tauri/Cargo.toml b/examples/resources/src-tauri/Cargo.toml
@@ -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" ] }

diff --git a/examples/sidecar/src-tauri/Cargo.toml b/examples/sidecar/src-tauri/Cargo.toml
@@ -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"] }

diff --git a/examples/tauri-dynamic-lib/src-app1/Cargo.toml b/examples/tauri-dynamic-lib/src-app1/Cargo.toml
@@ -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]
 

diff --git a/examples/tauri-dynamic-lib/src-tauri/Cargo.toml b/examples/tauri-dynamic-lib/src-tauri/Cargo.toml
@@ -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]
 

diff --git a/examples/updater/src-tauri/Cargo.toml b/examples/updater/src-tauri/Cargo.toml
@@ -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]

diff --git a/examples/web/core/tauri/Cargo.toml b/examples/web/core/tauri/Cargo.toml
@@ -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 = [] }

diff --git a/examples/workspace/src-tauri/Cargo.toml b/examples/workspace/src-tauri/Cargo.toml
@@ -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 }

diff --git a/tooling/bench/Cargo.toml b/tooling/bench/Cargo.toml
@@ -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"

diff --git a/tooling/bench/tests/cpu_intensive/src-tauri/Cargo.toml b/tooling/bench/tests/cpu_intensive/src-tauri/Cargo.toml
@@ -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" ] }

diff --git a/tooling/bench/tests/files_transfer/src-tauri/Cargo.toml b/tooling/bench/tests/files_transfer/src-tauri/Cargo.toml
@@ -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" ] }

diff --git a/tooling/bench/tests/helloworld/src-tauri/Cargo.toml b/tooling/bench/tests/helloworld/src-tauri/Cargo.toml
@@ -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" ] }

diff --git a/tooling/bundler/Cargo.toml b/tooling/bundler/Cargo.toml
@@ -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]

diff --git a/tooling/cli/Cargo.toml b/tooling/cli/Cargo.toml
@@ -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"
@@ -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"

diff --git a/tooling/cli/node/test/jest/fixtures/app/src-tauri/Cargo.toml b/tooling/cli/node/test/jest/fixtures/app/src-tauri/Cargo.toml
@@ -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"

diff --git a/tooling/cli/templates/app/src-tauri/Cargo.crate-manifest b/tooling/cli/templates/app/src-tauri/Cargo.crate-manifest
@@ -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
 

diff --git a/tooling/cli/templates/plugin/backend/Cargo.crate-manifest b/tooling/cli/templates/plugin/backend/Cargo.crate-manifest
@@ -4,7 +4,7 @@ version = "0.0.0"
 authors = [ "{{ author }}" ]
 description = ""
 edition = "2021"
-rust-version = "1.59"
+rust-version = "1.60"
 exclude = ["/examples"]
 
 [dependencies]

diff --git a/tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/Cargo.crate-manifest b/tooling/cli/templates/plugin/backend/examples/vanilla/src-tauri/Cargo.crate-manifest
@@ -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"

diff --git a/tooling/cli/templates/plugin/with-api/Cargo.crate-manifest b/tooling/cli/templates/plugin/with-api/Cargo.crate-manifest
@@ -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]

diff --git a/tooling/cli/templates/plugin/with-api/examples/tauri-app/src-tauri/Cargo.toml b/tooling/cli/templates/plugin/with-api/examples/tauri-app/src-tauri/Cargo.toml
@@ -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