Skip to content

Commit 2f18dfe

Browse files
committed
Merge branch 'master' of https://github.com/amfiyong/XrayR
merge remote
2 parents 2ae57ac + faedfee commit 2f18dfe

File tree

2 files changed

+45
-43
lines changed

2 files changed

+45
-43
lines changed

go.mod

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ require (
1515
github.com/juju/ratelimit v1.0.1
1616
github.com/r3labs/diff/v2 v2.15.1
1717
github.com/shirou/gopsutil v3.21.11+incompatible
18-
github.com/spf13/viper v1.10.1
18+
github.com/spf13/viper v1.11.0
1919
github.com/stretchr/testify v1.7.1
2020
github.com/tklauser/go-sysconf v0.3.10 // indirect
2121
github.com/urfave/cli v1.22.5
2222
github.com/xtls/xray-core v1.5.4
23-
golang.org/x/net v0.0.0-20220225172249-27dd8689420f
23+
golang.org/x/net v0.0.0-20220412020605-290c469a71a5
2424
google.golang.org/appengine v1.6.7 // indirect
2525
google.golang.org/protobuf v1.28.0
2626
)
@@ -64,7 +64,7 @@ require (
6464
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6565
github.com/google/go-querystring v1.1.0 // indirect
6666
github.com/google/uuid v1.3.0 // indirect
67-
github.com/googleapis/gax-go/v2 v2.1.1 // indirect
67+
github.com/googleapis/gax-go/v2 v2.3.0 // indirect
6868
github.com/gophercloud/gophercloud v0.24.0 // indirect
6969
github.com/gophercloud/utils v0.0.0-20220307143606-8e7800759d16 // indirect
7070
github.com/gorilla/websocket v1.5.0 // indirect
@@ -109,6 +109,7 @@ require (
109109
github.com/ovh/go-ovh v1.1.0 // indirect
110110
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
111111
github.com/pelletier/go-toml v1.9.4 // indirect
112+
github.com/pelletier/go-toml/v2 v2.0.0-beta.8 // indirect
112113
github.com/pires/go-proxyproto v0.6.2 // indirect
113114
github.com/pkg/errors v0.9.1 // indirect
114115
github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -144,16 +145,16 @@ require (
144145
go.opencensus.io v0.23.0 // indirect
145146
go.starlark.net v0.0.0-20220302181546-5411bad688d1 // indirect
146147
go.uber.org/ratelimit v0.2.0 // indirect
147-
golang.org/x/crypto v0.0.0-20220314234724-5d542ad81a58 // indirect
148+
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect
148149
golang.org/x/mod v0.5.1 // indirect
149-
golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a // indirect
150-
golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 // indirect
150+
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
151+
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
151152
golang.org/x/text v0.3.7 // indirect
152153
golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect
153154
golang.org/x/tools v0.1.9 // indirect
154-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
155-
google.golang.org/api v0.72.0 // indirect
156-
google.golang.org/genproto v0.0.0-20220314164441-57ef72a4c106 // indirect
155+
golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect
156+
google.golang.org/api v0.74.0 // indirect
157+
google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac // indirect
157158
google.golang.org/grpc v1.45.0 // indirect
158159
gopkg.in/ini.v1 v1.66.4 // indirect
159160
gopkg.in/ns1/ns1-go.v2 v2.6.3 // indirect

0 commit comments

Comments
 (0)