From 1b4483d32ba8a5fce83bf81cab7552efe4fa2c53 Mon Sep 17 00:00:00 2001
From: Deluan <deluan@navidrome.org>
Date: Mon, 27 Nov 2023 13:53:08 -0500
Subject: [PATCH] Remove `tools.go`

---
 Makefile       | 2 +-
 git/pre-commit | 2 +-
 go.mod         | 3 +--
 tools.go       | 7 -------
 4 files changed, 3 insertions(+), 11 deletions(-)
 delete mode 100644 tools.go

diff --git a/Makefile b/Makefile
index 7176887c..8b0b07f5 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,7 @@ lintall: lint ##@Development Lint Go and JS code
 
 format: ##@Development Format code
 	@(cd ./ui && npm run prettier)
-	@go run golang.org/x/tools/cmd/goimports -w `find . -name '*.go' | grep -v _gen.go$$`
+	@go run golang.org/x/tools/cmd/goimports@latest -w `find . -name '*.go' | grep -v _gen.go$$`
 	@go mod tidy
 .PHONY: format
 
diff --git a/git/pre-commit b/git/pre-commit
index 12bb32d4..6bb2b314 100755
--- a/git/pre-commit
+++ b/git/pre-commit
@@ -10,7 +10,7 @@
 #
 # This script does not handle file names that contain spaces.
 
-gofmtcmd="go run golang.org/x/tools/cmd/goimports"
+gofmtcmd="go run golang.org/x/tools/cmd/goimports@latest"
 
 gofiles=$(git diff --cached --name-only --diff-filter=ACM | grep '.go$' | grep -v '_gen.go$')
 [ -z "$gofiles" ] && exit 0
diff --git a/go.mod b/go.mod
index c397b5b2..75d8d301 100644
--- a/go.mod
+++ b/go.mod
@@ -49,7 +49,6 @@ require (
 	golang.org/x/image v0.14.0
 	golang.org/x/sync v0.5.0
 	golang.org/x/text v0.14.0
-	golang.org/x/tools v0.15.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
@@ -107,9 +106,9 @@ require (
 	golang.org/x/crypto v0.15.0 // indirect
 	golang.org/x/exp/shiny v0.0.0-20230515195305-f3d0a9c9a5cc // indirect
 	golang.org/x/mobile v0.0.0-20230427221453-e8d11dd0ba41 // indirect
-	golang.org/x/mod v0.14.0 // indirect
 	golang.org/x/net v0.18.0 // indirect
 	golang.org/x/sys v0.14.0 // indirect
+	golang.org/x/tools v0.15.0 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
diff --git a/tools.go b/tools.go
deleted file mode 100644
index 135af85a..00000000
--- a/tools.go
+++ /dev/null
@@ -1,7 +0,0 @@
-//go:build tools
-
-package main
-
-import (
-	_ "golang.org/x/tools/cmd/goimports"
-)