Drop support for go v1.17.x (#1723)

* Drop support for go v1.17.x Signed-off-by: sdghchj <[email protected]>
swaggo · Dec 18, 2023 · 744a58e · 744a58e
1 parent 6cdaaf5
commit 744a58e
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 206 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go: [ '1.17.x', '1.18.x', '1.19.x', '1.20.x' ]
+        go: [ '1.18.x', '1.19.x', '1.20.x', '1.21.x' ]
         platform: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.platform }}
     steps:

diff --git a/Makefile b/Makefile
@@ -6,6 +6,7 @@ GOBUILD:=$(GOCMD) build
 GOINSTALL:=$(GOCMD) install
 GOCLEAN:=$(GOCMD) clean
 GOTEST:=$(GOCMD) test
+GOMODTIDY:=$(GOCMD) mod tidy
 GOGET:=$(GOCMD) get
 GOLIST:=$(GOCMD) list
 GOVET:=$(GOCMD) vet
@@ -54,13 +55,7 @@ clean:
 
 .PHONY: deps
 deps:
-	$(GOGET) github.com/swaggo/cli
-	$(GOGET) sigs.k8s.io/yaml
-	$(GOGET) github.com/KyleBanks/depth
-	$(GOGET) github.com/go-openapi/jsonreference
-	$(GOGET) github.com/go-openapi/spec
-	$(GOGET) github.com/stretchr/testify/assert
-	$(GOGET) golang.org/x/tools/go/loader
+	$(GOMODTIDY)
 
 .PHONY: devel-deps
 devel-deps:

diff --git a/README.md b/README.md
@@ -55,7 +55,7 @@ Swag converts Go annotations to Swagger Documentation 2.0. We've created a varie
 ```sh
 go install github.com/swaggo/swag/cmd/swag@latest
 ```
-To build from source you need [Go](https://golang.org/dl/) (1.17 or newer).
+To build from source you need [Go](https://golang.org/dl/) (1.18 or newer).
 
 Alternatively you can run the docker image:
 ```sh

diff --git a/README_pt.md b/README_pt.md
@@ -54,7 +54,7 @@ Swag converte anotações Go para Documentação Swagger 2.0. Criámos uma varie
 ```sh
 go install github.com/swaggo/swag/cmd/swag@latest
 ```
-Para construir a partir da fonte é necessário [Go](https://golang.org/dl/) (1.17 ou mais recente).
+Para construir a partir da fonte é necessário [Go](https://golang.org/dl/) (1.18 ou mais recente).
 
 Ou descarregar um binário pré-compilado a partir da [página de lançamento](https://github.com/swaggo/swag/releases).
 

diff --git a/README_zh-CN.md b/README_zh-CN.md
@@ -50,7 +50,7 @@ Swag将Go的注释转换为Swagger2.0文档。我们为流行的 [Go Web Framewo
 go install github.com/swaggo/swag/cmd/swag@latest
 ```
 
-从源码开始构建的话，需要有Go环境（1.17及以上版本）。
+从源码开始构建的话，需要有Go环境（1.18及以上版本）。
 
 或者从github的release页面下载预编译好的二进制文件。
 

diff --git a/const.go b/const.go
@@ -6,6 +6,7 @@ import (
 	"reflect"
 	"strconv"
 	"strings"
+	"unicode/utf8"
 )
 
 // ConstVariable a model to record a const variable
@@ -60,7 +61,7 @@ func EvaluateEscapedString(text string) string {
 				i++
 				char, err := strconv.ParseInt(text[i:i+4], 16, 32)
 				if err == nil {
-					result = AppendUtf8Rune(result, rune(char))
+					result = utf8.AppendRune(result, rune(char))
 				}
 				i += 3
 			} else if c, ok := escapedChars[text[i]]; ok {
@@ -404,7 +405,7 @@ func EvaluateUnary(x interface{}, operator token.Token, xtype ast.Expr) (interfa
 func EvaluateBinary(x, y interface{}, operator token.Token, xtype, ytype ast.Expr) (interface{}, ast.Expr) {
 	if operator == token.SHR || operator == token.SHL {
 		var rightOperand uint64
-		yValue := CanIntegerValue{reflect.ValueOf(y)}
+		yValue := reflect.ValueOf(y)
 		if yValue.CanUint() {
 			rightOperand = yValue.Uint()
 		} else if yValue.CanInt() {
@@ -467,8 +468,8 @@ func EvaluateBinary(x, y interface{}, operator token.Token, xtype, ytype ast.Exp
 		evalType = ytype
 	}
 
-	xValue := CanIntegerValue{reflect.ValueOf(x)}
-	yValue := CanIntegerValue{reflect.ValueOf(y)}
+	xValue := reflect.ValueOf(x)
+	yValue := reflect.ValueOf(y)
 	if xValue.Kind() == reflect.String && yValue.Kind() == reflect.String {
 		return xValue.String() + yValue.String(), evalType
 	}

diff --git a/example/celler/go.mod b/example/celler/go.mod
@@ -1,6 +1,6 @@
 module github.com/swaggo/swag/example/celler
 
-go 1.17
+go 1.18
 
 require (
 	github.com/gin-gonic/gin v1.9.1

diff --git a/example/go-module-support/go.mod b/example/go-module-support/go.mod
@@ -1,6 +1,6 @@
 module github.com/swaggo/swag/example/go-module-support
 
-go 1.17
+go 1.18
 
 require (
 	github.com/gin-gonic/gin v1.9.1

diff --git a/example/markdown/go.mod b/example/markdown/go.mod
@@ -1,6 +1,6 @@
 module github.com/swaggo/swag/example/markdown
 
-go 1.17
+go 1.18
 
 require (
 	github.com/gorilla/mux v1.8.0

diff --git a/example/object-map-example/go.mod b/example/object-map-example/go.mod
@@ -1,6 +1,6 @@
 module github.com/swaggo/swag/example/object-map-example
 
-go 1.17
+go 1.18
 
 require (
 	github.com/gin-gonic/gin v1.9.1

diff --git a/generics_other.go b/generics_other.go
diff --git a/generics_other_test.go b/generics_other_test.go
diff --git a/utils_go18.go b/utils_go18.go
diff --git a/utils_other.go b/utils_other.go