From 32bc3d709addc80ec060e3e23d52e667c813de3f Mon Sep 17 00:00:00 2001 From: Jacob Date: Tue, 2 Jan 2024 12:18:41 +0100 Subject: [PATCH] Switch from +build to go:build --- app/app_darwin.go | 1 - app/app_darwin.m | 1 - app/app_darwin_test.go | 1 - app/app_desktop_darwin.go | 1 - app/app_desktop_darwin.m | 1 - app/app_gl.go | 1 - app/app_goxjs.go | 3 --- app/app_mobile.go | 2 -- app/app_mobile_and.c | 1 - app/app_mobile_and.go | 1 - app/app_mobile_and_test.go | 1 - app/app_mobile_ios.go | 1 - app/app_mobile_ios.m | 1 - app/app_notlegacy_darwin.go | 1 - app/app_openurl_wasm.go | 1 - app/app_openurl_web.go | 1 - app/app_other.go | 1 - app/app_software.go | 1 - app/app_theme_wasm.go | 1 - app/app_theme_web.go | 1 - app/app_windows.go | 1 - app/app_windows_test.go | 1 - app/app_xdg.go | 5 ----- app/preferences_android.go | 1 - app/preferences_ios.go | 1 - app/preferences_mobile.go | 1 - app/preferences_other.go | 1 - app/settings_desktop.go | 1 - app/settings_desktop_test.go | 1 - app/settings_file.go | 1 - app/settings_goxjs.go | 1 - app/settings_mobile.go | 1 - app/settings_noanimation.go | 1 - cmd/fyne/internal/commands/install_other.go | 1 - cmd/fyne/internal/mobile/binres/genarsc.go | 1 - cmd/fyne/internal/mobile/gendex/gendex.go | 1 - container/apptabs_desktop_test.go | 1 - container/apptabs_mobile_test.go | 1 - container/doctabs_desktop_test.go | 1 - container/doctabs_mobile_test.go | 1 - data/binding/gen.go | 1 - dialog/file_darwin.go | 1 - dialog/file_goxjs.go | 1 - dialog/file_mobile.go | 1 - dialog/file_other_test.go | 1 - dialog/file_unix.go | 1 - dialog/file_xdg.go | 4 ---- dialog/file_xdg_flatpak.go | 1 - dialog/file_xdg_notflatpak.go | 1 - dialog/file_xdg_test.go | 2 -- driver/native_android.go | 1 - driver/native_other.go | 1 - internal/animation/animation_test.go | 1 - internal/async/gen.go | 1 - internal/build/driver_flatpak.go | 1 - internal/build/driver_notflatpak.go | 1 - internal/build/driver_notwayland.go | 1 - internal/build/driver_wayland.go | 1 - internal/build/hints_disabled.go | 1 - internal/build/hints_enabled.go | 1 - internal/build/mode_debug.go | 1 - internal/build/mode_release.go | 1 - internal/build/mode_standard.go | 1 - internal/cache/texture_desktop.go | 1 - internal/cache/texture_desktop_test.go | 1 - internal/cache/texture_gomobile.go | 1 - internal/cache/texture_gomobile_test.go | 1 - internal/cache/texture_goxjs.go | 1 - internal/driver/glfw/canvas_other_test.go | 3 --- internal/driver/glfw/canvas_test.go | 1 - internal/driver/glfw/clipboard.go | 1 - internal/driver/glfw/clipboard_goxjs.go | 1 - internal/driver/glfw/device_desktop.go | 1 - internal/driver/glfw/device_goxjs.go | 1 - internal/driver/glfw/device_test.go | 1 - internal/driver/glfw/driver_desktop.go | 1 - internal/driver/glfw/driver_goxjs.go | 1 - internal/driver/glfw/driver_notwindows.go | 1 - internal/driver/glfw/driver_test.go | 1 - internal/driver/glfw/driver_web.go | 1 - internal/driver/glfw/glfw_core.go | 3 --- internal/driver/glfw/glfw_es.go | 4 ---- internal/driver/glfw/glfw_goxjs.go | 1 - internal/driver/glfw/glfw_test.go | 1 - internal/driver/glfw/loop_desktop.go | 1 - internal/driver/glfw/loop_goxjs.go | 1 - internal/driver/glfw/loop_test.go | 1 - internal/driver/glfw/menu_bar_test.go | 2 -- internal/driver/glfw/menu_darwin.go | 1 - internal/driver/glfw/menu_darwin.m | 1 - internal/driver/glfw/menu_darwin_test.go | 1 - internal/driver/glfw/menu_notweb.go | 1 - internal/driver/glfw/menu_other.go | 1 - internal/driver/glfw/menu_other_test.go | 3 --- internal/driver/glfw/menu_test.go | 1 - internal/driver/glfw/menu_web.go | 1 - internal/driver/glfw/scale_test.go | 1 - internal/driver/glfw/scroll_speed_darwin.go | 1 - internal/driver/glfw/scroll_speed_default.go | 1 - internal/driver/glfw/shortcuts_other.go | 1 - internal/driver/glfw/shortcuts_wasm.go | 1 - internal/driver/glfw/window_desktop.go | 1 - internal/driver/glfw/window_desktop_test.go | 1 - internal/driver/glfw/window_goxjs.go | 1 - internal/driver/glfw/window_notwindows.go | 1 - internal/driver/glfw/window_notxdg.go | 1 - internal/driver/glfw/window_test.go | 1 - internal/driver/glfw/window_wasm.go | 1 - internal/driver/glfw/window_wayland.go | 2 -- internal/driver/glfw/window_x11.go | 4 ---- internal/driver/glfw/window_xdg.go | 1 - internal/driver/mobile/android.c | 1 - internal/driver/mobile/app/android.c | 2 +- internal/driver/mobile/app/android.go | 1 - internal/driver/mobile/app/app.go | 1 - internal/driver/mobile/app/callfn/callfn.go | 2 -- internal/driver/mobile/app/darwin_desktop.go | 1 - internal/driver/mobile/app/darwin_desktop.m | 3 +-- internal/driver/mobile/app/darwin_ios.go | 1 - internal/driver/mobile/app/darwin_ios.m | 1 - internal/driver/mobile/app/shiny.go | 1 - internal/driver/mobile/app/x11.c | 1 - internal/driver/mobile/app/x11.go | 1 - internal/driver/mobile/canvas_test.go | 1 - internal/driver/mobile/clipboard_android.go | 1 - internal/driver/mobile/clipboard_desktop.go | 1 - internal/driver/mobile/clipboard_ios.go | 1 - internal/driver/mobile/clipboard_ios.m | 1 - internal/driver/mobile/device_android.go | 1 - internal/driver/mobile/device_desktop.go | 1 - internal/driver/mobile/device_ios.go | 1 - internal/driver/mobile/device_wayland.go | 1 - internal/driver/mobile/file_android.go | 1 - internal/driver/mobile/file_desktop.go | 1 - internal/driver/mobile/file_ios.go | 1 - internal/driver/mobile/file_ios.m | 1 - internal/driver/mobile/folder_android.go | 1 - internal/driver/mobile/folder_desktop.go | 1 - internal/driver/mobile/folder_ios.go | 1 - internal/driver/mobile/folder_ios.m | 1 - internal/driver/mobile/gl/gl.go | 1 - internal/driver/mobile/gl/types.go | 1 - internal/driver/mobile/gl/work.c | 1 - internal/driver/mobile/gl/work.go | 1 - internal/driver/mobile/gl/work_other.go | 2 -- internal/driver/mobile/menu_test.go | 1 - internal/driver/mobile/mobileinit/mobileinit_ios.go | 2 -- internal/driver/mobile/mobileinit/mobileinit_ios.m | 2 -- internal/driver/mobile/uri.go | 1 - internal/driver/mobile/uri_android.go | 1 - internal/hints_disabled.go | 1 - internal/hints_enabled.go | 1 - internal/painter/gl/draw_test.go | 1 - internal/painter/gl/gl_core.go | 1 - internal/painter/gl/gl_es.go | 7 ------- internal/painter/gl/gl_gomobile.go | 2 -- internal/painter/gl/gl_goxjs.go | 1 - internal/painter/gl/gl_test.go | 1 - key_other.go | 1 - test/device_mobile.go | 1 - test/device_other.go | 1 - theme/bundled-emoji.go | 1 - theme/gen.go | 3 +-- theme/theme_hints.go | 1 - theme/theme_other.go | 1 - theme/unbundled-emoji.go | 1 - widget/fileicon_internal_test.go | 1 - widget/menu_desktop_test.go | 1 - widget/menu_internal_desktop_test.go | 1 - widget/menu_internal_mobile_test.go | 1 - widget/menu_item_other.go | 1 - widget/menu_mobile_test.go | 1 - widget/popup_menu_desktop_test.go | 1 - widget/table_desktop_test.go | 1 - 174 files changed, 3 insertions(+), 212 deletions(-) diff --git a/app/app_darwin.go b/app/app_darwin.go index 8e6e08668f..54087b71d1 100644 --- a/app/app_darwin.go +++ b/app/app_darwin.go @@ -1,5 +1,4 @@ //go:build !ci && !wasm && !test_web_driver -// +build !ci,!wasm,!test_web_driver package app diff --git a/app/app_darwin.m b/app/app_darwin.m index e5d0718f4e..5afb52bc56 100644 --- a/app/app_darwin.m +++ b/app/app_darwin.m @@ -1,5 +1,4 @@ //go:build !ci -// +build !ci #import #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101400 diff --git a/app/app_darwin_test.go b/app/app_darwin_test.go index 960b22ce8d..ec65428fa7 100644 --- a/app/app_darwin_test.go +++ b/app/app_darwin_test.go @@ -1,5 +1,4 @@ //go:build !ci && !ios -// +build !ci,!ios package app diff --git a/app/app_desktop_darwin.go b/app/app_desktop_darwin.go index eb93777e8b..33adb3fb20 100644 --- a/app/app_desktop_darwin.go +++ b/app/app_desktop_darwin.go @@ -1,5 +1,4 @@ //go:build !ci && !ios && !wasm && !test_web_driver -// +build !ci,!ios,!wasm,!test_web_driver package app diff --git a/app/app_desktop_darwin.m b/app/app_desktop_darwin.m index b28a3ee71b..a571f6642a 100644 --- a/app/app_desktop_darwin.m +++ b/app/app_desktop_darwin.m @@ -1,5 +1,4 @@ //go:build !ci && !ios -// +build !ci,!ios extern void themeChanged(); diff --git a/app/app_gl.go b/app/app_gl.go index 511f6e26fe..1f34caaa2f 100644 --- a/app/app_gl.go +++ b/app/app_gl.go @@ -1,5 +1,4 @@ //go:build !ci && !android && !ios && !mobile -// +build !ci,!android,!ios,!mobile package app diff --git a/app/app_goxjs.go b/app/app_goxjs.go index 2392408875..e003518ea6 100644 --- a/app/app_goxjs.go +++ b/app/app_goxjs.go @@ -1,7 +1,4 @@ //go:build !ci && (!android || !ios || !mobile) && (wasm || test_web_driver) -// +build !ci -// +build !android !ios !mobile -// +build wasm test_web_driver package app diff --git a/app/app_mobile.go b/app/app_mobile.go index 1dbcdd4e07..9976bb0d88 100644 --- a/app/app_mobile.go +++ b/app/app_mobile.go @@ -1,6 +1,4 @@ //go:build !ci && (android || ios || mobile) -// +build !ci -// +build android ios mobile package app diff --git a/app/app_mobile_and.c b/app/app_mobile_and.c index cbe6dc2336..a21e330ec0 100644 --- a/app/app_mobile_and.c +++ b/app/app_mobile_and.c @@ -1,5 +1,4 @@ //go:build !ci && android -// +build !ci,android #include #include diff --git a/app/app_mobile_and.go b/app/app_mobile_and.go index 64f07c4dfa..35baf26e14 100644 --- a/app/app_mobile_and.go +++ b/app/app_mobile_and.go @@ -1,5 +1,4 @@ //go:build !ci && android -// +build !ci,android package app diff --git a/app/app_mobile_and_test.go b/app/app_mobile_and_test.go index e82dd81ffa..da0244cb1f 100644 --- a/app/app_mobile_and_test.go +++ b/app/app_mobile_and_test.go @@ -1,5 +1,4 @@ //go:build !ci && android -// +build !ci,android package app diff --git a/app/app_mobile_ios.go b/app/app_mobile_ios.go index c479e099b7..fb79323d91 100644 --- a/app/app_mobile_ios.go +++ b/app/app_mobile_ios.go @@ -1,5 +1,4 @@ //go:build !ci && ios -// +build !ci,ios package app diff --git a/app/app_mobile_ios.m b/app/app_mobile_ios.m index c0f60c1e97..d1e6ab48b6 100644 --- a/app/app_mobile_ios.m +++ b/app/app_mobile_ios.m @@ -1,5 +1,4 @@ //go:build !ci && ios -// +build !ci,ios #import diff --git a/app/app_notlegacy_darwin.go b/app/app_notlegacy_darwin.go index 01153c93b2..f1c065ebbb 100644 --- a/app/app_notlegacy_darwin.go +++ b/app/app_notlegacy_darwin.go @@ -1,5 +1,4 @@ //go:build !ci && !legacy && !wasm && !test_web_driver -// +build !ci,!legacy,!wasm,!test_web_driver package app diff --git a/app/app_openurl_wasm.go b/app/app_openurl_wasm.go index 82f851aa4a..75397fe655 100644 --- a/app/app_openurl_wasm.go +++ b/app/app_openurl_wasm.go @@ -1,5 +1,4 @@ //go:build !ci && wasm -// +build !ci,wasm package app diff --git a/app/app_openurl_web.go b/app/app_openurl_web.go index 9b039938ed..b03d040281 100644 --- a/app/app_openurl_web.go +++ b/app/app_openurl_web.go @@ -1,5 +1,4 @@ //go:build !ci && !wasm && test_web_driver -// +build !ci,!wasm,test_web_driver package app diff --git a/app/app_other.go b/app/app_other.go index d74089e59d..d20799ba7f 100644 --- a/app/app_other.go +++ b/app/app_other.go @@ -1,5 +1,4 @@ //go:build ci || (!linux && !darwin && !windows && !freebsd && !openbsd && !netbsd && !wasm && !test_web_driver) -// +build ci !linux,!darwin,!windows,!freebsd,!openbsd,!netbsd,!wasm,!test_web_driver package app diff --git a/app/app_software.go b/app/app_software.go index fbded3d26c..ccdcb097cf 100644 --- a/app/app_software.go +++ b/app/app_software.go @@ -1,5 +1,4 @@ //go:build ci -// +build ci package app diff --git a/app/app_theme_wasm.go b/app/app_theme_wasm.go index a67a820b23..66f141e338 100644 --- a/app/app_theme_wasm.go +++ b/app/app_theme_wasm.go @@ -1,5 +1,4 @@ //go:build !ci && wasm -// +build !ci,wasm package app diff --git a/app/app_theme_web.go b/app/app_theme_web.go index 48ad5ef8c4..df16339216 100644 --- a/app/app_theme_web.go +++ b/app/app_theme_web.go @@ -1,5 +1,4 @@ //go:build !ci && !wasm && test_web_driver -// +build !ci,!wasm,test_web_driver package app diff --git a/app/app_windows.go b/app/app_windows.go index 60d9b0a166..3b6ea44681 100644 --- a/app/app_windows.go +++ b/app/app_windows.go @@ -1,5 +1,4 @@ //go:build !ci && !android && !ios && !wasm && !test_web_driver -// +build !ci,!android,!ios,!wasm,!test_web_driver package app diff --git a/app/app_windows_test.go b/app/app_windows_test.go index 0a607522ce..ebf36f1136 100644 --- a/app/app_windows_test.go +++ b/app/app_windows_test.go @@ -1,5 +1,4 @@ //go:build !ci && !android && !ios -// +build !ci,!android,!ios package app diff --git a/app/app_xdg.go b/app/app_xdg.go index de39cecead..c6ae218c4b 100644 --- a/app/app_xdg.go +++ b/app/app_xdg.go @@ -1,9 +1,4 @@ //go:build !ci && !wasm && !test_web_driver && (linux || openbsd || freebsd || netbsd) && !android -// +build !ci -// +build !wasm -// +build !test_web_driver -// +build linux openbsd freebsd netbsd -// +build !android package app diff --git a/app/preferences_android.go b/app/preferences_android.go index d51353098c..a2e7e47fbf 100644 --- a/app/preferences_android.go +++ b/app/preferences_android.go @@ -1,5 +1,4 @@ //go:build android -// +build android package app diff --git a/app/preferences_ios.go b/app/preferences_ios.go index 6e0ddf7bfa..8720dcf331 100644 --- a/app/preferences_ios.go +++ b/app/preferences_ios.go @@ -1,5 +1,4 @@ //go:build ios -// +build ios package app diff --git a/app/preferences_mobile.go b/app/preferences_mobile.go index 72f601c5bf..0faa122672 100644 --- a/app/preferences_mobile.go +++ b/app/preferences_mobile.go @@ -1,5 +1,4 @@ //go:build mobile -// +build mobile package app diff --git a/app/preferences_other.go b/app/preferences_other.go index 6304676d8f..4b997dcfd2 100644 --- a/app/preferences_other.go +++ b/app/preferences_other.go @@ -1,5 +1,4 @@ //go:build !ios && !android && !mobile -// +build !ios,!android,!mobile package app diff --git a/app/settings_desktop.go b/app/settings_desktop.go index 7832835a1c..c3de2120f1 100644 --- a/app/settings_desktop.go +++ b/app/settings_desktop.go @@ -1,5 +1,4 @@ //go:build !android && !ios && !mobile && !wasm && !test_web_driver -// +build !android,!ios,!mobile,!wasm,!test_web_driver package app diff --git a/app/settings_desktop_test.go b/app/settings_desktop_test.go index 0ffcd93bea..ea9f5c7c0d 100644 --- a/app/settings_desktop_test.go +++ b/app/settings_desktop_test.go @@ -1,5 +1,4 @@ //go:build !android && !ios && !mobile -// +build !android,!ios,!mobile package app diff --git a/app/settings_file.go b/app/settings_file.go index eb0426f672..a8bc94b2f2 100644 --- a/app/settings_file.go +++ b/app/settings_file.go @@ -1,5 +1,4 @@ //go:build !wasm && !test_web_driver -// +build !wasm,!test_web_driver package app diff --git a/app/settings_goxjs.go b/app/settings_goxjs.go index 2acf5bfeb9..b17aac0adf 100644 --- a/app/settings_goxjs.go +++ b/app/settings_goxjs.go @@ -1,5 +1,4 @@ //go:build wasm || test_web_driver -// +build wasm test_web_driver package app diff --git a/app/settings_mobile.go b/app/settings_mobile.go index 01a5f91765..642a7e7a01 100644 --- a/app/settings_mobile.go +++ b/app/settings_mobile.go @@ -1,5 +1,4 @@ //go:build android || ios || mobile -// +build android ios mobile package app diff --git a/app/settings_noanimation.go b/app/settings_noanimation.go index b7b3527ed6..7d808d8dcb 100644 --- a/app/settings_noanimation.go +++ b/app/settings_noanimation.go @@ -1,5 +1,4 @@ //go:build no_animations -// +build no_animations package app diff --git a/cmd/fyne/internal/commands/install_other.go b/cmd/fyne/internal/commands/install_other.go index 886ec869e6..8d8046972d 100644 --- a/cmd/fyne/internal/commands/install_other.go +++ b/cmd/fyne/internal/commands/install_other.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package commands diff --git a/cmd/fyne/internal/mobile/binres/genarsc.go b/cmd/fyne/internal/mobile/binres/genarsc.go index db8706d99a..536e4f7161 100644 --- a/cmd/fyne/internal/mobile/binres/genarsc.go +++ b/cmd/fyne/internal/mobile/binres/genarsc.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build ignore -// +build ignore // Genarsc generates stripped down version of android.jar resources used // for validation of manifest entries. diff --git a/cmd/fyne/internal/mobile/gendex/gendex.go b/cmd/fyne/internal/mobile/gendex/gendex.go index 4bfb50f38d..be78637e67 100644 --- a/cmd/fyne/internal/mobile/gendex/gendex.go +++ b/cmd/fyne/internal/mobile/gendex/gendex.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build gendex -// +build gendex // Gendex generates a dex file used by Go apps created with gomobile. // diff --git a/container/apptabs_desktop_test.go b/container/apptabs_desktop_test.go index aca2bc3e34..642e8ae7b9 100644 --- a/container/apptabs_desktop_test.go +++ b/container/apptabs_desktop_test.go @@ -1,5 +1,4 @@ //go:build !mobile -// +build !mobile package container_test diff --git a/container/apptabs_mobile_test.go b/container/apptabs_mobile_test.go index f22c20db7a..ffae2fff77 100644 --- a/container/apptabs_mobile_test.go +++ b/container/apptabs_mobile_test.go @@ -1,5 +1,4 @@ //go:build mobile -// +build mobile package container_test diff --git a/container/doctabs_desktop_test.go b/container/doctabs_desktop_test.go index 80641d7ca9..dc2949de02 100644 --- a/container/doctabs_desktop_test.go +++ b/container/doctabs_desktop_test.go @@ -1,5 +1,4 @@ //go:build !mobile -// +build !mobile package container_test diff --git a/container/doctabs_mobile_test.go b/container/doctabs_mobile_test.go index 034c3ed9cf..730e21430d 100644 --- a/container/doctabs_mobile_test.go +++ b/container/doctabs_mobile_test.go @@ -1,5 +1,4 @@ //go:build mobile -// +build mobile package container_test diff --git a/data/binding/gen.go b/data/binding/gen.go index 6b444a8ad6..d2788e81af 100644 --- a/data/binding/gen.go +++ b/data/binding/gen.go @@ -1,5 +1,4 @@ //go:build ignore -// +build ignore package main diff --git a/dialog/file_darwin.go b/dialog/file_darwin.go index 9d7f756ca7..991aaa16f6 100644 --- a/dialog/file_darwin.go +++ b/dialog/file_darwin.go @@ -1,5 +1,4 @@ //go:build !ios && !android && !wasm && !js -// +build !ios,!android,!wasm,!js package dialog diff --git a/dialog/file_goxjs.go b/dialog/file_goxjs.go index 2dafd38ddc..d311ec6b62 100644 --- a/dialog/file_goxjs.go +++ b/dialog/file_goxjs.go @@ -1,5 +1,4 @@ //go:build wasm || js -// +build wasm js package dialog diff --git a/dialog/file_mobile.go b/dialog/file_mobile.go index f3a7f0fe41..1d2aa0259a 100644 --- a/dialog/file_mobile.go +++ b/dialog/file_mobile.go @@ -1,5 +1,4 @@ //go:build ios || android -// +build ios android package dialog diff --git a/dialog/file_other_test.go b/dialog/file_other_test.go index 3dd0d70999..c026a36917 100644 --- a/dialog/file_other_test.go +++ b/dialog/file_other_test.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package dialog diff --git a/dialog/file_unix.go b/dialog/file_unix.go index dea11fbe4a..ce3743b378 100644 --- a/dialog/file_unix.go +++ b/dialog/file_unix.go @@ -1,5 +1,4 @@ //go:build !windows && !android && !ios && !wasm && !js -// +build !windows,!android,!ios,!wasm,!js package dialog diff --git a/dialog/file_xdg.go b/dialog/file_xdg.go index 824aa1bce3..627268daf3 100644 --- a/dialog/file_xdg.go +++ b/dialog/file_xdg.go @@ -1,8 +1,4 @@ //go:build (linux || openbsd || freebsd || netbsd) && !android && !wasm && !js -// +build linux openbsd freebsd netbsd -// +build !android -// +build !wasm -// +build !js package dialog diff --git a/dialog/file_xdg_flatpak.go b/dialog/file_xdg_flatpak.go index c69c9fdf5b..8d7972131d 100644 --- a/dialog/file_xdg_flatpak.go +++ b/dialog/file_xdg_flatpak.go @@ -1,5 +1,4 @@ //go:build flatpak && !windows && !android && !ios && !wasm && !js -// +build flatpak,!windows,!android,!ios,!wasm,!js package dialog diff --git a/dialog/file_xdg_notflatpak.go b/dialog/file_xdg_notflatpak.go index 5531a6476a..4494e18b7f 100644 --- a/dialog/file_xdg_notflatpak.go +++ b/dialog/file_xdg_notflatpak.go @@ -1,5 +1,4 @@ //go:build !flatpak && !windows && !android && !ios && !wasm && !js -// +build !flatpak,!windows,!android,!ios,!wasm,!js package dialog diff --git a/dialog/file_xdg_test.go b/dialog/file_xdg_test.go index d198fee186..1d7887e245 100644 --- a/dialog/file_xdg_test.go +++ b/dialog/file_xdg_test.go @@ -1,6 +1,4 @@ //go:build (linux || openbsd || freebsd || netbsd) && !android -// +build linux openbsd freebsd netbsd -// +build !android package dialog diff --git a/driver/native_android.go b/driver/native_android.go index bd7f383b96..98e179a060 100644 --- a/driver/native_android.go +++ b/driver/native_android.go @@ -1,5 +1,4 @@ //go:build android -// +build android package driver diff --git a/driver/native_other.go b/driver/native_other.go index 8dac0d8d5c..6b2518eeab 100644 --- a/driver/native_other.go +++ b/driver/native_other.go @@ -1,5 +1,4 @@ //go:build !android -// +build !android package driver diff --git a/internal/animation/animation_test.go b/internal/animation/animation_test.go index cb5b173170..96b5f3300a 100644 --- a/internal/animation/animation_test.go +++ b/internal/animation/animation_test.go @@ -1,5 +1,4 @@ //go:build !ci || !darwin -// +build !ci !darwin package animation diff --git a/internal/async/gen.go b/internal/async/gen.go index fb95af7c83..50e8fc3d30 100644 --- a/internal/async/gen.go +++ b/internal/async/gen.go @@ -1,5 +1,4 @@ //go:build ignore -// +build ignore package main diff --git a/internal/build/driver_flatpak.go b/internal/build/driver_flatpak.go index 96f3315a4e..0261f7b93e 100644 --- a/internal/build/driver_flatpak.go +++ b/internal/build/driver_flatpak.go @@ -1,5 +1,4 @@ //go:build flatpak -// +build flatpak package build diff --git a/internal/build/driver_notflatpak.go b/internal/build/driver_notflatpak.go index d2f79cdc46..2f891ba76f 100644 --- a/internal/build/driver_notflatpak.go +++ b/internal/build/driver_notflatpak.go @@ -1,5 +1,4 @@ //go:build !flatpak -// +build !flatpak package build diff --git a/internal/build/driver_notwayland.go b/internal/build/driver_notwayland.go index dbe88559c7..ba398c2041 100644 --- a/internal/build/driver_notwayland.go +++ b/internal/build/driver_notwayland.go @@ -1,5 +1,4 @@ //go:build !wayland -// +build !wayland package build diff --git a/internal/build/driver_wayland.go b/internal/build/driver_wayland.go index eaa86cf1c1..d48bb5150c 100644 --- a/internal/build/driver_wayland.go +++ b/internal/build/driver_wayland.go @@ -1,5 +1,4 @@ //go:build wayland -// +build wayland package build diff --git a/internal/build/hints_disabled.go b/internal/build/hints_disabled.go index 42274ae37f..f8919d0f40 100644 --- a/internal/build/hints_disabled.go +++ b/internal/build/hints_disabled.go @@ -1,5 +1,4 @@ //go:build !hints -// +build !hints package build diff --git a/internal/build/hints_enabled.go b/internal/build/hints_enabled.go index 041dd985d7..db627a3878 100644 --- a/internal/build/hints_enabled.go +++ b/internal/build/hints_enabled.go @@ -1,5 +1,4 @@ //go:build hints -// +build hints package build diff --git a/internal/build/mode_debug.go b/internal/build/mode_debug.go index e89ac6c13a..9658ddcb6f 100644 --- a/internal/build/mode_debug.go +++ b/internal/build/mode_debug.go @@ -1,5 +1,4 @@ //go:build debug -// +build debug package build diff --git a/internal/build/mode_release.go b/internal/build/mode_release.go index 8c4f6604f6..3b6937e905 100644 --- a/internal/build/mode_release.go +++ b/internal/build/mode_release.go @@ -1,5 +1,4 @@ //go:build release -// +build release package build diff --git a/internal/build/mode_standard.go b/internal/build/mode_standard.go index c46dac9992..7565646eab 100644 --- a/internal/build/mode_standard.go +++ b/internal/build/mode_standard.go @@ -1,5 +1,4 @@ //go:build !debug && !release -// +build !debug,!release package build diff --git a/internal/cache/texture_desktop.go b/internal/cache/texture_desktop.go index e1f826694c..26062eb7e5 100644 --- a/internal/cache/texture_desktop.go +++ b/internal/cache/texture_desktop.go @@ -1,5 +1,4 @@ //go:build !android && !ios && !mobile && !wasm && !test_web_driver -// +build !android,!ios,!mobile,!wasm,!test_web_driver package cache diff --git a/internal/cache/texture_desktop_test.go b/internal/cache/texture_desktop_test.go index ce9232bb9b..518b1fa4d6 100644 --- a/internal/cache/texture_desktop_test.go +++ b/internal/cache/texture_desktop_test.go @@ -1,5 +1,4 @@ //go:build !android && !ios && !mobile -// +build !android,!ios,!mobile package cache_test diff --git a/internal/cache/texture_gomobile.go b/internal/cache/texture_gomobile.go index a259963e4d..4b0d89cfd7 100644 --- a/internal/cache/texture_gomobile.go +++ b/internal/cache/texture_gomobile.go @@ -1,5 +1,4 @@ //go:build android || ios || mobile -// +build android ios mobile package cache diff --git a/internal/cache/texture_gomobile_test.go b/internal/cache/texture_gomobile_test.go index 62dbbdb7fc..7e962ed998 100644 --- a/internal/cache/texture_gomobile_test.go +++ b/internal/cache/texture_gomobile_test.go @@ -1,5 +1,4 @@ //go:build android || ios || mobile -// +build android ios mobile package cache_test diff --git a/internal/cache/texture_goxjs.go b/internal/cache/texture_goxjs.go index c686e1f3d7..17669ea596 100644 --- a/internal/cache/texture_goxjs.go +++ b/internal/cache/texture_goxjs.go @@ -1,5 +1,4 @@ //go:build wasm || test_web_driver -// +build wasm test_web_driver package cache diff --git a/internal/driver/glfw/canvas_other_test.go b/internal/driver/glfw/canvas_other_test.go index 17e7694a65..8a7f04ac85 100644 --- a/internal/driver/glfw/canvas_other_test.go +++ b/internal/driver/glfw/canvas_other_test.go @@ -1,7 +1,4 @@ //go:build !no_glfw && !mobile && (!darwin || no_native_menus) -// +build !no_glfw -// +build !mobile -// +build !darwin no_native_menus package glfw diff --git a/internal/driver/glfw/canvas_test.go b/internal/driver/glfw/canvas_test.go index 57a8845857..fce55e7c3f 100644 --- a/internal/driver/glfw/canvas_test.go +++ b/internal/driver/glfw/canvas_test.go @@ -1,5 +1,4 @@ //go:build !no_glfw && !mobile -// +build !no_glfw,!mobile package glfw diff --git a/internal/driver/glfw/clipboard.go b/internal/driver/glfw/clipboard.go index db5b82d2ff..d0aac66d1a 100644 --- a/internal/driver/glfw/clipboard.go +++ b/internal/driver/glfw/clipboard.go @@ -1,5 +1,4 @@ //go:build !wasm && !test_web_driver -// +build !wasm,!test_web_driver package glfw diff --git a/internal/driver/glfw/clipboard_goxjs.go b/internal/driver/glfw/clipboard_goxjs.go index 7928831baa..239158f746 100644 --- a/internal/driver/glfw/clipboard_goxjs.go +++ b/internal/driver/glfw/clipboard_goxjs.go @@ -1,5 +1,4 @@ //go:build wasm || test_web_driver -// +build wasm test_web_driver package glfw diff --git a/internal/driver/glfw/device_desktop.go b/internal/driver/glfw/device_desktop.go index 8685cb46d0..b56ee294d7 100644 --- a/internal/driver/glfw/device_desktop.go +++ b/internal/driver/glfw/device_desktop.go @@ -1,5 +1,4 @@ //go:build !wasm -// +build !wasm package glfw diff --git a/internal/driver/glfw/device_goxjs.go b/internal/driver/glfw/device_goxjs.go index dba18461e9..bca9de6942 100644 --- a/internal/driver/glfw/device_goxjs.go +++ b/internal/driver/glfw/device_goxjs.go @@ -1,5 +1,4 @@ //go:build wasm -// +build wasm package glfw diff --git a/internal/driver/glfw/device_test.go b/internal/driver/glfw/device_test.go index 3cc253dcee..11e3cb2049 100644 --- a/internal/driver/glfw/device_test.go +++ b/internal/driver/glfw/device_test.go @@ -1,5 +1,4 @@ //go:build !wasm -// +build !wasm package glfw diff --git a/internal/driver/glfw/driver_desktop.go b/internal/driver/glfw/driver_desktop.go index 10f145a6f6..62cff6d106 100644 --- a/internal/driver/glfw/driver_desktop.go +++ b/internal/driver/glfw/driver_desktop.go @@ -1,5 +1,4 @@ //go:build !wasm && !test_web_driver -// +build !wasm,!test_web_driver package glfw diff --git a/internal/driver/glfw/driver_goxjs.go b/internal/driver/glfw/driver_goxjs.go index 564bdb6d10..036de76820 100644 --- a/internal/driver/glfw/driver_goxjs.go +++ b/internal/driver/glfw/driver_goxjs.go @@ -1,5 +1,4 @@ //go:build wasm -// +build wasm package glfw diff --git a/internal/driver/glfw/driver_notwindows.go b/internal/driver/glfw/driver_notwindows.go index 4fd0ef432c..fad4b39f90 100644 --- a/internal/driver/glfw/driver_notwindows.go +++ b/internal/driver/glfw/driver_notwindows.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package glfw diff --git a/internal/driver/glfw/driver_test.go b/internal/driver/glfw/driver_test.go index 080d683862..01910c3a7e 100644 --- a/internal/driver/glfw/driver_test.go +++ b/internal/driver/glfw/driver_test.go @@ -1,5 +1,4 @@ //go:build !no_glfw && !mobile -// +build !no_glfw,!mobile package glfw diff --git a/internal/driver/glfw/driver_web.go b/internal/driver/glfw/driver_web.go index 5b12e53251..973dda9c5a 100644 --- a/internal/driver/glfw/driver_web.go +++ b/internal/driver/glfw/driver_web.go @@ -1,5 +1,4 @@ //go:build wasm || test_web_driver -// +build wasm test_web_driver package glfw diff --git a/internal/driver/glfw/glfw_core.go b/internal/driver/glfw/glfw_core.go index ea06527b3a..4a0b1a1f72 100644 --- a/internal/driver/glfw/glfw_core.go +++ b/internal/driver/glfw/glfw_core.go @@ -1,7 +1,4 @@ //go:build ((!gles && !arm && !arm64) || darwin) && !wasm && !test_web_driver -// +build !gles,!arm,!arm64 darwin -// +build !wasm -// +build !test_web_driver package glfw diff --git a/internal/driver/glfw/glfw_es.go b/internal/driver/glfw/glfw_es.go index 34f4a6cd73..d3a7b1186d 100644 --- a/internal/driver/glfw/glfw_es.go +++ b/internal/driver/glfw/glfw_es.go @@ -1,8 +1,4 @@ //go:build (gles || arm || arm64) && !darwin && !wasm && !test_web_driver -// +build gles arm arm64 -// +build !darwin -// +build !wasm -// +build !test_web_driver package glfw diff --git a/internal/driver/glfw/glfw_goxjs.go b/internal/driver/glfw/glfw_goxjs.go index 89de5aa178..9236608a91 100644 --- a/internal/driver/glfw/glfw_goxjs.go +++ b/internal/driver/glfw/glfw_goxjs.go @@ -1,5 +1,4 @@ //go:build wasm || test_web_driver -// +build wasm test_web_driver package glfw diff --git a/internal/driver/glfw/glfw_test.go b/internal/driver/glfw/glfw_test.go index a4004c80e5..90613703c8 100644 --- a/internal/driver/glfw/glfw_test.go +++ b/internal/driver/glfw/glfw_test.go @@ -1,5 +1,4 @@ //go:build !no_glfw && !mobile -// +build !no_glfw,!mobile package glfw diff --git a/internal/driver/glfw/loop_desktop.go b/internal/driver/glfw/loop_desktop.go index d89aa2d3a5..f522a42fc7 100644 --- a/internal/driver/glfw/loop_desktop.go +++ b/internal/driver/glfw/loop_desktop.go @@ -1,5 +1,4 @@ //go:build !wasm && !test_web_driver -// +build !wasm,!test_web_driver package glfw diff --git a/internal/driver/glfw/loop_goxjs.go b/internal/driver/glfw/loop_goxjs.go index c99f9a7d65..d45c691d5b 100644 --- a/internal/driver/glfw/loop_goxjs.go +++ b/internal/driver/glfw/loop_goxjs.go @@ -1,5 +1,4 @@ //go:build wasm || test_web_driver -// +build wasm test_web_driver package glfw diff --git a/internal/driver/glfw/loop_test.go b/internal/driver/glfw/loop_test.go index 05ba2c3403..20807a7ff6 100644 --- a/internal/driver/glfw/loop_test.go +++ b/internal/driver/glfw/loop_test.go @@ -1,5 +1,4 @@ //go:build !no_glfw && !mobile -// +build !no_glfw,!mobile package glfw diff --git a/internal/driver/glfw/menu_bar_test.go b/internal/driver/glfw/menu_bar_test.go index bb07e1d7fa..64b3729fa0 100644 --- a/internal/driver/glfw/menu_bar_test.go +++ b/internal/driver/glfw/menu_bar_test.go @@ -1,6 +1,4 @@ //go:build !mobile && (!no_glfw || !windows) -// +build !mobile -// +build !no_glfw !windows package glfw_test diff --git a/internal/driver/glfw/menu_darwin.go b/internal/driver/glfw/menu_darwin.go index be5899d644..7b2629edbb 100644 --- a/internal/driver/glfw/menu_darwin.go +++ b/internal/driver/glfw/menu_darwin.go @@ -1,5 +1,4 @@ //go:build !no_native_menus && !wasm && !test_web_driver -// +build !no_native_menus,!wasm,!test_web_driver package glfw diff --git a/internal/driver/glfw/menu_darwin.m b/internal/driver/glfw/menu_darwin.m index e9038c7a27..458c5ab269 100644 --- a/internal/driver/glfw/menu_darwin.m +++ b/internal/driver/glfw/menu_darwin.m @@ -1,5 +1,4 @@ //go:build !no_native_menus -// +build !no_native_menus #import #import diff --git a/internal/driver/glfw/menu_darwin_test.go b/internal/driver/glfw/menu_darwin_test.go index 9ddc72012f..d2ee99dac1 100644 --- a/internal/driver/glfw/menu_darwin_test.go +++ b/internal/driver/glfw/menu_darwin_test.go @@ -1,5 +1,4 @@ //go:build !no_glfw && !no_native_menus && !mobile -// +build !no_glfw,!no_native_menus,!mobile package glfw diff --git a/internal/driver/glfw/menu_notweb.go b/internal/driver/glfw/menu_notweb.go index 3547a46a04..3cd7a6f515 100644 --- a/internal/driver/glfw/menu_notweb.go +++ b/internal/driver/glfw/menu_notweb.go @@ -1,5 +1,4 @@ //go:build !wasm && !test_web_driver -// +build !wasm,!test_web_driver package glfw diff --git a/internal/driver/glfw/menu_other.go b/internal/driver/glfw/menu_other.go index d4f7b0d918..9eeacc8e94 100644 --- a/internal/driver/glfw/menu_other.go +++ b/internal/driver/glfw/menu_other.go @@ -1,5 +1,4 @@ //go:build !darwin || wasm || test_web_driver || no_native_menus -// +build !darwin wasm test_web_driver no_native_menus package glfw diff --git a/internal/driver/glfw/menu_other_test.go b/internal/driver/glfw/menu_other_test.go index 673b49b329..3eb1a43e15 100644 --- a/internal/driver/glfw/menu_other_test.go +++ b/internal/driver/glfw/menu_other_test.go @@ -1,7 +1,4 @@ //go:build !no_glfw && (!darwin || no_native_menus) && !mobile -// +build !no_glfw -// +build !darwin no_native_menus -// +build !mobile package glfw diff --git a/internal/driver/glfw/menu_test.go b/internal/driver/glfw/menu_test.go index cb3b341861..40e35ec836 100644 --- a/internal/driver/glfw/menu_test.go +++ b/internal/driver/glfw/menu_test.go @@ -1,5 +1,4 @@ //go:build !no_glfw && !mobile -// +build !no_glfw,!mobile package glfw diff --git a/internal/driver/glfw/menu_web.go b/internal/driver/glfw/menu_web.go index 78f75ae54d..215937bb46 100644 --- a/internal/driver/glfw/menu_web.go +++ b/internal/driver/glfw/menu_web.go @@ -1,5 +1,4 @@ //go:build wasm || test_web_driver -// +build wasm test_web_driver package glfw diff --git a/internal/driver/glfw/scale_test.go b/internal/driver/glfw/scale_test.go index f1035e8fba..081693521b 100644 --- a/internal/driver/glfw/scale_test.go +++ b/internal/driver/glfw/scale_test.go @@ -1,5 +1,4 @@ //go:build !mobile -// +build !mobile package glfw diff --git a/internal/driver/glfw/scroll_speed_darwin.go b/internal/driver/glfw/scroll_speed_darwin.go index b018f5da9e..4434a717c1 100644 --- a/internal/driver/glfw/scroll_speed_darwin.go +++ b/internal/driver/glfw/scroll_speed_darwin.go @@ -1,5 +1,4 @@ //go:build darwin -// +build darwin package glfw diff --git a/internal/driver/glfw/scroll_speed_default.go b/internal/driver/glfw/scroll_speed_default.go index 70265378f8..401b5fa4aa 100644 --- a/internal/driver/glfw/scroll_speed_default.go +++ b/internal/driver/glfw/scroll_speed_default.go @@ -1,5 +1,4 @@ //go:build !darwin -// +build !darwin package glfw diff --git a/internal/driver/glfw/shortcuts_other.go b/internal/driver/glfw/shortcuts_other.go index 549b21c4e9..2214079968 100644 --- a/internal/driver/glfw/shortcuts_other.go +++ b/internal/driver/glfw/shortcuts_other.go @@ -1,5 +1,4 @@ //go:build !wasm -// +build !wasm package glfw diff --git a/internal/driver/glfw/shortcuts_wasm.go b/internal/driver/glfw/shortcuts_wasm.go index bb1055101e..042b563566 100644 --- a/internal/driver/glfw/shortcuts_wasm.go +++ b/internal/driver/glfw/shortcuts_wasm.go @@ -1,5 +1,4 @@ //go:build wasm -// +build wasm package glfw diff --git a/internal/driver/glfw/window_desktop.go b/internal/driver/glfw/window_desktop.go index ba509b7ab5..a3acbc0c1f 100644 --- a/internal/driver/glfw/window_desktop.go +++ b/internal/driver/glfw/window_desktop.go @@ -1,5 +1,4 @@ //go:build !wasm && !test_web_driver -// +build !wasm,!test_web_driver package glfw diff --git a/internal/driver/glfw/window_desktop_test.go b/internal/driver/glfw/window_desktop_test.go index 3cba4c5202..7d98da578d 100644 --- a/internal/driver/glfw/window_desktop_test.go +++ b/internal/driver/glfw/window_desktop_test.go @@ -1,5 +1,4 @@ //go:build !wasm && !test_web_driver -// +build !wasm,!test_web_driver package glfw diff --git a/internal/driver/glfw/window_goxjs.go b/internal/driver/glfw/window_goxjs.go index ef6fea7afe..b8dde32648 100644 --- a/internal/driver/glfw/window_goxjs.go +++ b/internal/driver/glfw/window_goxjs.go @@ -1,5 +1,4 @@ //go:build wasm || test_web_driver -// +build wasm test_web_driver package glfw diff --git a/internal/driver/glfw/window_notwindows.go b/internal/driver/glfw/window_notwindows.go index 169e2cefa1..03108435c9 100644 --- a/internal/driver/glfw/window_notwindows.go +++ b/internal/driver/glfw/window_notwindows.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package glfw diff --git a/internal/driver/glfw/window_notxdg.go b/internal/driver/glfw/window_notxdg.go index 34e34a879f..76a0a9ee72 100644 --- a/internal/driver/glfw/window_notxdg.go +++ b/internal/driver/glfw/window_notxdg.go @@ -1,5 +1,4 @@ //go:build !linux && !freebsd && !openbsd && !netbsd -// +build !linux,!freebsd,!openbsd,!netbsd package glfw diff --git a/internal/driver/glfw/window_test.go b/internal/driver/glfw/window_test.go index c0e8718ed5..e9babc98ef 100644 --- a/internal/driver/glfw/window_test.go +++ b/internal/driver/glfw/window_test.go @@ -1,5 +1,4 @@ //go:build !no_glfw && !mobile -// +build !no_glfw,!mobile package glfw diff --git a/internal/driver/glfw/window_wasm.go b/internal/driver/glfw/window_wasm.go index 8a5c99b238..83fcdfcdf1 100644 --- a/internal/driver/glfw/window_wasm.go +++ b/internal/driver/glfw/window_wasm.go @@ -1,5 +1,4 @@ //go:build wasm || test_web_driver -// +build wasm test_web_driver package glfw diff --git a/internal/driver/glfw/window_wayland.go b/internal/driver/glfw/window_wayland.go index 84909d9310..ea6b84f0bb 100644 --- a/internal/driver/glfw/window_wayland.go +++ b/internal/driver/glfw/window_wayland.go @@ -1,6 +1,4 @@ //go:build wayland && (linux || freebsd || openbsd || netbsd) -// +build wayland -// +build linux freebsd openbsd netbsd package glfw diff --git a/internal/driver/glfw/window_x11.go b/internal/driver/glfw/window_x11.go index bc8da918c5..13ed9b010f 100644 --- a/internal/driver/glfw/window_x11.go +++ b/internal/driver/glfw/window_x11.go @@ -1,8 +1,4 @@ //go:build !wayland && (linux || freebsd || openbsd || netbsd) && !wasm && !test_web_driver -// +build !wayland -// +build linux freebsd openbsd netbsd -// +build !wasm -// +build !test_web_driver package glfw diff --git a/internal/driver/glfw/window_xdg.go b/internal/driver/glfw/window_xdg.go index a8f4331a8a..1c5c7200a1 100644 --- a/internal/driver/glfw/window_xdg.go +++ b/internal/driver/glfw/window_xdg.go @@ -1,5 +1,4 @@ //go:build linux || freebsd || openbsd || netbsd -// +build linux freebsd openbsd netbsd package glfw diff --git a/internal/driver/mobile/android.c b/internal/driver/mobile/android.c index f1c5bcc620..afc898dbe0 100644 --- a/internal/driver/mobile/android.c +++ b/internal/driver/mobile/android.c @@ -1,5 +1,4 @@ //go:build android -// +build android #include #include diff --git a/internal/driver/mobile/app/android.c b/internal/driver/mobile/app/android.c index efe35195ae..56c759a2aa 100644 --- a/internal/driver/mobile/app/android.c +++ b/internal/driver/mobile/app/android.c @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// +build android +//go:build android #include #include diff --git a/internal/driver/mobile/app/android.go b/internal/driver/mobile/app/android.go index dc874199db..824900f8d9 100644 --- a/internal/driver/mobile/app/android.go +++ b/internal/driver/mobile/app/android.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build android -// +build android /* Android Apps are built with -buildmode=c-shared. They are loaded by a diff --git a/internal/driver/mobile/app/app.go b/internal/driver/mobile/app/app.go index de56614499..bbff34948e 100644 --- a/internal/driver/mobile/app/app.go +++ b/internal/driver/mobile/app/app.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build freebsd || linux || darwin || windows || openbsd -// +build freebsd linux darwin windows openbsd package app diff --git a/internal/driver/mobile/app/callfn/callfn.go b/internal/driver/mobile/app/callfn/callfn.go index 7a3d0506e6..ecc3d456f5 100644 --- a/internal/driver/mobile/app/callfn/callfn.go +++ b/internal/driver/mobile/app/callfn/callfn.go @@ -3,8 +3,6 @@ // license that can be found in the LICENSE file. //go:build android && (arm || 386 || amd64 || arm64) -// +build android -// +build arm 386 amd64 arm64 // Package callfn provides an android entry point. // diff --git a/internal/driver/mobile/app/darwin_desktop.go b/internal/driver/mobile/app/darwin_desktop.go index 5b7041f465..2a7801bbc7 100644 --- a/internal/driver/mobile/app/darwin_desktop.go +++ b/internal/driver/mobile/app/darwin_desktop.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build darwin && !ios -// +build darwin,!ios package app diff --git a/internal/driver/mobile/app/darwin_desktop.m b/internal/driver/mobile/app/darwin_desktop.m index 0a77b72a25..7d2c3dc48c 100644 --- a/internal/driver/mobile/app/darwin_desktop.m +++ b/internal/driver/mobile/app/darwin_desktop.m @@ -2,8 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// +build darwin -// +build !ios +//go:build darwin || !ios #include "_cgo_export.h" #include diff --git a/internal/driver/mobile/app/darwin_ios.go b/internal/driver/mobile/app/darwin_ios.go index d40ec5a29e..b0c68babf7 100644 --- a/internal/driver/mobile/app/darwin_ios.go +++ b/internal/driver/mobile/app/darwin_ios.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build darwin && ios -// +build darwin,ios package app diff --git a/internal/driver/mobile/app/darwin_ios.m b/internal/driver/mobile/app/darwin_ios.m index 6cce1d07a3..c3db9775d0 100644 --- a/internal/driver/mobile/app/darwin_ios.m +++ b/internal/driver/mobile/app/darwin_ios.m @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build darwin && ios -// +build darwin,ios #include "_cgo_export.h" #include diff --git a/internal/driver/mobile/app/shiny.go b/internal/driver/mobile/app/shiny.go index 8784215080..0ebf488dfb 100644 --- a/internal/driver/mobile/app/shiny.go +++ b/internal/driver/mobile/app/shiny.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build windows -// +build windows package app diff --git a/internal/driver/mobile/app/x11.c b/internal/driver/mobile/app/x11.c index c0c86ade4f..c83b2fd9c4 100644 --- a/internal/driver/mobile/app/x11.c +++ b/internal/driver/mobile/app/x11.c @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build (linux && !android) || freebsd || openbsd -// +build linux,!android freebsd openbsd #include "_cgo_export.h" #include diff --git a/internal/driver/mobile/app/x11.go b/internal/driver/mobile/app/x11.go index c9e2d524cd..da42a69421 100644 --- a/internal/driver/mobile/app/x11.go +++ b/internal/driver/mobile/app/x11.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build (linux && !android) || freebsd || openbsd -// +build linux,!android freebsd openbsd package app diff --git a/internal/driver/mobile/canvas_test.go b/internal/driver/mobile/canvas_test.go index 68468ea6ae..9e15882318 100644 --- a/internal/driver/mobile/canvas_test.go +++ b/internal/driver/mobile/canvas_test.go @@ -1,5 +1,4 @@ //go:build !windows || !ci -// +build !windows !ci package mobile diff --git a/internal/driver/mobile/clipboard_android.go b/internal/driver/mobile/clipboard_android.go index 8a99a939a6..a15cd72196 100644 --- a/internal/driver/mobile/clipboard_android.go +++ b/internal/driver/mobile/clipboard_android.go @@ -1,5 +1,4 @@ //go:build android -// +build android package mobile diff --git a/internal/driver/mobile/clipboard_desktop.go b/internal/driver/mobile/clipboard_desktop.go index 895545da3c..3860d388cd 100644 --- a/internal/driver/mobile/clipboard_desktop.go +++ b/internal/driver/mobile/clipboard_desktop.go @@ -1,5 +1,4 @@ //go:build !ios && !android -// +build !ios,!android package mobile diff --git a/internal/driver/mobile/clipboard_ios.go b/internal/driver/mobile/clipboard_ios.go index 5b4a88422a..7ac97efd86 100644 --- a/internal/driver/mobile/clipboard_ios.go +++ b/internal/driver/mobile/clipboard_ios.go @@ -1,5 +1,4 @@ //go:build ios -// +build ios package mobile diff --git a/internal/driver/mobile/clipboard_ios.m b/internal/driver/mobile/clipboard_ios.m index c6c0758082..4298523284 100644 --- a/internal/driver/mobile/clipboard_ios.m +++ b/internal/driver/mobile/clipboard_ios.m @@ -1,5 +1,4 @@ //go:build ios -// +build ios #import #import diff --git a/internal/driver/mobile/device_android.go b/internal/driver/mobile/device_android.go index 76ffec8b38..6952e22eea 100644 --- a/internal/driver/mobile/device_android.go +++ b/internal/driver/mobile/device_android.go @@ -1,5 +1,4 @@ //go:build android -// +build android package mobile diff --git a/internal/driver/mobile/device_desktop.go b/internal/driver/mobile/device_desktop.go index dcabdb0925..006e71cfec 100644 --- a/internal/driver/mobile/device_desktop.go +++ b/internal/driver/mobile/device_desktop.go @@ -1,5 +1,4 @@ //go:build !ios && !android && !wayland -// +build !ios,!android,!wayland package mobile diff --git a/internal/driver/mobile/device_ios.go b/internal/driver/mobile/device_ios.go index 8a27c544d0..a69bcbf164 100644 --- a/internal/driver/mobile/device_ios.go +++ b/internal/driver/mobile/device_ios.go @@ -1,5 +1,4 @@ //go:build ios -// +build ios package mobile diff --git a/internal/driver/mobile/device_wayland.go b/internal/driver/mobile/device_wayland.go index dd7051376c..30f3ee8fd9 100644 --- a/internal/driver/mobile/device_wayland.go +++ b/internal/driver/mobile/device_wayland.go @@ -1,5 +1,4 @@ //go:build wayland -// +build wayland package mobile diff --git a/internal/driver/mobile/file_android.go b/internal/driver/mobile/file_android.go index 32e37ae09e..929fdc6367 100644 --- a/internal/driver/mobile/file_android.go +++ b/internal/driver/mobile/file_android.go @@ -1,5 +1,4 @@ //go:build android -// +build android package mobile diff --git a/internal/driver/mobile/file_desktop.go b/internal/driver/mobile/file_desktop.go index f5a0607fcb..b87e4dce95 100644 --- a/internal/driver/mobile/file_desktop.go +++ b/internal/driver/mobile/file_desktop.go @@ -1,5 +1,4 @@ //go:build !ios && !android -// +build !ios,!android package mobile diff --git a/internal/driver/mobile/file_ios.go b/internal/driver/mobile/file_ios.go index 02de4cf1ac..0a5e4224c0 100644 --- a/internal/driver/mobile/file_ios.go +++ b/internal/driver/mobile/file_ios.go @@ -1,5 +1,4 @@ //go:build ios -// +build ios package mobile diff --git a/internal/driver/mobile/file_ios.m b/internal/driver/mobile/file_ios.m index e7474d2614..5722198350 100644 --- a/internal/driver/mobile/file_ios.m +++ b/internal/driver/mobile/file_ios.m @@ -1,5 +1,4 @@ //go:build ios -// +build ios #import diff --git a/internal/driver/mobile/folder_android.go b/internal/driver/mobile/folder_android.go index 39525a259e..3d789eb953 100644 --- a/internal/driver/mobile/folder_android.go +++ b/internal/driver/mobile/folder_android.go @@ -1,5 +1,4 @@ //go:build android -// +build android package mobile diff --git a/internal/driver/mobile/folder_desktop.go b/internal/driver/mobile/folder_desktop.go index 4828fd58e1..33badb1e03 100644 --- a/internal/driver/mobile/folder_desktop.go +++ b/internal/driver/mobile/folder_desktop.go @@ -1,5 +1,4 @@ //go:build !ios && !android -// +build !ios,!android package mobile diff --git a/internal/driver/mobile/folder_ios.go b/internal/driver/mobile/folder_ios.go index d8dccbcc19..daa192c851 100644 --- a/internal/driver/mobile/folder_ios.go +++ b/internal/driver/mobile/folder_ios.go @@ -1,5 +1,4 @@ //go:build ios -// +build ios package mobile diff --git a/internal/driver/mobile/folder_ios.m b/internal/driver/mobile/folder_ios.m index f895dad14f..a18a536525 100644 --- a/internal/driver/mobile/folder_ios.m +++ b/internal/driver/mobile/folder_ios.m @@ -1,5 +1,4 @@ //go:build ios -// +build ios #import diff --git a/internal/driver/mobile/gl/gl.go b/internal/driver/mobile/gl/gl.go index 7d3cf2cdf1..2ed5ccd178 100644 --- a/internal/driver/mobile/gl/gl.go +++ b/internal/driver/mobile/gl/gl.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build darwin || linux || openbsd || freebsd || windows -// +build darwin linux openbsd freebsd windows package gl diff --git a/internal/driver/mobile/gl/types.go b/internal/driver/mobile/gl/types.go index 79f498ba25..7ac387226e 100644 --- a/internal/driver/mobile/gl/types.go +++ b/internal/driver/mobile/gl/types.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build darwin || linux || openbsd || freebsd || windows -// +build darwin linux openbsd freebsd windows package gl diff --git a/internal/driver/mobile/gl/work.c b/internal/driver/mobile/gl/work.c index b00dd3510e..4ed4a25568 100644 --- a/internal/driver/mobile/gl/work.c +++ b/internal/driver/mobile/gl/work.c @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build darwin || linux || openbsd || freebsd -// +build darwin linux openbsd freebsd #include #include "_cgo_export.h" diff --git a/internal/driver/mobile/gl/work.go b/internal/driver/mobile/gl/work.go index 53d9d39615..6233077453 100644 --- a/internal/driver/mobile/gl/work.go +++ b/internal/driver/mobile/gl/work.go @@ -3,7 +3,6 @@ // license that can be found in the LICENSE file. //go:build darwin || linux || openbsd || freebsd -// +build darwin linux openbsd freebsd package gl diff --git a/internal/driver/mobile/gl/work_other.go b/internal/driver/mobile/gl/work_other.go index 8e554365c9..5168f0ea0c 100644 --- a/internal/driver/mobile/gl/work_other.go +++ b/internal/driver/mobile/gl/work_other.go @@ -3,8 +3,6 @@ // license that can be found in the LICENSE file. //go:build (!cgo || (!darwin && !linux && !openbsd && !freebsd)) && !windows -// +build !cgo !darwin,!linux,!openbsd,!freebsd -// +build !windows package gl diff --git a/internal/driver/mobile/menu_test.go b/internal/driver/mobile/menu_test.go index 8581330ebb..c5b9cef7f4 100644 --- a/internal/driver/mobile/menu_test.go +++ b/internal/driver/mobile/menu_test.go @@ -1,5 +1,4 @@ //go:build !windows || !ci -// +build !windows !ci package mobile diff --git a/internal/driver/mobile/mobileinit/mobileinit_ios.go b/internal/driver/mobile/mobileinit/mobileinit_ios.go index 8e16f3f34c..ae33c12e9b 100644 --- a/internal/driver/mobile/mobileinit/mobileinit_ios.go +++ b/internal/driver/mobile/mobileinit/mobileinit_ios.go @@ -3,8 +3,6 @@ // license that can be found in the LICENSE file. //go:build darwin && (arm || arm64) -// +build darwin -// +build arm arm64 package mobileinit diff --git a/internal/driver/mobile/mobileinit/mobileinit_ios.m b/internal/driver/mobile/mobileinit/mobileinit_ios.m index d8562c776b..84ab98dcab 100644 --- a/internal/driver/mobile/mobileinit/mobileinit_ios.m +++ b/internal/driver/mobile/mobileinit/mobileinit_ios.m @@ -1,6 +1,4 @@ //go:build darwin && (arm || arm64) -// +build darwin -// +build arm arm64 #import diff --git a/internal/driver/mobile/uri.go b/internal/driver/mobile/uri.go index 2ad6ad5942..8b2d05d927 100644 --- a/internal/driver/mobile/uri.go +++ b/internal/driver/mobile/uri.go @@ -1,5 +1,4 @@ //go:build !android -// +build !android package mobile diff --git a/internal/driver/mobile/uri_android.go b/internal/driver/mobile/uri_android.go index f7cebc39ee..82d0ea3bd8 100644 --- a/internal/driver/mobile/uri_android.go +++ b/internal/driver/mobile/uri_android.go @@ -1,5 +1,4 @@ //go:build android -// +build android package mobile diff --git a/internal/hints_disabled.go b/internal/hints_disabled.go index b7b0432bb7..280952430a 100644 --- a/internal/hints_disabled.go +++ b/internal/hints_disabled.go @@ -1,5 +1,4 @@ //go:build !hints -// +build !hints package internal diff --git a/internal/hints_enabled.go b/internal/hints_enabled.go index 5f1038ed8f..3e4935ab9b 100644 --- a/internal/hints_enabled.go +++ b/internal/hints_enabled.go @@ -1,5 +1,4 @@ //go:build hints -// +build hints package internal diff --git a/internal/painter/gl/draw_test.go b/internal/painter/gl/draw_test.go index 10846eb809..99827d28a8 100644 --- a/internal/painter/gl/draw_test.go +++ b/internal/painter/gl/draw_test.go @@ -1,5 +1,4 @@ //go:build !windows || !ci -// +build !windows !ci package gl diff --git a/internal/painter/gl/gl_core.go b/internal/painter/gl/gl_core.go index 5e4d25bc54..895ea720d8 100644 --- a/internal/painter/gl/gl_core.go +++ b/internal/painter/gl/gl_core.go @@ -1,5 +1,4 @@ //go:build (!gles && !arm && !arm64 && !android && !ios && !mobile && !test_web_driver && !wasm) || (darwin && !mobile && !ios && !wasm && !test_web_driver) -// +build !gles,!arm,!arm64,!android,!ios,!mobile,!test_web_driver,!wasm darwin,!mobile,!ios,!wasm,!test_web_driver package gl diff --git a/internal/painter/gl/gl_es.go b/internal/painter/gl/gl_es.go index c810eefbc6..d0c196551d 100644 --- a/internal/painter/gl/gl_es.go +++ b/internal/painter/gl/gl_es.go @@ -1,11 +1,4 @@ //go:build (gles || arm || arm64) && !android && !ios && !mobile && !darwin && !wasm && !test_web_driver -// +build gles arm arm64 -// +build !android -// +build !ios -// +build !mobile -// +build !darwin -// +build !wasm -// +build !test_web_driver package gl diff --git a/internal/painter/gl/gl_gomobile.go b/internal/painter/gl/gl_gomobile.go index a0d76182e5..eb84dadeba 100644 --- a/internal/painter/gl/gl_gomobile.go +++ b/internal/painter/gl/gl_gomobile.go @@ -1,6 +1,4 @@ //go:build (android || ios || mobile) && (!wasm || !test_web_driver) -// +build android ios mobile -// +build !wasm !test_web_driver package gl diff --git a/internal/painter/gl/gl_goxjs.go b/internal/painter/gl/gl_goxjs.go index 6d0c5121f6..44c002df33 100644 --- a/internal/painter/gl/gl_goxjs.go +++ b/internal/painter/gl/gl_goxjs.go @@ -1,5 +1,4 @@ //go:build wasm || test_web_driver -// +build wasm test_web_driver package gl diff --git a/internal/painter/gl/gl_test.go b/internal/painter/gl/gl_test.go index 51e0df0c12..f2b89f877d 100644 --- a/internal/painter/gl/gl_test.go +++ b/internal/painter/gl/gl_test.go @@ -1,5 +1,4 @@ //go:build !ci -// +build !ci package gl diff --git a/key_other.go b/key_other.go index dcdf882a63..f5fdd0d4a2 100644 --- a/key_other.go +++ b/key_other.go @@ -1,5 +1,4 @@ //go:build !darwin -// +build !darwin package fyne diff --git a/test/device_mobile.go b/test/device_mobile.go index 5702237931..781f0f7883 100644 --- a/test/device_mobile.go +++ b/test/device_mobile.go @@ -1,5 +1,4 @@ //go:build mobile -// +build mobile package test diff --git a/test/device_other.go b/test/device_other.go index 0c0275ba8c..23b80f736c 100644 --- a/test/device_other.go +++ b/test/device_other.go @@ -1,5 +1,4 @@ //go:build !mobile -// +build !mobile package test diff --git a/theme/bundled-emoji.go b/theme/bundled-emoji.go index 1096ecc463..d8cf5ad6e9 100644 --- a/theme/bundled-emoji.go +++ b/theme/bundled-emoji.go @@ -1,7 +1,6 @@ // auto-generated // Code generated by '$ fyne bundle'. DO NOT EDIT.//go:build !no_emoji //go:build !no_emoji -// +build !no_emoji package theme diff --git a/theme/gen.go b/theme/gen.go index 11a2cb50ba..5033d6a785 100644 --- a/theme/gen.go +++ b/theme/gen.go @@ -1,5 +1,4 @@ //go:build ignore -// +build ignore package main @@ -75,7 +74,7 @@ func main() { fmt.Println("Bundle emoji…") f = &bytes.Buffer{} - f.WriteString(fileHeader + "//go:build !no_emoji\n// +build !no_emoji\n\n\npackage theme\n\nimport \"fyne.io/fyne/v2\"\n\n") + f.WriteString(fileHeader + "//go:build !no_emoji\n\n\npackage theme\n\nimport \"fyne.io/fyne/v2\"\n\n") bundleFont("EmojiOneColor.otf", "emoji", f) err = writeFile("bundled-emoji.go", f.Bytes()) diff --git a/theme/theme_hints.go b/theme/theme_hints.go index f346c39bc0..58d9d367f5 100644 --- a/theme/theme_hints.go +++ b/theme/theme_hints.go @@ -1,5 +1,4 @@ //go:build hints -// +build hints package theme diff --git a/theme/theme_other.go b/theme/theme_other.go index 6c35e1fadc..e12d351014 100644 --- a/theme/theme_other.go +++ b/theme/theme_other.go @@ -1,5 +1,4 @@ //go:build !hints -// +build !hints package theme diff --git a/theme/unbundled-emoji.go b/theme/unbundled-emoji.go index 3d3197915d..99665e7024 100644 --- a/theme/unbundled-emoji.go +++ b/theme/unbundled-emoji.go @@ -1,5 +1,4 @@ //go:build no_emoji -// +build no_emoji package theme diff --git a/widget/fileicon_internal_test.go b/widget/fileicon_internal_test.go index ef290de1f8..ae522265a9 100644 --- a/widget/fileicon_internal_test.go +++ b/widget/fileicon_internal_test.go @@ -1,5 +1,4 @@ //go:build !windows -// +build !windows package widget diff --git a/widget/menu_desktop_test.go b/widget/menu_desktop_test.go index ac449476e2..4d4f5743a2 100644 --- a/widget/menu_desktop_test.go +++ b/widget/menu_desktop_test.go @@ -1,5 +1,4 @@ //go:build !mobile -// +build !mobile package widget_test diff --git a/widget/menu_internal_desktop_test.go b/widget/menu_internal_desktop_test.go index 51e4ff9e92..051aa419d8 100644 --- a/widget/menu_internal_desktop_test.go +++ b/widget/menu_internal_desktop_test.go @@ -1,5 +1,4 @@ //go:build !mobile -// +build !mobile package widget diff --git a/widget/menu_internal_mobile_test.go b/widget/menu_internal_mobile_test.go index 839ed26d37..b363ef6277 100644 --- a/widget/menu_internal_mobile_test.go +++ b/widget/menu_internal_mobile_test.go @@ -1,5 +1,4 @@ //go:build mobile -// +build mobile package widget diff --git a/widget/menu_item_other.go b/widget/menu_item_other.go index e4122fee59..6c8f55220e 100644 --- a/widget/menu_item_other.go +++ b/widget/menu_item_other.go @@ -1,5 +1,4 @@ //go:build !darwin -// +build !darwin package widget diff --git a/widget/menu_mobile_test.go b/widget/menu_mobile_test.go index 178780eb61..9c81ed0381 100644 --- a/widget/menu_mobile_test.go +++ b/widget/menu_mobile_test.go @@ -1,5 +1,4 @@ //go:build mobile -// +build mobile package widget_test diff --git a/widget/popup_menu_desktop_test.go b/widget/popup_menu_desktop_test.go index b4dea0117e..beddddfebe 100644 --- a/widget/popup_menu_desktop_test.go +++ b/widget/popup_menu_desktop_test.go @@ -1,5 +1,4 @@ //go:build !mobile -// +build !mobile package widget_test diff --git a/widget/table_desktop_test.go b/widget/table_desktop_test.go index 881abf6d2c..e06990b227 100644 --- a/widget/table_desktop_test.go +++ b/widget/table_desktop_test.go @@ -1,5 +1,4 @@ //go:build !mobile -// +build !mobile package widget