Add go:build comments with go1.17beta1 fmt

audio/buffersize_mobile.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build android || ios
 // +build android ios
 
 package audio

audio/buffersize_notmobile.go

@@ -12,9 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build !android
-// +build !ios
-// +build !js
+//go:build !android && !ios && !js
+// +build !android,!ios,!js
 
 package audio
 

audio/internal/readerdriver/driver_macos.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build darwin && !ios
 // +build darwin,!ios
 
 package readerdriver

audio/internal/readerdriver/driver_unix.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build (aix || dragonfly || freebsd || hurd || illumos || linux || netbsd || openbsd || solaris) && !android
 // +build aix dragonfly freebsd hurd illumos linux netbsd openbsd solaris
 // +build !android
 

audio/internal/readerdriver/player_unix.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build aix || dragonfly || freebsd || hurd || illumos || linux || netbsd || openbsd || solaris
 // +build aix dragonfly freebsd hurd illumos linux netbsd openbsd solaris
 
 package readerdriver

cmd/ebitenmobile/gobind.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build ebitenmobilegobind
 // +build ebitenmobilegobind
 
 // gobind is a wrapper of the original gobind. This command adds extra files like a view controller.
@@ -146,6 +147,7 @@ func run() error {
 
 const objcM = `// Code generated by ebitenmobile. DO NOT EDIT.
 
+//go:build ios
 // +build ios
 
 #import <TargetConditionals.h>

cmd/ebitenmobile/gomobile.go

@@ -112,11 +112,15 @@ func prepareGomobileCommands() (string, error) {
 		os.Chdir(pwd)
 	}()
 
-	const modname = "ebitenmobiletemporary"
+	const (
+		modname   = "ebitenmobiletemporary"
+		buildtags = "//go:build tools" +
+			"\n// +build tools"
+	)
 	if err := runGo("mod", "init", modname); err != nil {
 		return tmp, err
 	}
-	if err := ioutil.WriteFile("tools.go", []byte(fmt.Sprintf(`// +build tools
+	if err := ioutil.WriteFile("tools.go", []byte(fmt.Sprintf(`%s
 
 package %s
 
@@ -124,7 +128,7 @@ import (
 	_ "golang.org/x/mobile/cmd/gobind"
 	_ "golang.org/x/mobile/cmd/gomobile"
 )
-`, modname)), 0644); err != nil {
+`, buildtags, modname)), 0644); err != nil {
 		return tmp, err
 	}
 

debug_ebitendebug.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build ebitendebug
 // +build ebitendebug
 
 package ebiten

debug_notebitendebug.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !ebitendebug
 // +build !ebitendebug
 
 package ebiten

ebitenutil/file_notjs.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build (darwin || freebsd || linux || windows) && !js && !android && !ios
 // +build darwin freebsd linux windows
 // +build !js
 // +build !android

ebitenutil/internal/assets/png2rgba.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build ignore
 // +build ignore
 
 package main

ebitenutil/loadimage.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build (darwin || freebsd || js || linux || windows) && !android && !ios
 // +build darwin freebsd js linux windows
 // +build !android
 // +build !ios

examples/keyboard/keyboard/gen.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build ignore
 // +build ignore
 
 package main

genevents.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build ignore
 // +build ignore
 
 package main

genkeys.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build ignore
 // +build ignore
 
 // The key name convention follows the Web standard: https://www.w3.org/TR/uievents-code/#keyboard-key-codes
@@ -814,9 +815,11 @@ func main() {
 		buildTag := ""
 		switch path {
 		case filepath.Join("internal", "glfw", "keys.go"):
-			buildTag = "// +build !js"
+			buildTag = "//go:build !js" +
+				"\n// +build !js"
 		case filepath.Join("internal", "uidriver", "glfw", "keys.go"):
-			buildTag = "// +build darwin freebsd linux windows" +
+			buildTag = "//go:build (darwin || freebsd || linux || windows) && !android && !ios" +
+				"\n// +build darwin freebsd linux windows" +
 				"\n// +build !android" +
 				"\n// +build !ios"
 		}

goversion.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build go1.13
 // +build go1.13
 
 package ebiten

imagedumper_desktop.go

@@ -12,9 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build !android
-// +build !js
-// +build !ios
+//go:build !android && !js && !ios
+// +build !android,!js,!ios
 
 package ebiten
 

imagedumper_notdesktop.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build android || js || ios
 // +build android js ios
 
 package ebiten

internal/debug/debug_ebitendebug.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build ebitendebug
 // +build ebitendebug
 
 package debug

internal/debug/debug_notebitendebug.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !ebitendebug
 // +build !ebitendebug
 
 package debug

internal/devicescale/cinnamon_unix.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build (dragonfly || freebsd || linux || netbsd || openbsd || solaris) && !android
 // +build dragonfly freebsd linux netbsd openbsd solaris
 // +build !android
 

internal/devicescale/impl_ios.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build ios
 // +build ios
 
 package devicescale

internal/devicescale/impl_mac.go

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build darwin
-// +build !ios
+//go:build darwin && !ios
+// +build darwin,!ios
 
 package devicescale
 

internal/devicescale/impl_unix.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build (dragonfly || freebsd || linux || netbsd || openbsd || solaris) && !android
 // +build dragonfly freebsd linux netbsd openbsd solaris
 // +build !android
 

internal/glfw/const.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !js
 // +build !js
 
 package glfw

internal/glfw/gen.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build ignore
 // +build ignore
 
 package main

internal/glfw/glfw_notwindows.go

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build !windows
-// +build !js
+//go:build !windows && !js
+// +build !windows,!js
 
 package glfw
 

internal/glfw/keys.go

@@ -14,6 +14,7 @@
 
 // Code generated by genkeys.go using 'go generate'. DO NOT EDIT.
 
+//go:build !js
 // +build !js
 
 package glfw

internal/glfw/tools.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build tools
 // +build tools
 
 package glfw

internal/glfw/type.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !js
 // +build !js
 
 package glfw

internal/graphicsdriver/metal/ca/ca.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build darwin
 // +build darwin
 
 // Package ca provides access to Apple's Core Animation API (https://developer.apple.com/documentation/quartzcore).

internal/graphicsdriver/metal/graphics.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build darwin
 // +build darwin
 
 package metal

internal/graphicsdriver/metal/mtl/example_test.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build darwin
 // +build darwin
 
 package mtl_test

internal/graphicsdriver/metal/mtl/mtl.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build darwin
 // +build darwin
 
 // Package mtl provides access to Apple's Metal API (https://developer.apple.com/documentation/metal).

internal/graphicsdriver/metal/mtl/mtl_test.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build darwin
 // +build darwin
 
 package mtl_test

internal/graphicsdriver/metal/ns/ns.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build darwin
 // +build darwin
 
 // Package ns provides access to Apple's AppKit API (https://developer.apple.com/documentation/appkit).

internal/graphicsdriver/metal/shader.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build darwin
 // +build darwin
 
 package metal

internal/graphicsdriver/metal/view.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build darwin
 // +build darwin
 
 package metal

internal/graphicsdriver/metal/view_ios.go

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build darwin
-// +build ios
+//go:build darwin && ios
+// +build darwin,ios
 
 package metal
 

internal/graphicsdriver/metal/view_macos.go

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build darwin
-// +build !ios
+//go:build darwin && !ios
+// +build darwin,!ios
 
 package metal
 

internal/graphicsdriver/opengl/bytes.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build android || ios
 // +build android ios
 
 package opengl

internal/graphicsdriver/opengl/context_desktop.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build (darwin || freebsd || linux || windows) && !android && !ios
 // +build darwin freebsd linux windows
 // +build !android
 // +build !ios

internal/graphicsdriver/opengl/context_mobile.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build android || ios
 // +build android ios
 
 package opengl

internal/graphicsdriver/opengl/context_notwebgl1.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !ebitenwebgl1
 // +build !ebitenwebgl1
 
 package opengl

internal/graphicsdriver/opengl/context_notx.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build android || js || (!freebsd && !linux)
 // +build android js !freebsd,!linux
 
 package opengl

internal/graphicsdriver/opengl/context_webgl1.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build ebitenwebgl1
 // +build ebitenwebgl1
 
 package opengl

internal/graphicsdriver/opengl/context_x.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build (freebsd || linux) && !android
 // +build freebsd linux
 // +build !android
 

internal/graphicsdriver/opengl/gl/conversions_notwindows.go

@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: MIT
 
+//go:build !windows
 // +build !windows
 
 package gl

internal/graphicsdriver/opengl/gl/package.go

@@ -9,6 +9,7 @@
 // This document is licensed under the SGI Free Software B License.
 // For details, see http://oss.sgi.com/projects/FreeB.
 
+//go:build !js
 // +build !js
 
 // Package gl implements Go bindings to OpenGL.

internal/graphicsdriver/opengl/gl/package_notwindows.go

@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: MIT
 
+//go:build !windows
 // +build !windows
 
 package gl

internal/graphicsdriver/opengl/gl/package_x.go

@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: MIT
 
+//go:build freebsd || linux
 // +build freebsd linux
 
 package gl

internal/graphicsdriver/opengl/gl/procaddr_notwindows.go

@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: MIT
 
+//go:build !windows
 // +build !windows
 
 // This file implements GlowGetProcAddress for every supported platform. The

internal/graphicsdriver/opengl/gles/default.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build android || ios
 // +build android ios
 
 package gles

internal/graphicsdriver/opengl/gles/gomobile.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build android || ios
 // +build android ios
 
 package gles

internal/graphicsdriver/opengl/gles/interface.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build android || ios
 // +build android ios
 
 package gles

internal/graphicsdriver/opengl/gles/str.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build android || ios
 // +build android ios
 
 package gles

internal/graphicsdriver/opengl/graphics_mobile.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build android || ios
 // +build android ios
 
 package opengl

internal/graphicsdriver/opengl/shader_desktop.go

@@ -12,9 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build !android
-// +build !js
-// +build !ios
+//go:build !android && !js && !ios
+// +build !android,!js,!ios
 
 package opengl
 

internal/graphicsdriver/opengl/shader_mobile.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build android || ios
 // +build android ios
 
 package opengl

internal/png/gen.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build ignore
 // +build ignore
 
 package main

internal/png/stdlibfuzz.go

@@ -4,6 +4,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build gofuzz
 // +build gofuzz
 
 package png

internal/restorable/const_others.go

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build !android
-// +build !js
+//go:build !android && !js
+// +build !android,!js
 
 package restorable
 

internal/testflock/flock_notjs.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !js
 // +build !js
 
 // Package testflock provides a lock for testing.

internal/uidriver/glfw/graphics_darwin.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !ebitengl
 // +build !ebitengl
 
 package glfw

internal/uidriver/glfw/graphics_opengl.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build freebsd || linux || windows || ebitengl
 // +build freebsd linux windows ebitengl
 
 package glfw

internal/uidriver/glfw/hideconsole_notwindows.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !windows || js
 // +build !windows js
 
 package glfw

internal/uidriver/glfw/input.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build (darwin || freebsd || linux || windows) && !android && !ios
 // +build darwin freebsd linux windows
 // +build !android
 // +build !ios

internal/uidriver/glfw/keys.go

@@ -14,6 +14,7 @@
 
 // Code generated by genkeys.go using 'go generate'. DO NOT EDIT.
 
+//go:build (darwin || freebsd || linux || windows) && !android && !ios
 // +build darwin freebsd linux windows
 // +build !android
 // +build !ios

internal/uidriver/glfw/run_notsinglethread.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !ebitensinglethread && (darwin || freebsd || linux || windows) && !android && !ios
 // +build !ebitensinglethread
 // +build darwin freebsd linux windows
 // +build !android

internal/uidriver/glfw/run_singlethread.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build ebitensinglethread && (darwin || freebsd || linux || windows) && !android && !ios
 // +build ebitensinglethread
 // +build darwin freebsd linux windows
 // +build !android

internal/uidriver/glfw/ui.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build (darwin || freebsd || linux || windows) && !android && !ios
 // +build darwin freebsd linux windows
 // +build !android
 // +build !ios

internal/uidriver/glfw/ui_darwin.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !ios
 // +build !ios
 
 package glfw

internal/uidriver/glfw/ui_unix.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build (dragonfly || freebsd || linux || netbsd || openbsd || solaris) && !android
 // +build dragonfly freebsd linux netbsd openbsd solaris
 // +build !android
 

internal/uidriver/glfw/window.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build (darwin || freebsd || linux || windows) && !android && !ios
 // +build darwin freebsd linux windows
 // +build !android
 // +build !ios

internal/uidriver/mobile/graphics_ios.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build ((ios && arm) || (ios && arm64)) && !ebitengl
 // +build ios,arm ios,arm64
 // +build !ebitengl
 

internal/uidriver/mobile/graphics_opengl.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build android || (ios && 386) || (ios && amd64) || (ios && ebitengl)
 // +build android ios,386 ios,amd64 ios,ebitengl
 
 package mobile

internal/uidriver/mobile/input.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build android || ios
 // +build android ios
 
 package mobile

internal/uidriver/mobile/ui.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build android || ios
 // +build android ios
 
 package mobile

internal/web/web_notjs.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !js
 // +build !js
 
 package web

mobile/impl_mobile.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build android || ios
 // +build android ios
 
 package mobile

mobile/impl_notmobile.go

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build !android
-// +build !ios
+//go:build !android && !ios
+// +build !android,!ios
 
 package mobile
 

uidriver_glfw.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build (darwin || freebsd || linux || windows) && !android && !ios && !js
 // +build darwin freebsd linux windows
 // +build !android
 // +build !ios

uidriver_mobile.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build android || ios
 // +build android ios
 
 package ebiten