Skip to content
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
5 changes: 5 additions & 0 deletions .changes/crate-notify-rust.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"notification": patch
---

Use notify_rust from crates.io instead of local fork.
34 changes: 16 additions & 18 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 2 additions & 14 deletions plugins/notification/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,25 +32,13 @@ serde_repr = "0.1"
win7-notifications = { version = "0.4.3", optional = true }
windows-version = { version = "0.1", optional = true }

[target."cfg(all(unix, not(target_os = \"macos\")))".dependencies]
lazy_static = { version = "1", optional = true }
zbus = { version = "4", optional = true }
log = "0.4"
env_logger = { version = "0.10", optional = true }

[target."cfg(target_os=\"macos\")".dependencies]
mac-notification-sys = "0.6"
chrono = { version = "0.4", optional = true }

[target."cfg(target_os=\"windows\")".dependencies]
winrt-notification = { package = "tauri-winrt-notification", version = "0.4.0" }
[target."cfg(any(target_os = \"macos\", windows, target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
notify-rust = "4.11"

[dev-dependencies]
color-backtrace = "0.6"
ctor = "0.2"
maplit = "1"

[features]
default = [ "zbus", "async" ]
async = [ ]
windows7-compat = [ "win7-notifications", "windows-version" ]
4 changes: 2 additions & 2 deletions plugins/notification/src/desktop.rs
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ mod imp {
deprecated = "This function does not work on Windows 7. Use `Self::notify` instead."
)]
pub fn show(self) -> crate::Result<()> {
let mut notification = crate::notify_rust::Notification::new();
let mut notification = notify_rust::Notification::new();
if let Some(body) = self.body {
notification.body(&body);
}
Expand All @@ -186,7 +186,7 @@ mod imp {
}
#[cfg(target_os = "macos")]
{
let _ = crate::notify_rust::set_application(if tauri::is_dev() {
let _ = notify_rust::set_application(if tauri::is_dev() {
"com.apple.Terminal"
} else {
&self.identifier
Expand Down
3 changes: 0 additions & 3 deletions plugins/notification/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ mod commands;
mod error;
mod models;

#[allow(dead_code, unused_imports, deprecated, clippy::derivable_impls)]
mod notify_rust;

pub use error::{Error, Result};

#[cfg(desktop)]
Expand Down
161 changes: 0 additions & 161 deletions plugins/notification/src/notify_rust/error.rs

This file was deleted.

Loading