M component/tooltip_desktop.go => component/tooltip_desktop.go +2 -1
@@ 1,4 1,5 @@
-//+build !android,!ios
+//go:build !android && !ios
+// +build !android,!ios
package component
M component/tooltip_mobile.go => component/tooltip_mobile.go +2 -1
@@ 1,4 1,5 @@
-//+build ios android
+//go:build ios || android
+// +build ios android
package component
M explorer/explorer_unsupported.go => explorer/explorer_unsupported.go +1 -0
@@ 1,5 1,6 @@
// SPDX-License-Identifier: Unlicense OR MIT
+//go:build !android && !windows && !js
// +build !android,!windows,!js
package explorer
M haptic/haptic_android.go => haptic/haptic_android.go +3 -1
@@ 1,4 1,6 @@
-//+build !linux
+//go:build !linux
+// +build !linux
+
/*
Package haptic provides access to haptic feedback methods on Android to gio
applications.
M haptic/haptic_default.go => haptic/haptic_default.go +2 -1
@@ 1,4 1,5 @@
-//+build !android,!ios
+//go:build !android && !ios
+// +build !android,!ios
package haptic
M haptic/haptic_ios.go => haptic/haptic_ios.go +2 -1
@@ 1,4 1,5 @@
-//+build ios,cgo
+//go:build ios && cgo
+// +build ios,cgo
package haptic
M notify/macos/niotify_test.go => notify/macos/niotify_test.go +2 -1
@@ 1,4 1,5 @@
-//+build darwin,cgo
+//go:build darwin && cgo
+// +build darwin,cgo
package macos
M notify/macos/notify_macos.go => notify/macos/notify_macos.go +2 -1
@@ 1,4 1,5 @@
-//+build darwin,cgo
+//go:build darwin && cgo
+// +build darwin,cgo
package macos
M notify/notification_manager.go => notify/notification_manager.go +8 -8
@@ 49,13 49,13 @@ func (noop) Cancel() error {
// Push a notification to the OS.
func Push(title, text string) (Notification, error) {
- implLock.Lock()
- defer implLock.Unlock()
- if impl == nil && implErr == nil {
- impl, implErr = newNotifier()
- }
- if implErr != nil {
- return nil, implErr
- }
+ implLock.Lock()
+ defer implLock.Unlock()
+ if impl == nil && implErr == nil {
+ impl, implErr = newNotifier()
+ }
+ if implErr != nil {
+ return nil, implErr
+ }
return impl.CreateNotification(title, text)
}
M notify/notify_android.go => notify/notify_android.go +2 -1
@@ 1,4 1,5 @@
-//+build android
+//go:build android
+// +build android
package notify
M notify/notify_darwin.go => notify/notify_darwin.go +2 -1
@@ 1,4 1,5 @@
-//+build darwin
+//go:build darwin
+// +build darwin
package notify
M notify/notify_dbus.go => notify/notify_dbus.go +3 -2
@@ 1,4 1,5 @@
-//+build linux,!android openbsd freebsd netbsd
+//go:build (linux && !android) || openbsd || freebsd || netbsd
+// +build linux,!android openbsd freebsd netbsd
package notify
@@ 45,7 46,7 @@ func (l *dbusNotifier) CreateNotification(title, text string) (Notification, err
return nil, err
}
return &dbusNotification{
- id: id,
+ id: id,
dbusNotifier: l,
}, nil
}
M notify/notify_unsupported.go => notify/notify_unsupported.go +2 -1
@@ 1,4 1,5 @@
-//+build !linux,!android,!openbsd,!freebsd,!dragonfly,!netbsd,!darwin,!windows
+//go:build !linux && !android && !openbsd && !freebsd && !dragonfly && !netbsd && !darwin && !windows
+// +build !linux,!android,!openbsd,!freebsd,!dragonfly,!netbsd,!darwin,!windows
package notify
M notify/notify_windows.go => notify/notify_windows.go +2 -1
@@ 1,4 1,5 @@
-//+build windows
+//go:build windows
+// +build windows
package notify
M pref/battery/battery_unsupported.go => pref/battery/battery_unsupported.go +2 -1
@@ 1,4 1,5 @@
-//+build !js,!windows,!android
+//go:build !js && !windows && !android
+// +build !js,!windows,!android
package battery
M pref/locale/locale_linux.go => pref/locale/locale_linux.go +2 -1
@@ 1,4 1,5 @@
-//+build !android
+//go:build !android
+// +build !android
package locale
M pref/locale/locale_unsupported.go => pref/locale/locale_unsupported.go +2 -1
@@ 1,4 1,5 @@
-//+build !js,!windows,!android,!linux
+//go:build !js && !windows && !android && !linux
+// +build !js,!windows,!android,!linux
package locale
M pref/theme/theme_unsupported.go => pref/theme/theme_unsupported.go +2 -1
@@ 1,4 1,5 @@
-//+build !js,!windows,!android
+//go:build !js && !windows && !android
+// +build !js,!windows,!android
package theme