From f6da8c8563fbc2b52b0f571ae6f090b7a99cfbe6 Mon Sep 17 00:00:00 2001 From: Nuno Cruces Date: Thu, 24 Mar 2022 14:37:37 +0000 Subject: [PATCH] Bump go version. --- cmd/zenity/main.go | 2 +- cmd/zenity/notify.go | 2 +- cmd/zenity/progress.go | 2 +- cmd/zenity/progress_unix.go | 2 +- color_unix.go | 2 +- entry_unix.go | 2 +- file_unix.go | 2 +- go.mod | 8 ++++++-- internal/zenutil/env_unix.go | 2 +- internal/zenutil/osa_generated.go | 2 +- internal/zenutil/osa_generator.go | 4 ++-- internal/zenutil/progress_unix.go | 2 +- internal/zenutil/run_unix.go | 2 +- internal/zenutil/run_unix_test.go | 2 +- internal/zenutil/tools.go | 2 +- list_unix.go | 2 +- msg_unix.go | 2 +- notify_unix.go | 2 +- progress_unix.go | 2 +- pwd_stub.go | 2 +- pwd_unix.go | 2 +- util_unix.go | 2 +- util_unix_test.go | 2 +- 23 files changed, 29 insertions(+), 25 deletions(-) diff --git a/cmd/zenity/main.go b/cmd/zenity/main.go index 0e87502..223deb2 100644 --- a/cmd/zenity/main.go +++ b/cmd/zenity/main.go @@ -1,4 +1,4 @@ -// +build windows darwin dev +//go:build windows || darwin || dev package main diff --git a/cmd/zenity/notify.go b/cmd/zenity/notify.go index e583c40..9d57368 100644 --- a/cmd/zenity/notify.go +++ b/cmd/zenity/notify.go @@ -1,4 +1,4 @@ -// +build windows darwin dev +//go:build windows || darwin || dev package main diff --git a/cmd/zenity/progress.go b/cmd/zenity/progress.go index 065c613..d545b56 100644 --- a/cmd/zenity/progress.go +++ b/cmd/zenity/progress.go @@ -1,4 +1,4 @@ -// +build windows darwin dev +//go:build windows || darwin || dev package main diff --git a/cmd/zenity/progress_unix.go b/cmd/zenity/progress_unix.go index c3e25d2..b6769ba 100644 --- a/cmd/zenity/progress_unix.go +++ b/cmd/zenity/progress_unix.go @@ -1,4 +1,4 @@ -// +build darwin dev +//go:build darwin || dev package main diff --git a/color_unix.go b/color_unix.go index 0129c4e..f2ac465 100644 --- a/color_unix.go +++ b/color_unix.go @@ -1,4 +1,4 @@ -// +build !windows,!darwin +//go:build !windows && !darwin package zenity diff --git a/entry_unix.go b/entry_unix.go index 373fefc..5fe81ce 100644 --- a/entry_unix.go +++ b/entry_unix.go @@ -1,4 +1,4 @@ -// +build !windows,!darwin +//go:build !windows && !darwin package zenity diff --git a/file_unix.go b/file_unix.go index f323645..1094057 100644 --- a/file_unix.go +++ b/file_unix.go @@ -1,4 +1,4 @@ -// +build !windows,!darwin +//go:build !windows && !darwin package zenity diff --git a/go.mod b/go.mod index ce70e1e..a77fc33 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/ncruces/zenity -go 1.16 +go 1.17 require ( github.com/dchest/jsmin v0.0.0-20160823214000-faeced883947 @@ -8,6 +8,10 @@ require ( github.com/randall77/makefat v0.0.0-20210315173500-7ddd0e42c844 go.uber.org/goleak v1.1.11 // test golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d - golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect golang.org/x/sys v0.0.0-20210909193231-528a39cd75f3 ) + +require ( + github.com/akavel/rsrc v0.10.2 // indirect + golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect +) diff --git a/internal/zenutil/env_unix.go b/internal/zenutil/env_unix.go index a790c93..663d4e4 100644 --- a/internal/zenutil/env_unix.go +++ b/internal/zenutil/env_unix.go @@ -1,4 +1,4 @@ -// +build !windows,!darwin +//go:build !windows && !darwin // Package zenutil is internal. DO NOT USE. package zenutil diff --git a/internal/zenutil/osa_generated.go b/internal/zenutil/osa_generated.go index f931ead..17eb907 100644 --- a/internal/zenutil/osa_generated.go +++ b/internal/zenutil/osa_generated.go @@ -1,5 +1,5 @@ // Code generated by zenity; DO NOT EDIT. -// +build darwin +//go:build darwin package zenutil diff --git a/internal/zenutil/osa_generator.go b/internal/zenutil/osa_generator.go index f69dfb6..7312c71 100644 --- a/internal/zenutil/osa_generator.go +++ b/internal/zenutil/osa_generator.go @@ -1,4 +1,4 @@ -// +build tools +//go:build tools package main @@ -93,7 +93,7 @@ func minify(data []byte) ([]byte, error) { } var generator = template.Must(template.New("").Parse(`// Code generated by zenity; DO NOT EDIT. -// +build darwin +//go:build darwin package zenutil diff --git a/internal/zenutil/progress_unix.go b/internal/zenutil/progress_unix.go index eb2040c..8210aed 100644 --- a/internal/zenutil/progress_unix.go +++ b/internal/zenutil/progress_unix.go @@ -1,4 +1,4 @@ -// +build !windows +//go:build !windows package zenutil diff --git a/internal/zenutil/run_unix.go b/internal/zenutil/run_unix.go index e151c29..6b7e690 100644 --- a/internal/zenutil/run_unix.go +++ b/internal/zenutil/run_unix.go @@ -1,4 +1,4 @@ -// +build !windows,!darwin +//go:build !windows && !darwin package zenutil diff --git a/internal/zenutil/run_unix_test.go b/internal/zenutil/run_unix_test.go index d06e44c..2ab2e08 100644 --- a/internal/zenutil/run_unix_test.go +++ b/internal/zenutil/run_unix_test.go @@ -1,4 +1,4 @@ -// +build !windows,!darwin +//go:build !windows && !darwin package zenutil diff --git a/internal/zenutil/tools.go b/internal/zenutil/tools.go index c85d0fb..928a3d4 100644 --- a/internal/zenutil/tools.go +++ b/internal/zenutil/tools.go @@ -1,4 +1,4 @@ -// +build tools +//go:build tools package tools diff --git a/list_unix.go b/list_unix.go index 2c18966..b2fb8b5 100644 --- a/list_unix.go +++ b/list_unix.go @@ -1,4 +1,4 @@ -// +build !windows,!darwin +//go:build !windows && !darwin package zenity diff --git a/msg_unix.go b/msg_unix.go index c3c0a91..f200b7c 100644 --- a/msg_unix.go +++ b/msg_unix.go @@ -1,4 +1,4 @@ -// +build !windows,!darwin +//go:build !windows && !darwin package zenity diff --git a/notify_unix.go b/notify_unix.go index 5c040d6..c36797a 100644 --- a/notify_unix.go +++ b/notify_unix.go @@ -1,4 +1,4 @@ -// +build !windows,!darwin +//go:build !windows && !darwin package zenity diff --git a/progress_unix.go b/progress_unix.go index 50c29de..bd026e2 100644 --- a/progress_unix.go +++ b/progress_unix.go @@ -1,4 +1,4 @@ -// +build !windows,!darwin +//go:build !windows && !darwin package zenity diff --git a/pwd_stub.go b/pwd_stub.go index d204940..e52a10c 100644 --- a/pwd_stub.go +++ b/pwd_stub.go @@ -1,4 +1,4 @@ -// +build windows darwin +//go:build windows || darwin package zenity diff --git a/pwd_unix.go b/pwd_unix.go index b90fe32..39f1bdd 100644 --- a/pwd_unix.go +++ b/pwd_unix.go @@ -1,4 +1,4 @@ -// +build !windows,!darwin +//go:build !windows && !darwin package zenity diff --git a/util_unix.go b/util_unix.go index c83d119..c71e9f6 100644 --- a/util_unix.go +++ b/util_unix.go @@ -1,4 +1,4 @@ -// +build !windows +//go:build !windows package zenity diff --git a/util_unix_test.go b/util_unix_test.go index 323a3e3..1586b6b 100644 --- a/util_unix_test.go +++ b/util_unix_test.go @@ -1,4 +1,4 @@ -// +build !windows +//go:build !windows package zenity