From 46cbcb7c5ba43415334eb19c7aea5c0110ea1e91 Mon Sep 17 00:00:00 2001
From: Efertone <efertone@pm.me>
Date: Wed, 24 May 2023 15:19:11 +0200
Subject: [PATCH] update go version and testify

---
 .github/workflows/quality-check.yaml |  6 +++---
 .golangci.yml                        | 24 ++++++++++++++++++------
 go.mod                               |  4 ++--
 go.sum                               |  1 +
 4 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/quality-check.yaml b/.github/workflows/quality-check.yaml
index 60a37cb..45d62ad 100644
--- a/.github/workflows/quality-check.yaml
+++ b/.github/workflows/quality-check.yaml
@@ -12,7 +12,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v2
         with:
-          go-version: ^1.18
+          go-version: ^1.20
         id: go
 
       - name: Checkout code
@@ -59,7 +59,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v2
         with:
-          go-version: ^1.18
+          go-version: ^1.20
         id: go
 
       - name: Checkout code
@@ -86,4 +86,4 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2
         with:
-          version: v1.46.2
+          version: v1.51.0
diff --git a/.golangci.yml b/.golangci.yml
index 4428e6f..54724e1 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -5,9 +5,9 @@ run:
 
 linters-settings:
   staticcheck:
-    go: "1.17"
+    go: "1.20"
   stylecheck:
-    go: "1.17"
+    go: "1.20"
   cyclop:
     max-complexity: 15
     skip-tests: true
@@ -68,7 +68,19 @@ issues:
 linters:
   enable-all: true
   disable:
-  - golint       # deprecated
-  - interfacer   # deprecated
-  - maligned     # deprecated
-  - scopelint    # deprecated
+  # deprecated
+  - deadcode
+  - exhaustivestruct
+  - golint
+  - ifshort
+  - interfacer
+  - maligned
+  - nosnakecase
+  - scopelint
+  - structcheck
+  - varcheck
+
+  # generics
+  - rowserrcheck
+  - sqlclosecheck
+  - wastedassign
diff --git a/go.mod b/go.mod
index 5a8eff7..7ddf007 100644
--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,8 @@
 module github.com/yitsushi/macpot
 
-go 1.18
+go 1.20
 
-require github.com/stretchr/testify v1.8.2
+require github.com/stretchr/testify v1.8.3
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
diff --git a/go.sum b/go.sum
index 6a56e69..864bb0b 100644
--- a/go.sum
+++ b/go.sum
@@ -10,6 +10,7 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=