aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.builds/alpine-edge.yml4
-rw-r--r--CHANGELOG.md2
-rw-r--r--README.md2
-rw-r--r--go.mod2
-rw-r--r--go.sum3
-rw-r--r--lib/crypto/gpg/gpg_test.go9
6 files changed, 6 insertions, 16 deletions
diff --git a/.builds/alpine-edge.yml b/.builds/alpine-edge.yml
index bc63b35d..0f097c53 100644
--- a/.builds/alpine-edge.yml
+++ b/.builds/alpine-edge.yml
@@ -29,8 +29,8 @@ tasks:
cd aerc
go test ./...
- ancient-go-version: |
- curl -O https://dl-cdn.alpinelinux.org/alpine/v3.15/community/x86_64/go-1.17.10-r0.apk
- sudo apk add ./go-1.17.10-r0.apk
+ curl -O https://dl-cdn.alpinelinux.org/alpine/v3.16/community/x86_64/go-1.18.7-r0.apk
+ sudo apk add ./go-1.18.7-r0.apk
cd aerc
make clean
make
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 538f9dd4..352deed8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -44,7 +44,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- `[ui].index-format` setting has been replaced by `index-columns`.
- `[statusline].render-format` has been replaced by `status-columns`.
-- Removed support for go < 1.17.
+- Removed support for go < 1.18.
- Removed support for `[ui:subject...]` contextual sections in `aerc.conf`.
- `[triggers]` setting has been replaced by `[hooks]`.
- `smtp-starttls` setting in `accounts.conf` has been removed. All `smtp://`
diff --git a/README.md b/README.md
index 32ac5a4e..bf3f1e11 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ And likely other platforms.
Install the dependencies:
-- go (>=1.17) *(Go versions are supported until their end-of-life; support for
+- go (>=1.18) *(Go versions are supported until their end-of-life; support for
older versions may be dropped at any time due to incompatibilities or newer
required language features.)*
- [scdoc](https://git.sr.ht/~sircmpwn/scdoc)
diff --git a/go.mod b/go.mod
index 0c5af1a6..bae6cdb0 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module git.sr.ht/~rjarry/aerc
-go 1.17
+go 1.18
require (
git.sr.ht/~rockorager/tcell-term v0.7.0
diff --git a/go.sum b/go.sum
index 37aa2168..aa779449 100644
--- a/go.sum
+++ b/go.sum
@@ -377,9 +377,6 @@ golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220823224334-20c2bfdbfe24/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
diff --git a/lib/crypto/gpg/gpg_test.go b/lib/crypto/gpg/gpg_test.go
index e34cc2bb..25d73693 100644
--- a/lib/crypto/gpg/gpg_test.go
+++ b/lib/crypto/gpg/gpg_test.go
@@ -3,7 +3,6 @@ package gpg
import (
"bytes"
"io"
- "os"
"os/exec"
"strings"
"testing"
@@ -17,13 +16,7 @@ func initGPGtest(t *testing.T) {
}
// temp dir is automatically deleted by the test runtime
dir := t.TempDir()
- // t.Setenv is only available since go 1.17
- if err := os.Setenv("GNUPGHOME", dir); err != nil {
- t.Fatalf("failed to set GNUPGHOME: %s", err)
- }
- t.Cleanup(func() {
- os.Unsetenv("GNUPGHOME")
- })
+ t.Setenv("GNUPGHOME", dir)
t.Logf("using GNUPGHOME = %s", dir)
}