Switch from +build to go:build

Jacalz · Jan 2, 2024 · 32bc3d7 · 32bc3d7
1 parent 78f2326
commit 32bc3d7
Show file tree

Hide file tree

Showing 174 changed files with 3 additions and 212 deletions.
diff --git 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
@@ -1,5 +1,4 @@
 //go:build !ci
-// +build !ci
 
 #import <Foundation/Foundation.h>
 #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101400

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,4 @@
 //go:build !ci && android
-// +build !ci,android
 
 #include <android/log.h>
 #include <jni.h>

diff --git 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
@@ -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
@@ -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
@@ -1,5 +1,4 @@
 //go:build !ci && ios
-// +build !ci,ios
 
 #import <UIKit/UIKit.h>
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,4 @@
 //go:build android
-// +build android
 
 package app
 

diff --git 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
@@ -1,5 +1,4 @@
 //go:build mobile
-// +build mobile
 
 package app
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,4 @@
 //go:build mobile
-// +build mobile
 
 package container_test
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package dialog
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,4 @@
 //go:build android
-// +build android
 
 package driver
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,4 @@
 //go:build !android && !ios && !mobile && !wasm && !test_web_driver
-// +build !android,!ios,!mobile,!wasm,!test_web_driver
 
 package cache