chore: upgrade golangci-lint to v2 (#305)

* chore: upgrade `golangci-lint` to v2

* chore: migrate linter config

* chore: restore comments

* chore: update disable comment

* chore: update to v2.1.6

* chore: disable staticcheck violation for now

* ci: bump this version too

Author: G-Rath

.github/workflows/checks.yml

@@ -44,9 +44,9 @@ jobs:
           go-version-file: .go-version
 
       - name: Run golangci-lint
-        uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 # v6.5.2
+        uses: golangci/golangci-lint-action@1481404843c368bc19ca9406f87d6e0fc97bdcfd # v7.0.0
         with:
-          version: v1.64
+          version: v2.1
   go-fmt:
     permissions:
       contents: read # to fetch code (actions/checkout)

.github/workflows/release.yml

@@ -43,9 +43,9 @@ jobs:
           go-version-file: .go-version
 
       - name: Run golangci-lint
-        uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 # v6.5.2
+        uses: golangci/golangci-lint-action@1481404843c368bc19ca9406f87d6e0fc97bdcfd # v7.0.0
         with:
-          version: v1.64
+          version: v2.1
   go-fmt:
     permissions:
       contents: read # to fetch code (actions/checkout)

.golangci.yaml

@@ -1,50 +1,72 @@
-output:
-  sort-results: true
+version: '2'
 linters:
-  enable-all: true
+  default: all
   # prettier-ignore
   disable:
-    - cyclop
-    - exhaustruct      # overkill
-    - forcetypeassert  # too hard
-    - funlen
-    - gocognit
-    - gocyclo
-    - godot            # comments are fine without full stops
-    - godox            # to-do comments are fine
-    - maintidx
-    - gofumpt
-    - ireturn          # disagree with, sort of
-    - lll              # line length is hard
-    - mnd              # not every number is magic
-    - nestif
-    - nonamedreturns   # they have their uses
-    - tagliatelle      # we're parsing data from external sources
-    - tenv             # Deprecated
-    - varnamelen       # maybe later
-    - wsl              # disagree with, for now
-
-linters-settings:
-  depguard:
+    - cyclop          #
+    - exhaustruct     # overkill
+    - forcetypeassert # too hard
+    - funcorder       #
+    - funlen          #
+    - gocognit        #
+    - gocyclo         #
+    - godot           # comments are fine without full stops
+    - godox           # to-do comments are fine
+    - ireturn         # disagree with, sort of
+    - lll             #
+    - maintidx        #
+    - mnd             # not every number is magic
+    - nestif          #
+    - nonamedreturns  # they have their uses
+    - tagliatelle     # we're parsing data from external sources
+    - varnamelen      # maybe later
+    - wsl             # disagree with, for now
+  settings:
+    depguard:
+      rules:
+        regexp:
+          files:
+            - '!**/internal/cachedregexp/**'
+            - '!**/main_test.go'
+          deny:
+            - pkg: regexp
+              desc:
+                Use github.com/g-rath/osv-detector/internal/cachedregexp instead
+    staticcheck:
+      checks:
+        - all
+        - -QF1006 # lift into loop condition
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
     rules:
-      regexp:
-        files:
-          - '!**/internal/cachedregexp/**'
-          - '!**/main_test.go'
-        deny:
-          - pkg: 'regexp'
-            desc:
-              'Use github.com/g-rath/osv-detector/internal/cachedregexp instead'
-
+      - linters:
+          - dupl
+          - err113
+          - goconst
+        path: _test\.go
+      - linters:
+          - gochecknoglobals
+        path: main.go
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
 issues:
   max-issues-per-linter: 0
   max-same-issues: 0
-  exclude-rules:
-    - path: _test\.go
-      linters:
-        - goconst
-        - goerr113
-        - dupl
-    - path: main.go
-      linters:
-        - gochecknoglobals
+formatters:
+  enable:
+    - gci
+    - gofmt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

Makefile

@@ -21,7 +21,7 @@ test-with-coverage:
 lint:	lint-with-golangci-lint lint-with-go-fmt
 
 lint-with-golangci-lint:
-	go run github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.8 run ./...
+	go run github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.1.6 run ./...
 
 lint-with-go-fmt:
 	gofmt -s -d */**.go

pkg/lockfile/parse-gradle-lock.go

@@ -14,7 +14,7 @@ func isNotGradleDependencyLine(line string) bool {
 func parseGradleLine(line string) (PackageDetails, error) {
 	parts := strings.SplitN(line, ":", 3)
 	if len(parts) < 3 {
-		return PackageDetails{}, fmt.Errorf("invalid line in gradle lockfile: %s", line) //nolint:goerr113
+		return PackageDetails{}, fmt.Errorf("invalid line in gradle lockfile: %s", line) //nolint:err113
 	}
 
 	group, artifact, version := parts[0], parts[1], parts[2]