From 1cb239665c27678542e5f0695631bd3dcdb0a351 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 15 Aug 2023 11:39:24 +0200
Subject: [PATCH] all: add Go 1.21, drop 1.19

---
 .github/workflows/test.yml | 8 ++++----
 README.md                  | 2 +-
 cmd/shfmt/Dockerfile       | 2 +-
 go.mod                     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8edc8065..d9e08275 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -4,7 +4,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.19.x, 1.20.x]
+        go-version: [1.20.x, 1.21.x]
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
@@ -28,9 +28,9 @@ jobs:
 
     # Static checks from this point forward. Only run on one Go version and on
     # Linux, since it's the fastest platform, and the tools behave the same.
-    - if: matrix.os == 'ubuntu-latest' && matrix.go-version == '1.20.x'
+    - if: matrix.os == 'ubuntu-latest' && matrix.go-version == '1.21.x'
       run: diff <(echo -n) <(gofmt -s -d .)
-    - if: matrix.os == 'ubuntu-latest' && matrix.go-version == '1.20.x'
+    - if: matrix.os == 'ubuntu-latest' && matrix.go-version == '1.21.x'
       run: go vet ./...
 
   test-linux-alpine:
@@ -38,7 +38,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Test as root, without cgo, and with busybox
-      run: docker run -v="$PWD:/pwd" -w=/pwd -e=CGO_ENABLED=0 golang:1.20.2-alpine go test ./...
+      run: docker run -v="$PWD:/pwd" -w=/pwd -e=CGO_ENABLED=0 golang:1.21.0-alpine go test ./...
 
   docker:
     name: Build and test Docker images
diff --git a/README.md b/README.md
index f161a274..db15b1ce 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 [![Go Reference](https://pkg.go.dev/badge/mvdan.cc/sh/v3.svg)](https://pkg.go.dev/mvdan.cc/sh/v3)
 
 A shell parser, formatter, and interpreter. Supports [POSIX Shell], [Bash], and
-[mksh]. Requires Go 1.19 or later.
+[mksh]. Requires Go 1.20 or later.
 
 ### Quick start
 
diff --git a/cmd/shfmt/Dockerfile b/cmd/shfmt/Dockerfile
index 04696c0d..2a6e06ab 100644
--- a/cmd/shfmt/Dockerfile
+++ b/cmd/shfmt/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20.5-alpine AS build
+FROM golang:1.21.0-alpine AS build
 
 WORKDIR /src
 RUN apk add --no-cache git
diff --git a/go.mod b/go.mod
index e63edd42..67d25c9f 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module mvdan.cc/sh/v3
 
-go 1.19
+go 1.20
 
 require (
 	github.com/creack/pty v1.1.18