From b322876efe91df0db4bd9644b675345e2b8e06e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sun, 12 Feb 2023 21:31:06 +0000
Subject: [PATCH] drop support for Go 1.19

Now that we're done with garble v0.9.x,
v0.10 will only support Go 1.20 as a minimum version.
---
 .github/workflows/test.yml       |  2 +-
 README.md                        |  2 +-
 go.mod                           |  2 +-
 main.go                          |  2 +-
 testdata/script/asm.txtar        |  2 +-
 testdata/script/basic.txtar      |  2 +-
 testdata/script/cgo.txtar        |  2 +-
 testdata/script/crossbuild.txtar |  3 +--
 testdata/script/debugdir.txtar   |  2 +-
 testdata/script/embed.txtar      |  2 +-
 testdata/script/goenv.txtar      |  2 +-
 testdata/script/gogarble.txtar   |  2 +-
 testdata/script/goversion.txtar  | 24 ++++++++++++------------
 testdata/script/help.txtar       |  2 +-
 testdata/script/implement.txtar  |  2 +-
 testdata/script/imports.txtar    |  2 +-
 testdata/script/init.txtar       |  2 +-
 testdata/script/ldflags.txtar    |  2 +-
 testdata/script/linker.txtar     |  3 +--
 testdata/script/linkname.txtar   |  4 ++--
 testdata/script/literals.txtar   |  2 +-
 testdata/script/modinfo.txtar    |  2 +-
 testdata/script/plugin.txtar     |  2 +-
 testdata/script/position.txtar   |  2 +-
 testdata/script/reflect.txtar    |  2 +-
 testdata/script/reverse.txtar    |  2 +-
 testdata/script/seed-cache.txtar |  4 ++--
 testdata/script/seed.txtar       |  2 +-
 testdata/script/syntax.txtar     |  4 ++--
 testdata/script/test.txtar       |  2 +-
 testdata/script/tiny.txtar       |  2 +-
 testdata/script/typeparams.txtar |  2 +-
 32 files changed, 46 insertions(+), 48 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3d5f904..8299982 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -22,7 +22,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.19.x, 1.20.x]
+        go-version: [1.20.x]
         # TODO: revert to macos-latest once we figure out https://github.com/burrowers/garble/issues/609.
         os: [ubuntu-latest, macos-11, windows-latest]
     runs-on: ${{ matrix.os }}
diff --git a/README.md b/README.md
index 3fd44e5..ac2eacb 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 	go install mvdan.cc/garble@latest
 
-Obfuscate Go code by wrapping the Go toolchain. Requires Go 1.19 or later.
+Obfuscate Go code by wrapping the Go toolchain. Requires Go 1.20 or later.
 
 	garble build [build flags] [packages]
 
diff --git a/go.mod b/go.mod
index a91167c..52cf79b 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module mvdan.cc/garble
 
