Prepare for go1.18 modules and generics (#26)

Author: vearutop

README.md

@@ -47,7 +47,7 @@ ifeq ($(DEVGO_PATH),)
 	DEVGO_PATH := $(shell GO111MODULE=on $(GO) list ${modVendor} -f '{{.Dir}}' -m github.com/bool64/dev)
 	ifeq ($(DEVGO_PATH),)
     	$(info Module github.com/bool64/dev not found, downloading.)
-    	DEVGO_PATH := $(shell export GO111MODULE=on && $(GO) mod tidy && $(GO) list -f '{{.Dir}}' -m github.com/bool64/dev)
+    	DEVGO_PATH := $(shell export GO111MODULE=on && $(GO) get github.com/bool64/dev && $(GO) list -f '{{.Dir}}' -m github.com/bool64/dev)
 	endif
 endif
 

makefiles/base.mk

@@ -23,7 +23,7 @@ ifeq ($(DEVGO_PATH),)
 	DEVGO_PATH := $(shell GO111MODULE=on $(GO) list ${modVendor} -f '{{.Dir}}' -m github.com/bool64/dev)
 	ifeq ($(DEVGO_PATH),)
     	$(info Module github.com/bool64/dev not found, downloading.)
-    	DEVGO_PATH := $(shell export GO111MODULE=on && $(GO) mod tidy && $(GO) list -f '{{.Dir}}' -m github.com/bool64/dev)
+    	DEVGO_PATH := $(shell export GO111MODULE=on && $(GO) get github.com/bool64/dev && $(GO) list -f '{{.Dir}}' -m github.com/bool64/dev)
 	endif
 endif
 

makefiles/test-unit.mk

@@ -4,11 +4,11 @@ UNIT_TEST_COUNT ?= 2
 ## Run unit tests
 test-unit:
 	@echo "Running unit tests."
-	@CGO_ENABLED=1 $(GO) test -short -gcflags=-l -coverprofile=unit.coverprofile -covermode=atomic -race ./...
+	@CGO_ENABLED=1 $(GO) test -short -coverprofile=unit.coverprofile -covermode=atomic -race ./...
 
 ## Run unit tests multiple times
 test-unit-multi:
 	@echo "Running unit tests ${UNIT_TEST_COUNT} times."
-	@CGO_ENABLED=1 $(GO) test -short -gcflags=-l -coverprofile=unit.coverprofile -count $(UNIT_TEST_COUNT) -covermode=atomic -race ./...
+	@CGO_ENABLED=1 $(GO) test -short -coverprofile=unit.coverprofile -count $(UNIT_TEST_COUNT) -covermode=atomic -race ./...
 
 .PHONY: test-unit test-unit-multi

scripts/fix.sh

@@ -12,7 +12,7 @@ SOURCES_TO_LINT=$(find . -name '*.go' -not -path "./vendor/*")
 # gogroup enforces import grouping: https://github.com/vasi-stripe/gogroup
 if ! command -v gogroup > /dev/null ; then \
     echo "Installing gogroup..."; \
-    bash -c "cd /tmp;GO111MODULE=on $GO get github.com/vasi-stripe/gogroup/cmd/[email protected]";
+    $GO install github.com/vasi-stripe/gogroup/cmd/[email protected];
 fi
 
 gogroup -order std,other -rewrite ${SOURCES_TO_LINT}
@@ -21,8 +21,8 @@ gogroup -order std,other -rewrite ${SOURCES_TO_LINT}
 # gofumpt is a drop-in replacement for gofmt with stricter formatting: https://github.com/mvdan/gofumpt
 if ! command -v gofumpt > /dev/null ; then \
     echo "Installing gofumpt..."; \
-    bash -c "cd /tmp;GO111MODULE=on $GO get mvdan.cc/gofumpt@v0.0.0-20200802201014-ab5a8192947d";
+    $GO install mvdan.cc/gofumpt@4d8e76d698e7e061266253df920ef5b28d8f8f13;
 fi
 
 # simplify code
-gofumpt -s -w ${SOURCES_TO_LINT} &>/dev/null
+gofumpt -w ${SOURCES_TO_LINT}