Skip to content

Commit

Permalink
Merge pull request #8 from AudriusButkevicius/go120
Browse files Browse the repository at this point in the history
Update quic-go for Go 1.20
  • Loading branch information
AudriusButkevicius committed Feb 2, 2023
2 parents 3924a65 + b3d3f70 commit aba11b9
Show file tree
Hide file tree
Showing 6 changed files with 65 additions and 262 deletions.
9 changes: 8 additions & 1 deletion .github/workflows/go.yml
Expand Up @@ -9,14 +9,21 @@ on:
jobs:

build:

strategy:
matrix:
go:
- "1.19"
- "1.20"

runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.15
go-version: ${{ matrix.go }}

- name: Build
run: go build -v ./...
Expand Down
2 changes: 1 addition & 1 deletion conn_oob.go
Expand Up @@ -4,7 +4,7 @@ import (
"net"
"time"

"github.com/lucas-clemente/quic-go"
"github.com/quic-go/quic-go"
)

var _ quic.OOBCapablePacketConn = (*filteredConnObb)(nil)
Expand Down
3 changes: 2 additions & 1 deletion filter.go
Expand Up @@ -8,12 +8,13 @@ import (
"sync"
"sync/atomic"

"github.com/lucas-clemente/quic-go"
"github.com/quic-go/quic-go"
"golang.org/x/net/ipv4"
"golang.org/x/net/ipv6"
)

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

Expand Down
24 changes: 18 additions & 6 deletions go.mod
@@ -1,12 +1,24 @@
module github.com/AudriusButkevicius/pfilter

go 1.15
go 1.20

require (
github.com/lucas-clemente/quic-go v0.22.0
github.com/pkg/errors v0.9.1
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 // indirect
golang.org/x/net v0.0.0-20210716203947-853a461950ff
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
golang.org/x/tools v0.1.5 // indirect
github.com/quic-go/quic-go v0.32.0
golang.org/x/net v0.4.0
)

require (
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
github.com/onsi/ginkgo/v2 v2.2.0 // indirect
github.com/quic-go/qtls-go1-18 v0.2.0 // indirect
github.com/quic-go/qtls-go1-19 v0.2.0 // indirect
github.com/quic-go/qtls-go1-20 v0.1.0 // indirect
golang.org/x/crypto v0.4.0 // indirect
golang.org/x/exp v0.0.0-20221205204356-47842c84f3db // indirect
golang.org/x/mod v0.6.0 // indirect
golang.org/x/sys v0.3.0 // indirect
golang.org/x/tools v0.2.0 // indirect
)

0 comments on commit aba11b9

Please sign in to comment.