Skip to content

Commit aba11b9

Browse files
Merge pull request #8 from AudriusButkevicius/go120
Update quic-go for Go 1.20
2 parents 3924a65 + b3d3f70 commit aba11b9

File tree

6 files changed

+65
-262
lines changed

6 files changed

+65
-262
lines changed

.github/workflows/go.yml

+8-1
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,21 @@ on:
99
jobs:
1010

1111
build:
12+
13+
strategy:
14+
matrix:
15+
go:
16+
- "1.19"
17+
- "1.20"
18+
1219
runs-on: ubuntu-latest
1320
steps:
1421
- uses: actions/checkout@v2
1522

1623
- name: Set up Go
1724
uses: actions/setup-go@v2
1825
with:
19-
go-version: 1.15
26+
go-version: ${{ matrix.go }}
2027

2128
- name: Build
2229
run: go build -v ./...

conn_oob.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"net"
55
"time"
66

7-
"github.com/lucas-clemente/quic-go"
7+
"github.com/quic-go/quic-go"
88
)
99

1010
var _ quic.OOBCapablePacketConn = (*filteredConnObb)(nil)

filter.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@ import (
88
"sync"
99
"sync/atomic"
1010

11-
"github.com/lucas-clemente/quic-go"
11+
"github.com/quic-go/quic-go"
1212
"golang.org/x/net/ipv4"
1313
"golang.org/x/net/ipv6"
1414
)
1515

1616
// These are both the same, socket.Message, just have type aliases.
17+
//
1718
//goland:noinspection GoVarAndConstTypeMayBeOmitted
1819
var _ ipv4.Message = ipv6.Message{}
1920

go.mod

+18-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,24 @@
11
module github.com/AudriusButkevicius/pfilter
22

3-
go 1.15
3+
go 1.20
44

55
require (
6-
github.com/lucas-clemente/quic-go v0.22.0
76
github.com/pkg/errors v0.9.1
8-
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 // indirect
9-
golang.org/x/net v0.0.0-20210716203947-853a461950ff
10-
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
11-
golang.org/x/tools v0.1.5 // indirect
7+
github.com/quic-go/quic-go v0.32.0
8+
golang.org/x/net v0.4.0
9+
)
10+
11+
require (
12+
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
13+
github.com/golang/mock v1.6.0 // indirect
14+
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
15+
github.com/onsi/ginkgo/v2 v2.2.0 // indirect
16+
github.com/quic-go/qtls-go1-18 v0.2.0 // indirect
17+
github.com/quic-go/qtls-go1-19 v0.2.0 // indirect
18+
github.com/quic-go/qtls-go1-20 v0.1.0 // indirect
19+
golang.org/x/crypto v0.4.0 // indirect
20+
golang.org/x/exp v0.0.0-20221205204356-47842c84f3db // indirect
21+
golang.org/x/mod v0.6.0 // indirect
22+
golang.org/x/sys v0.3.0 // indirect
23+
golang.org/x/tools v0.2.0 // indirect
1224
)

0 commit comments

Comments
 (0)