diff --git a/.github/linters/.golangci.yml b/.github/linters/.golangci.yml index fee978d4914..056d47a69f0 100644 --- a/.github/linters/.golangci.yml +++ b/.github/linters/.golangci.yml @@ -2,8 +2,6 @@ run: timeout: 5m skip-files: - generated.* - - .*_test.go - - proxy/vlite/* issues: new: true diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 941344eea2d..75760cbe432 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -22,7 +22,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v3 with: - go-version: ^1.18 + go-version: ^1.19 - name: Checkout codebase uses: actions/checkout@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6fac69b233b..4e9f0122784 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -119,7 +119,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v3 with: - go-version: ^1.18 + go-version: ^1.19 - name: Get project dependencies run: go mod download diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 82aa1eb582e..983a9b1785e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -30,7 +30,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v3 with: - go-version: ^1.18 + go-version: ^1.19 - name: Checkout codebase uses: actions/checkout@v3 diff --git a/common/protocol/quic/qtls_go117.go b/common/protocol/quic/qtls_go117.go deleted file mode 100644 index 08e8d483da7..00000000000 --- a/common/protocol/quic/qtls_go117.go +++ /dev/null @@ -1,19 +0,0 @@ -//go:build go1.17 && !go1.18 -// +build go1.17,!go1.18 - -package quic - -import ( - "crypto/cipher" - - "github.com/marten-seemann/qtls-go1-17" -) - -type ( - // A CipherSuiteTLS13 is a cipher suite for TLS 1.3 - CipherSuiteTLS13 = qtls.CipherSuiteTLS13 -) - -func AEADAESGCMTLS13(key, fixedNonce []byte) cipher.AEAD { - return qtls.AEADAESGCMTLS13(key, fixedNonce) -} diff --git a/common/protocol/quic/qtls_go118.go b/common/protocol/quic/qtls_go118.go index 0bcacff2f43..63546a4bf6c 100644 --- a/common/protocol/quic/qtls_go118.go +++ b/common/protocol/quic/qtls_go118.go @@ -1,5 +1,5 @@ -//go:build go1.18 -// +build go1.18 +//go:build go1.18 && !go1.19 +// +build go1.18,!go1.19 package quic diff --git a/common/protocol/quic/qtls_go116.go b/common/protocol/quic/qtls_go119.go similarity index 73% rename from common/protocol/quic/qtls_go116.go rename to common/protocol/quic/qtls_go119.go index da849ea3a75..98ff28d48e6 100644 --- a/common/protocol/quic/qtls_go116.go +++ b/common/protocol/quic/qtls_go119.go @@ -1,12 +1,12 @@ -//go:build go1.16 && !go1.17 -// +build go1.16,!go1.17 +//go:build go1.19 +// +build go1.19 package quic import ( "crypto/cipher" - "github.com/marten-seemann/qtls-go1-16" + "github.com/marten-seemann/qtls-go1-19" ) type ( diff --git a/go.mod b/go.mod index 4793661c8aa..fd8416e1e51 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/v2fly/v2ray-core/v5 -go 1.18 +go 1.19 require ( github.com/adrg/xdg v0.4.0 @@ -13,9 +13,8 @@ require ( github.com/gorilla/websocket v1.5.0 github.com/jhump/protoreflect v1.12.0 github.com/lucas-clemente/quic-go v0.28.1 - github.com/marten-seemann/qtls-go1-16 v0.1.5 - github.com/marten-seemann/qtls-go1-17 v0.1.2 github.com/marten-seemann/qtls-go1-18 v0.1.2 + github.com/marten-seemann/qtls-go1-19 v0.1.0-beta.1 github.com/miekg/dns v1.1.50 github.com/mustafaturan/bus v1.0.2 github.com/pelletier/go-toml v1.9.5 @@ -53,7 +52,8 @@ require ( github.com/klauspost/reedsolomon v1.9.3 // indirect github.com/leodido/go-urn v1.2.1 // indirect github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 // indirect - github.com/marten-seemann/qtls-go1-19 v0.1.0-beta.1 // indirect + github.com/marten-seemann/qtls-go1-16 v0.1.5 // indirect + github.com/marten-seemann/qtls-go1-17 v0.1.2 // indirect github.com/mustafaturan/monoton v1.0.0 // indirect github.com/nxadm/tail v1.4.8 // indirect github.com/onsi/ginkgo v1.16.4 // indirect @@ -67,7 +67,7 @@ require ( github.com/secure-io/siv-go v0.0.0-20180922214919-5ff40651e2c4 // indirect github.com/xtaci/smux v1.5.15 // indirect go4.org/intern v0.0.0-20211027215823-ae77deb06f29 // indirect - go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37 // indirect + go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 // indirect golang.org/x/mod v0.4.2 // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2 // indirect diff --git a/go.sum b/go.sum index fbb29245345..82f6665af54 100644 --- a/go.sum +++ b/go.sum @@ -431,8 +431,9 @@ go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE= go4.org/intern v0.0.0-20211027215823-ae77deb06f29 h1:UXLjNohABv4S58tHmeuIZDO6e3mHpW2Dx33gaNt03LE= go4.org/intern v0.0.0-20211027215823-ae77deb06f29/go.mod h1:cS2ma+47FKrLPdXFpr7CuxiTW3eyJbWew4qx0qtQWDA= -go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37 h1:Tx9kY6yUkLge/pFG7IEMwDZy6CS2ajFc9TvQdPCW0uA= go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E= +go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 h1:FyBZqvoA/jbNzuAWLQE2kG820zMAkcilx6BMjGbL/E4= +go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E= golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=