Skip to content

Commit c58f105

Browse files
authored
chore: bump the required version to 1.18 (#221)
1 parent c4110eb commit c58f105

6 files changed

Lines changed: 16 additions & 38 deletions

File tree

.github/workflows/go.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
runs-on: ubuntu-latest
2323
steps:
2424
- name: Checkout code
25-
uses: actions/checkout@v2
25+
uses: actions/checkout@v3
2626
- name: Run golangci-lint
2727
uses: golangci/golangci-lint-action@v2
2828
with:
@@ -33,7 +33,7 @@ jobs:
3333
name: Test
3434
strategy:
3535
matrix:
36-
go-version: [ 1.12.x, 1.13.x, 1.14.x, 1.15.x, 1.16.x, 1.17.x ]
36+
go-version: [ 1.18.x, 1.19.x, 1.20.x ]
3737
platform: [ ubuntu-latest, macos-latest, windows-latest ]
3838
runs-on: ${{ matrix.platform }}
3939
steps:
@@ -42,7 +42,7 @@ jobs:
4242
with:
4343
go-version: ${{ matrix.go-version }}
4444
- name: Checkout code
45-
uses: actions/checkout@v2
45+
uses: actions/checkout@v3
4646
- name: Run tests with coverage
4747
run: go test -v -race -coverprofile=coverage -covermode=atomic ./...
4848
- name: Upload coverage report to Codecov

.golangci.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,16 @@ linters-settings:
44

55
linters:
66
enable:
7-
- deadcode
7+
- unused
88
- errcheck
99
- gosimple
1010
- govet
1111
- ineffassign
1212
- staticcheck
13-
- structcheck
1413
- typecheck
15-
- unused
16-
- varcheck
1714
- nakedret
1815
- gofmt
1916
- rowserrcheck
2017
- unconvert
2118
- goimports
19+
- unparam

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Package macaron is a high productive and modular web framework in Go.
1616

1717
## Getting Started
1818

19-
The minimum requirement of Go is **1.12**.
19+
The minimum requirement of Go is **1.18**.
2020

2121
To install Macaron:
2222

go.mod

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
module gopkg.in/macaron.v1
22

3-
go 1.12
3+
go 1.18
44

55
require (
66
github.com/go-macaron/inject v0.0.0-20160627170012-d8a0b8677191
7-
github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c // indirect
8-
github.com/smartystreets/assertions v1.0.1 // indirect
97
github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337
10-
github.com/stretchr/testify v1.7.0 // indirect
118
github.com/unknwon/com v0.0.0-20190804042917-757f69c95f3e
129
golang.org/x/crypto v0.1.0
1310
gopkg.in/ini.v1 v1.66.6
1411
)
12+
13+
require (
14+
github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c // indirect
15+
github.com/jtolds/gls v4.20.0+incompatible // indirect
16+
github.com/smartystreets/assertions v1.0.1 // indirect
17+
github.com/stretchr/testify v1.7.0 // indirect
18+
)

go.sum

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -23,38 +23,13 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc
2323
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
2424
github.com/unknwon/com v0.0.0-20190804042917-757f69c95f3e h1:GSGeB9EAKY2spCABz6xOX5DbxZEXolK+nBSvmsQwRjM=
2525
github.com/unknwon/com v0.0.0-20190804042917-757f69c95f3e/go.mod h1:tOOxU81rwgoCLoOVVPHb6T/wt8HZygqH5id+GNnlCXM=
26-
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
2726
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
28-
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
2927
golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU=
3028
golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
31-
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
3229
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
33-
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
34-
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
35-
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
36-
golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
37-
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
38-
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
3930
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
40-
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
41-
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
42-
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
43-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
44-
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
45-
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
46-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
47-
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
4831
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
49-
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
50-
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
51-
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
52-
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
5332
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
54-
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
55-
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
56-
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
57-
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
5833
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
5934
gopkg.in/ini.v1 v1.66.6 h1:LATuAqN/shcYAOkv3wl2L4rkaKqkcgTBQjOyYDvcPKI=
6035
gopkg.in/ini.v1 v1.66.6/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=

router.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,8 @@ func (r *Router) Any(pattern string, h ...Handler) *Route {
241241
// Route is a shortcut for same handlers but different HTTP methods.
242242
//
243243
// Example:
244-
// m.Route("/", "GET,POST", h)
244+
//
245+
// m.Route("/", "GET,POST", h)
245246
func (r *Router) Route(pattern, methods string, h ...Handler) (route *Route) {
246247
for _, m := range strings.Split(methods, ",") {
247248
route = r.Handle(strings.TrimSpace(m), pattern, h)

0 commit comments

Comments
 (0)