-go 1.19
+go 1.20
 
 require (
 	github.com/bluekeyes/go-gitdiff v0.7.0
diff --git a/main.go b/main.go
index 8c0b860..a45e542 100644
--- a/main.go
+++ b/main.go
@@ -262,7 +262,7 @@ var toolchainVersionSemver string
 
 func goVersionOK() bool {
 	const (
-		minGoVersionSemver = "v1.19.0"
+		minGoVersionSemver = "v1.20.0"
 		suggestedGoVersion = "1.20.x"
 	)
 
diff --git a/testdata/script/asm.txtar b/testdata/script/asm.txtar
index 0f7380e..41820d7 100644
--- a/testdata/script/asm.txtar
+++ b/testdata/script/asm.txtar
@@ -33,7 +33,7 @@ binsubstr main$exe 'addJmp' 'AddImpl'
 -- go.mod --
 module test/with.many.dots/main
 
-go 1.19
+go 1.20
 -- main.go --
 package main
 
diff --git a/testdata/script/basic.txtar b/testdata/script/basic.txtar
index ae94531..79f4f80 100644
--- a/testdata/script/basic.txtar
+++ b/testdata/script/basic.txtar
@@ -59,7 +59,7 @@ binsubstr main$exe 'garble_main.go' 'globalVar' 'globalFunc' $gofullversion
 -- go.mod --
 module test/mainfoo
 
-go 1.19
+go 1.20
 -- garble_main.go --
 package main
 
diff --git a/testdata/script/cgo.txtar b/testdata/script/cgo.txtar
index cacfcb0..4280d66 100644
--- a/testdata/script/cgo.txtar
+++ b/testdata/script/cgo.txtar
@@ -29,7 +29,7 @@ binsubstr main$exe 'privateAdd'
 -- go.mod --
 module test/main
 
-go 1.19
+go 1.20
 -- main.go --
 package main
 
diff --git a/testdata/script/crossbuild.txtar b/testdata/script/crossbuild.txtar
index 3890880..32ed80b 100644
--- a/testdata/script/crossbuild.txtar
+++ b/testdata/script/crossbuild.txtar
@@ -18,11 +18,10 @@
 [arm] env GOARCH=arm64
 garble build -gcflags=math/bits=-d=ssa/intrinsics/debug=1
 stderr 'intrinsic substitution for Len64.*BitLen64'
-
 -- go.mod --
 module test/main
 
-go 1.19
+go 1.20
 -- main.go --
 package main
 
diff --git a/testdata/script/debugdir.txtar b/testdata/script/debugdir.txtar
index a1207f7..31b278f 100644
--- a/testdata/script/debugdir.txtar
+++ b/testdata/script/debugdir.txtar
@@ -18,7 +18,7 @@ stderr 'test/main' # we force rebuilds with -debugdir
 -- go.mod --
 module test/main
 
-go 1.19
+go 1.20
 -- main.go --
 package main
 
diff --git a/testdata/script/embed.txtar b/testdata/script/embed.txtar
index d045508..85b242a 100644
--- a/testdata/script/embed.txtar
+++ b/testdata/script/embed.txtar
@@ -11,7 +11,7 @@ cmp stdout main.stdout
 -- go.mod --
 module test/main
 
-go 1.19
+go 1.20
 -- main.go --
 package main
 
diff --git a/testdata/script/goenv.txtar b/testdata/script/goenv.txtar
index 82ab164..50bf17a 100644
--- a/testdata/script/goenv.txtar
+++ b/testdata/script/goenv.txtar
@@ -46,7 +46,7 @@ exec $NAME/garble$exe build
 -- go.mod --
 module test/main
 
-go 1.19
+go 1.20
 -- main.go --
 package main
 
diff --git a/testdata/script/gogarble.txtar b/testdata/script/gogarble.txtar
index 07901b6..8b5f2dc 100644
--- a/testdata/script/gogarble.txtar
+++ b/testdata/script/gogarble.txtar
@@ -51,7 +51,7 @@ bincmp out_rebuild out
 -- go.mod --
 module test/main
 
-go 1.19
+go 1.20
 -- standalone/main.go --
 package main
 
diff --git a/testdata/script/goversion.txtar b/testdata/script/goversion.txtar
index b9a89fb..c6b37e5 100644
--- a/testdata/script/goversion.txtar
+++ b/testdata/script/goversion.txtar
@@ -23,7 +23,7 @@ stderr 'Go version "devel go1\.15-.*2020.*" is too old; please upgrade to Go 1\.
 # A current devel version should be fine.
 # Note that we don't look at devel version timestamps.
 env GARBLE_TEST_GOVERSION='go1.20'
-env TOOLCHAIN_GOVERSION='devel go1.20-ad97d204f0 Sun Sep 12 16:46:58 2021 +0000'
+env TOOLCHAIN_GOVERSION='devel go1.20-ad97d204f0 Sun Sep 12 16:46:58 2023 +0000'
 ! garble build
 stderr 'mocking the real build'
 
@@ -45,40 +45,40 @@ env TOOLCHAIN_GOVERSION='devel go1.20-somecustomversion'
 stderr 'mocking the real build'
 
 # The current toolchain may be older than the one that built garble.
-env GARBLE_TEST_GOVERSION='go1.20'
-env TOOLCHAIN_GOVERSION='go1.19.3'
+env GARBLE_TEST_GOVERSION='go1.21'
+env TOOLCHAIN_GOVERSION='go1.20.3'
 ! garble build
 stderr 'mocking the real build'
 
 # The current toolchain may be equal to the one that built garble.
-env GARBLE_TEST_GOVERSION='devel go1.19-6673d5d701 Sun Mar 20 16:05:03 2022 +0000'
-env TOOLCHAIN_GOVERSION='devel go1.19-6673d5d701 Sun Mar 20 16:05:03 2022 +0000'
+env GARBLE_TEST_GOVERSION='devel go1.20-6673d5d701 Sun Mar 20 16:05:03 2023 +0000'
+env TOOLCHAIN_GOVERSION='devel go1.20-6673d5d701 Sun Mar 20 16:05:03 2023 +0000'
 ! garble build
 stderr 'mocking the real build'
 
 # The current toolchain must not be newer than the one that built garble.
 env GARBLE_TEST_GOVERSION='go1.18'
-env TOOLCHAIN_GOVERSION='go1.19.1'
+env TOOLCHAIN_GOVERSION='go1.20.1'
 ! garble build
-stderr 'garble was built with "go1\.18" and is being used with "go1\.19\.1"; please rebuild garble with the newer version'
+stderr 'garble was built with "go1\.18" and is being used with "go1\.20\.1"; please rebuild garble with the newer version'
 
 # We'll error even if the difference is a minor (bugfix) level.
 # In practice it probably wouldn't matter, but in theory it could still lead to tricky bugs.
-env GARBLE_TEST_GOVERSION='go1.19.11'
-env TOOLCHAIN_GOVERSION='go1.19.14'
+env GARBLE_TEST_GOVERSION='go1.20.11'
+env TOOLCHAIN_GOVERSION='go1.20.14'
 ! garble build
-stderr 'garble was built with "go1\.19\.11" and is being used with "go1\.19\.14"; please rebuild garble with the newer version'
+stderr 'garble was built with "go1\.20\.11" and is being used with "go1\.20\.14"; please rebuild garble with the newer version'
 
 # If garble builds itself and is then used, it won't know what version built it.
 # As a fallback, we drop the comparison against the toolchain's version.
 env GARBLE_TEST_GOVERSION='bogus version'
-env TOOLCHAIN_GOVERSION='go1.19.3'
+env TOOLCHAIN_GOVERSION='go1.20.3'
 ! garble build
 stderr 'mocking the real build'
 -- go.mod --
 module test/main
 
-go 1.19
+go 1.20
 -- main.go --
 package main
 
diff --git a/testdata/script/help.txtar b/testdata/script/help.txtar
index 0eb4829..f4581dc 100644
--- a/testdata/script/help.txtar
+++ b/testdata/script/help.txtar
@@ -117,6 +117,6 @@ stderr 'usage: garble version'
 -- go.mod --
 module dummy
 
-go 1.19
+go 1.20
 -- dummy.go --
 package dummy
diff --git a/testdata/script/implement.txtar b/testdata/script/implement.txtar
index 7eb51ca..9ed9752 100644
--- a/testdata/script/implement.txtar
+++ b/testdata/script/implement.txtar
@@ -13,7 +13,7 @@ cmp stdout main.stdout
 -- go.mod --
 module test/main
 
-go 1.19
+go 1.20
 -- main.go --
 package main
 
diff --git a/testdata/script/imports.txtar b/testdata/script/imports.txtar
index e527d4f..616c942 100644
--- a/testdata/script/imports.txtar
+++ b/testdata/script/imports.txtar
@@ -42,7 +42,7 @@ cmp stdout main.stdout
 -- go.mod --
 module test/main
 
-go 1.19
+go 1.20
 
 require (
 	gopkg.in/garbletest.v2 v2.999.0
diff --git a/testdata/script/init.txtar b/testdata/script/init.txtar
index bcfc334..1cf31d2 100644
--- a/testdata/script/init.txtar
+++ b/testdata/script/init.txtar
@@ -12,7 +12,7 @@ cmp stderr main.stderr
 -- go.mod --
 module test/main
 
-go 1.19
+go 1.20
 -- main.go --
 package main
 
diff --git a/testdata/script/ldflags.txtar b/testdata/script/ldflags.txtar
index 6ade829..ed85d6a 100644
--- a/testdata/script/ldflags.txtar
+++ b/testdata/script/ldflags.txtar
@@ -28,7 +28,7 @@ binsubstr main$exe 'unexportedVersion' 'ExportedUnset' 'v1.22.33' 'garble_replac
 -- go.mod --
 module domain.test/main
 
-go 1.19
+go 1.20
 -- main.go --
 package main
 
diff --git a/testdata/script/linker.txtar b/testdata/script/linker.txtar
index f238463..2aad6d4 100644
--- a/testdata/script/linker.txtar
+++ b/testdata/script/linker.txtar
@@ -15,8 +15,7 @@ cmp stderr main.stderr
 -- go.mod --
 module test/main
 
-go 1.19
-
+go 1.20
 -- main.go --
 package main
 
diff --git a/testdata/script/linkname.txtar b/testdata/script/linkname.txtar
index 94e4c07..be03d92 100644
--- a/testdata/script/linkname.txtar
+++ b/testdata/script/linkname.txtar
@@ -14,7 +14,7 @@ cmp stderr main.stderr
 -- go.mod --
 module test/main
 
-go 1.19
+go 1.20
 
 replace big.chungus/meme => ./big.chungus/meme
 
@@ -149,7 +149,7 @@ func ByteIndex(s string, c byte) int
 -- big.chungus/meme/go.mod --
 module test/main
 
-go 1.19
+go 1.20
 -- big.chungus/meme/dante.go --
 package meme
 
diff --git a/testdata/script/literals.txtar b/testdata/script/literals.txtar
index 78f8767..a0e21c0 100644
--- a/testdata/script/literals.txtar
+++ b/testdata/script/literals.txtar
@@ -54,7 +54,7 @@ garble -literals build std
 -- go.mod --
 module test/main
 
-go 1.19
+go 1.20
 -- main.go --
 package main
 
diff --git a/testdata/script/modinfo.txtar b/testdata/script/modinfo.txtar
index 9a7af7f..be3e8e5 100644
--- a/testdata/script/modinfo.txtar
+++ b/testdata/script/modinfo.txtar
@@ -26,7 +26,7 @@ stdout 'build\s*vcs.revision='${HEAD_COMMIT_SHA}
 -- go.mod --
 module test/main
 
-go 1.19
+go 1.20
 -- main.go --
 package main
 
diff --git a/testdata/script/plugin.txtar b/testdata/script/plugin.txtar
index f6a6675..06d601b 100644
--- a/testdata/script/plugin.txtar
+++ b/testdata/script/plugin.txtar
@@ -26,7 +26,7 @@ cmp stderr main.stderr
 -- go.mod --
 module test/main
 
-go 1.19
+go 1.20
 -- plugin/main.go --
 package main
 
diff --git a/testdata/script/position.txtar b/testdata/script/position.txtar
index e0701b7..a40a2b9 100644
--- a/testdata/script/position.txtar
+++ b/testdata/script/position.txtar
@@ -16,7 +16,7 @@ stdout 'varPositions is sorted'
 -- go.mod --
 module test/main
 
-go 1.19
+go 1.20
 -- garble_main.go --
 package main
 
diff --git a/testdata/script/reflect.txtar b/testdata/script/reflect.txtar
index 99f933c..0f2552d 100644
--- a/testdata/script/reflect.txtar
+++ b/testdata/script/reflect.txtar
@@ -14,7 +14,7 @@ cmp stdout main.stdout
 -- go.mod --
 module test/main
 
-go 1.19
+go 1.20
 -- garble_main.go --
 package main
 
diff --git a/testdata/script/reverse.txtar b/testdata/script/reverse.txtar
index 2b2aa7b..1180ad0 100644
--- a/testdata/script/reverse.txtar
+++ b/testdata/script/reverse.txtar
@@ -54,7 +54,7 @@ cmp stdout main-literals.stderr
 -- go.mod --
 module test/main
 
-go 1.19
+go 1.20
 -- long_main.go --
 package main
 
diff --git a/testdata/script/seed-cache.txtar b/testdata/script/seed-cache.txtar
index d0597f5..45f6cfe 100644
--- a/testdata/script/seed-cache.txtar
+++ b/testdata/script/seed-cache.txtar
@@ -32,7 +32,7 @@ cd ..
 -- mod1/go.mod --
 module test/main/mod1
 
-go 1.19
+go 1.20
 
 require gopkg.in/garbletest.v2 v2.999.0
 
@@ -52,7 +52,7 @@ func main() { garbletest.Test() }
 -- mod2/go.mod --
 module test/main/mod2
 
-go 1.19
+go 1.20
 
 require gopkg.in/garbletest.v2 v2.999.0
 
diff --git a/testdata/script/seed.txtar b/testdata/script/seed.txtar
index 43be71b..d21ba60 100644
--- a/testdata/script/seed.txtar
+++ b/testdata/script/seed.txtar
@@ -96,7 +96,7 @@ cmp stderr importedpkg.stderr
 -- go.mod --
 module test/main
 
-go 1.19
+go 1.20
 -- main.go --
 package main
 
diff --git a/testdata/script/syntax.txtar b/testdata/script/syntax.txtar
index 661df9f..e13d87f 100644
--- a/testdata/script/syntax.txtar
+++ b/testdata/script/syntax.txtar
@@ -16,7 +16,7 @@ binsubstr main$exe 'globalVar' # 'globalType' matches on some, but not all, plat
 -- extra/go.mod --
 module private.source/extra
 
-go 1.19
+go 1.20
 -- extra/extra.go --
 package extra
 
@@ -26,7 +26,7 @@ func Func() string {
 -- go.mod --
 module test/main
 
-go 1.19
+go 1.20
 
 // We include an extra module to obfuscate, included in the same original source
 // code via a replace directive.
diff --git a/testdata/script/test.txtar b/testdata/script/test.txtar
index ff480d8..7b5168a 100644
--- a/testdata/script/test.txtar
+++ b/testdata/script/test.txtar
@@ -52,7 +52,7 @@ stdout 'package bar_test, func name: test/bar\.OriginalFuncName'
 -- go.mod --
 module test/bar
 
-go 1.19
+go 1.20
 -- bar.go --
 package bar
 
diff --git a/testdata/script/tiny.txtar b/testdata/script/tiny.txtar
index 32ea496..d78775c 100644
--- a/testdata/script/tiny.txtar
+++ b/testdata/script/tiny.txtar
@@ -27,7 +27,7 @@ stderr 'funcStructExported false funcStructUnexported false'
 -- go.mod --
 module test/main
 
-go 1.19
+go 1.20
 -- garble_main.go --
 package main
 
diff --git a/testdata/script/typeparams.txtar b/testdata/script/typeparams.txtar
index 42bc3cf..7b41341 100644
--- a/testdata/script/typeparams.txtar
+++ b/testdata/script/typeparams.txtar
@@ -3,7 +3,7 @@ garble build
 -- go.mod --
 module test/main
 
-go 1.19
+go 1.20
 -- garble_main.go --
 package main