chore: require Go 1.21

twpayne · Feb 7, 2024 · 6f55286 · 6f55286
1 parent 9abd0eb
commit 6f55286
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 15 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -14,6 +14,8 @@ jobs:
     steps:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
     - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491
+      with:
+        go-version: '1.21'
     - uses: golangci/golangci-lint-action@3a919529898de77ec3da873e3063ca4b10e7f5cc
       with:
         version: v1.55.2

diff --git a/.golangci.yml b/.golangci.yml
@@ -1,3 +1,6 @@
+run:
+  go: '1.21'
+
 linters:
   enable:
   - asciicheck

diff --git a/go.mod b/go.mod
@@ -1,11 +1,10 @@
 module github.com/twpayne/go-shapefile
 
-go 1.19
+go 1.21
 
 require (
 	github.com/alecthomas/assert/v2 v2.5.0
 	github.com/twpayne/go-geom v1.5.3
-	golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3
 	golang.org/x/net v0.20.0
 	golang.org/x/text v0.14.0
 )

diff --git a/go.sum b/go.sum
@@ -6,8 +6,6 @@ github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUq
 github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
 github.com/twpayne/go-geom v1.5.3 h1:UdH93XzTwpwPiAV38DJ74yg+9/YV9/WCGbKN+NmSvVA=
 github.com/twpayne/go-geom v1.5.3/go.mod h1:scDv/u90MVD6K+/7cA44kQt9fD6M/n+VuLddERxWYR8=
-golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3 h1:/RIbNt/Zr7rVhIkQhooTxCxFcdWLGIKnZA4IXNFSrvo=
-golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08=
 golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
 golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
 golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=

diff --git a/scanner.go b/scanner.go
@@ -13,22 +13,11 @@ import (
 	"strings"
 	"sync"
 
-	"golang.org/x/exp/constraints"
 	"golang.org/x/net/html/charset"
 	"golang.org/x/text/encoding"
 	"golang.org/x/text/encoding/charmap"
 )
 
-func max[T constraints.Ordered](x T, y ...T) T { //nolint: ireturn
-	a := x
-	for _, b := range y {
-		if a < b {
-			a = b
-		}
-	}
-	return a
-}
-
 // bufioReadCloser ...
 type bufioReadCloser = struct {
 	*bufio.Reader