Browse Source

🏡 Housekeeping: Update to Go 1.17 (#1215)

* ⬆ Update to Go 1.17

* 🏗 Update workflows and add windows-arm64

* 💾 Update generated files

* 📛 Update not-so-friendly filenames
database64128 4 years ago
parent
commit
c78ee5aac7
100 changed files with 127 additions and 40 deletions
  1. 1 1
      .github/workflows/linter.yml
  2. 4 2
      .github/workflows/release.yml
  3. 1 1
      .github/workflows/test.yml
  4. 1 1
      app/browserforwarder/config.pb.go
  5. 1 0
      app/browserforwarder/forwarder.go
  6. 1 0
      app/commander/commander.go
  7. 1 1
      app/commander/config.pb.go
  8. 1 0
      app/commander/outbound.go
  9. 1 0
      app/commander/service.go
  10. 1 1
      app/dispatcher/config.pb.go
  11. 1 0
      app/dispatcher/default.go
  12. 1 0
      app/dispatcher/dispatcher.go
  13. 1 0
      app/dispatcher/fakednssniffer.go
  14. 1 0
      app/dispatcher/sniffer.go
  15. 1 0
      app/dispatcher/stats.go
  16. 1 0
      app/dns/config.go
  17. 1 1
      app/dns/config.pb.go
  18. 1 0
      app/dns/dns.go
  19. 1 0
      app/dns/dnscommon.go
  20. 1 0
      app/dns/dnscommon_test.go
  21. 1 0
      app/dns/fakedns/fake.go
  22. 1 0
      app/dns/fakedns/fakedns.go
  23. 1 1
      app/dns/fakedns/fakedns.pb.go
  24. 1 0
      app/dns/hosts.go
  25. 1 0
      app/dns/nameserver.go
  26. 1 0
      app/dns/nameserver_doh.go
  27. 1 0
      app/dns/nameserver_fakedns.go
  28. 1 0
      app/dns/nameserver_local.go
  29. 1 0
      app/dns/nameserver_quic.go
  30. 1 0
      app/dns/nameserver_tcp.go
  31. 1 0
      app/dns/nameserver_udp.go
  32. 1 0
      app/log/command/command.go
  33. 1 1
      app/log/command/config.pb.go
  34. 1 1
      app/log/config.pb.go
  35. 1 0
      app/log/log.go
  36. 1 0
      app/log/log_creator.go
  37. 1 0
      app/observatory/command/command.go
  38. 1 1
      app/observatory/command/command.pb.go
  39. 1 1
      app/observatory/config.pb.go
  40. 1 0
      app/observatory/observer.go
  41. 1 1
      app/policy/config.pb.go
  42. 1 0
      app/proxyman/command/command.go
  43. 1 1
      app/proxyman/command/command.pb.go
  44. 1 1
      app/proxyman/config.pb.go
  45. 1 0
      app/reverse/bridge.go
  46. 1 0
      app/reverse/config.go
  47. 1 1
      app/reverse/config.pb.go
  48. 1 0
      app/reverse/portal.go
  49. 1 0
      app/reverse/reverse.go
  50. 1 0
      app/router/balancing.go
  51. 1 0
      app/router/command/command.go
  52. 1 1
      app/router/command/command.pb.go
  53. 1 0
      app/router/condition.go
  54. 1 0
      app/router/condition_geoip.go
  55. 1 0
      app/router/config.go
  56. 1 1
      app/router/config.pb.go
  57. 1 0
      app/router/router.go
  58. 1 0
      app/router/strategy_leastping.go
  59. 1 0
      app/stats/channel.go
  60. 1 0
      app/stats/command/command.go
  61. 1 1
      app/stats/command/command.pb.go
  62. 1 1
      app/stats/config.pb.go
  63. 1 0
      app/stats/counter.go
  64. 1 0
      app/stats/stats.go
  65. 2 3
      common/buf/readv_posix.go
  66. 1 0
      common/buf/readv_reader.go
  67. 1 0
      common/buf/readv_reader_wasm.go
  68. 1 0
      common/buf/readv_test.go
  69. 1 0
      common/buf/readv_unix.go
  70. 1 0
      common/crypto/internal/chacha_core_gen.go
  71. 1 1
      common/log/log.pb.go
  72. 1 1
      common/net/address.pb.go
  73. 1 0
      common/net/connection.go
  74. 1 1
      common/net/destination.pb.go
  75. 1 1
      common/net/network.pb.go
  76. 1 1
      common/net/port.pb.go
  77. 1 0
      common/platform/ctlcmd/attr_other.go
  78. 1 0
      common/platform/ctlcmd/attr_windows.go
  79. 1 0
      common/platform/others.go
  80. 1 0
      common/platform/windows.go
  81. 1 1
      common/protocol/headers.pb.go
  82. 1 1
      common/protocol/server_spec.pb.go
  83. 1 1
      common/protocol/user.pb.go
  84. 1 1
      common/serial/typed_message.pb.go
  85. 1 0
      config.go
  86. 1 1
      config.pb.go
  87. 1 0
      context.go
  88. 1 0
      functions.go
  89. 25 1
      go.mod
  90. 0 1
      go.sum
  91. 1 0
      main/main_test.go
  92. 1 0
      proxy/blackhole/blackhole.go
  93. 1 1
      proxy/blackhole/config.pb.go
  94. 1 1
      proxy/dns/config.pb.go
  95. 1 0
      proxy/dns/dns.go
  96. 1 1
      proxy/dokodemo/config.pb.go
  97. 1 0
      proxy/dokodemo/dokodemo.go
  98. 1 1
      proxy/freedom/config.pb.go
  99. 1 0
      proxy/freedom/freedom.go
  100. 1 0
      proxy/http/client.go

+ 1 - 1
.github/workflows/linter.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v2
         with:
-          go-version: ^1.16.4
+          go-version: ^1.17
 
       - name: Checkout codebase
         uses: actions/checkout@v2

+ 4 - 2
.github/workflows/release.yml

@@ -57,6 +57,8 @@ jobs:
             goarch: arm64
           - goos: linux
             goarch: riscv64
+          - goos: windows
+            goarch: arm64
           # BEGIN MIPS
           - goos: linux
             goarch: mips64
@@ -98,7 +100,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: ^1.16.4
+          go-version: ^1.17
 
       - name: Get project dependencies
         run: go mod download
@@ -169,7 +171,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: ^1.16.4
+          go-version: ^1.17
 
       - uses: actions/download-artifact@v2
         with:

+ 1 - 1
.github/workflows/test.yml

@@ -30,7 +30,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v2
         with:
-          go-version: ^1.16.4
+          go-version: ^1.17
 
       - name: Checkout codebase
         uses: actions/checkout@v2

+ 1 - 1
app/browserforwarder/config.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.27.1
-// 	protoc        v3.15.6
+// 	protoc        v3.17.3
 // source: app/browserforwarder/config.proto
 
 package browserforwarder

+ 1 - 0
app/browserforwarder/forwarder.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package browserforwarder

+ 1 - 0
app/commander/commander.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package commander

+ 1 - 1
app/commander/config.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.27.1
-// 	protoc        v3.15.6
+// 	protoc        v3.17.3
 // source: app/commander/config.proto
 
 package commander

+ 1 - 0
app/commander/outbound.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package commander

+ 1 - 0
app/commander/service.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package commander

+ 1 - 1
app/dispatcher/config.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.27.1
-// 	protoc        v3.15.6
+// 	protoc        v3.17.3
 // source: app/dispatcher/config.proto
 
 package dispatcher

+ 1 - 0
app/dispatcher/default.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package dispatcher

+ 1 - 0
app/dispatcher/dispatcher.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package dispatcher

+ 1 - 0
app/dispatcher/fakednssniffer.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package dispatcher

+ 1 - 0
app/dispatcher/sniffer.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package dispatcher

+ 1 - 0
app/dispatcher/stats.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package dispatcher

+ 1 - 0
app/dns/config.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package dns

+ 1 - 1
app/dns/config.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.27.1
-// 	protoc        v3.15.6
+// 	protoc        v3.17.3
 // source: app/dns/config.proto
 
 package dns

+ 1 - 0
app/dns/dns.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 // Package dns is an implementation of core.DNS feature.

+ 1 - 0
app/dns/dnscommon.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package dns

+ 1 - 0
app/dns/dnscommon_test.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package dns

+ 1 - 0
app/dns/fakedns/fake.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package fakedns

+ 1 - 0
app/dns/fakedns/fakedns.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package fakedns

+ 1 - 1
app/dns/fakedns/fakedns.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.27.1
-// 	protoc        v3.15.6
+// 	protoc        v3.17.3
 // source: app/dns/fakedns/fakedns.proto
 
 package fakedns

+ 1 - 0
app/dns/hosts.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package dns

+ 1 - 0
app/dns/nameserver.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package dns

+ 1 - 0
app/dns/nameserver_doh.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package dns

+ 1 - 0
app/dns/nameserver_fakedns.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package dns

+ 1 - 0
app/dns/nameserver_local.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package dns

+ 1 - 0
app/dns/nameserver_quic.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package dns

+ 1 - 0
app/dns/nameserver_tcp.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package dns

+ 1 - 0
app/dns/nameserver_udp.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package dns

+ 1 - 0
app/log/command/command.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package command

+ 1 - 1
app/log/command/config.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.27.1
-// 	protoc        v3.15.6
+// 	protoc        v3.17.3
 // source: app/log/command/config.proto
 
 package command

+ 1 - 1
app/log/config.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.27.1
-// 	protoc        v3.15.6
+// 	protoc        v3.17.3
 // source: app/log/config.proto
 
 package log

+ 1 - 0
app/log/log.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package log

+ 1 - 0
app/log/log_creator.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package log

+ 1 - 0
app/observatory/command/command.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package command

+ 1 - 1
app/observatory/command/command.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.27.1
-// 	protoc        v3.15.6
+// 	protoc        v3.17.3
 // source: app/observatory/command/command.proto
 
 package command

+ 1 - 1
app/observatory/config.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.27.1
-// 	protoc        v3.15.6
+// 	protoc        v3.17.3
 // source: app/observatory/config.proto
 
 package observatory

+ 1 - 0
app/observatory/observer.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package observatory

+ 1 - 1
app/policy/config.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.27.1
-// 	protoc        v3.15.6
+// 	protoc        v3.17.3
 // source: app/policy/config.proto
 
 package policy

+ 1 - 0
app/proxyman/command/command.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package command

+ 1 - 1
app/proxyman/command/command.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.27.1
-// 	protoc        v3.15.6
+// 	protoc        v3.17.3
 // source: app/proxyman/command/command.proto
 
 package command

+ 1 - 1
app/proxyman/config.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.27.1
-// 	protoc        v3.15.6
+// 	protoc        v3.17.3
 // source: app/proxyman/config.proto
 
 package proxyman

+ 1 - 0
app/reverse/bridge.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package reverse

+ 1 - 0
app/reverse/config.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package reverse

+ 1 - 1
app/reverse/config.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.27.1
-// 	protoc        v3.15.6
+// 	protoc        v3.17.3
 // source: app/reverse/config.proto
 
 package reverse

+ 1 - 0
app/reverse/portal.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package reverse

+ 1 - 0
app/reverse/reverse.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package reverse

+ 1 - 0
app/router/balancing.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package router

+ 1 - 0
app/router/command/command.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package command

+ 1 - 1
app/router/command/command.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.27.1
-// 	protoc        v3.15.6
+// 	protoc        v3.17.3
 // source: app/router/command/command.proto
 
 package command

+ 1 - 0
app/router/condition.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package router

+ 1 - 0
app/router/condition_geoip.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package router

+ 1 - 0
app/router/config.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package router

+ 1 - 1
app/router/config.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.27.1
-// 	protoc        v3.15.6
+// 	protoc        v3.17.3
 // source: app/router/config.proto
 
 package router

+ 1 - 0
app/router/router.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package router

+ 1 - 0
app/router/strategy_leastping.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package router

+ 1 - 0
app/stats/channel.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package stats

+ 1 - 0
app/stats/command/command.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package command

+ 1 - 1
app/stats/command/command.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.27.1
-// 	protoc        v3.15.6
+// 	protoc        v3.17.3
 // source: app/stats/command/command.proto
 
 package command

+ 1 - 1
app/stats/config.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.27.1
-// 	protoc        v3.15.6
+// 	protoc        v3.17.3
 // source: app/stats/config.proto
 
 package stats

+ 1 - 0
app/stats/counter.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package stats

+ 1 - 0
app/stats/stats.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package stats

+ 2 - 3
common/buf/readv_posix.go

@@ -1,6 +1,5 @@
-// +build !windows
-// +build !wasm
-// +build !illumos
+//go:build !windows && !wasm && !illumos
+// +build !windows,!wasm,!illumos
 
 package buf
 

+ 1 - 0
common/buf/readv_reader.go

@@ -1,3 +1,4 @@
+//go:build !wasm
 // +build !wasm
 
 package buf

+ 1 - 0
common/buf/readv_reader_wasm.go

@@ -1,3 +1,4 @@
+//go:build wasm
 // +build wasm
 
 package buf

+ 1 - 0
common/buf/readv_test.go

@@ -1,3 +1,4 @@
+//go:build !wasm
 // +build !wasm
 
 package buf_test

+ 1 - 0
common/buf/readv_unix.go

@@ -1,3 +1,4 @@
+//go:build illumos
 // +build illumos
 
 package buf

+ 1 - 0
common/crypto/internal/chacha_core_gen.go

@@ -1,3 +1,4 @@
+//go:build generate
 // +build generate
 
 package main

+ 1 - 1
common/log/log.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.27.1
-// 	protoc        v3.15.6
+// 	protoc        v3.17.3
 // source: common/log/log.proto
 
 package log

+ 1 - 1
common/net/address.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.27.1
-// 	protoc        v3.15.6
+// 	protoc        v3.17.3
 // source: common/net/address.proto
 
 package net

+ 1 - 0
common/net/connection.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package net

+ 1 - 1
common/net/destination.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.27.1
-// 	protoc        v3.15.6
+// 	protoc        v3.17.3
 // source: common/net/destination.proto
 
 package net

+ 1 - 1
common/net/network.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.27.1
-// 	protoc        v3.15.6
+// 	protoc        v3.17.3
 // source: common/net/network.proto
 
 package net

+ 1 - 1
common/net/port.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.27.1
-// 	protoc        v3.15.6
+// 	protoc        v3.17.3
 // source: common/net/port.proto
 
 package net

+ 1 - 0
common/platform/ctlcmd/attr_other.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package ctlcmd

+ 1 - 0
common/platform/ctlcmd/attr_windows.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package ctlcmd

+ 1 - 0
common/platform/others.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package platform

+ 1 - 0
common/platform/windows.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package platform

+ 1 - 1
common/protocol/headers.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.27.1
-// 	protoc        v3.15.6
+// 	protoc        v3.17.3
 // source: common/protocol/headers.proto
 
 package protocol

+ 1 - 1
common/protocol/server_spec.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.27.1
-// 	protoc        v3.15.6
+// 	protoc        v3.17.3
 // source: common/protocol/server_spec.proto
 
 package protocol

+ 1 - 1
common/protocol/user.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.27.1
-// 	protoc        v3.15.6
+// 	protoc        v3.17.3
 // source: common/protocol/user.proto
 
 package protocol

+ 1 - 1
common/serial/typed_message.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.27.1
-// 	protoc        v3.15.6
+// 	protoc        v3.17.3
 // source: common/serial/typed_message.proto
 
 package serial

+ 1 - 0
config.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package core

+ 1 - 1
config.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.27.1
-// 	protoc        v3.15.6
+// 	protoc        v3.17.3
 // source: config.proto
 
 package core

+ 1 - 0
context.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package core

+ 1 - 0
functions.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package core

+ 25 - 1
go.mod

@@ -1,6 +1,6 @@
 module github.com/v2fly/v2ray-core/v4
 
-go 1.16
+go 1.17
 
 require (
 	github.com/golang/mock v1.6.0
@@ -25,3 +25,27 @@ require (
 	google.golang.org/protobuf v1.27.1
 	h12.io/socks v1.0.3
 )
+
+require (
+	github.com/cheekybits/genny v1.0.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/dgryski/go-metro v0.0.0-20200812162917-85c65e2d0165 // indirect
+	github.com/ebfe/bcrypt_pbkdf v0.0.0-20140212075826-3c8d2dcb253a // indirect
+	github.com/fsnotify/fsnotify v1.4.9 // indirect
+	github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
+	github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 // indirect
+	github.com/marten-seemann/qtls-go1-16 v0.1.4 // indirect
+	github.com/marten-seemann/qtls-go1-17 v0.1.0 // indirect
+	github.com/nxadm/tail v1.4.8 // indirect
+	github.com/onsi/ginkgo v1.16.4 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 // indirect
+	github.com/xtaci/smux v1.5.15 // indirect
+	golang.org/x/mod v0.4.2 // indirect
+	golang.org/x/text v0.3.6 // indirect
+	golang.org/x/tools v0.1.1 // indirect
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+	google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
+	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c // indirect
+)

+ 0 - 1
go.sum

@@ -462,7 +462,6 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069 h1:siQdpVirKtzPhKl3lZWozZraCFObP8S1v6PRp0bLrtU=
 golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=

+ 1 - 0
main/main_test.go

@@ -1,3 +1,4 @@
+//go:build coveragemain
 // +build coveragemain
 
 package main

+ 1 - 0
proxy/blackhole/blackhole.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 // Package blackhole is an outbound handler that blocks all connections.

+ 1 - 1
proxy/blackhole/config.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.27.1
-// 	protoc        v3.15.6
+// 	protoc        v3.17.3
 // source: proxy/blackhole/config.proto
 
 package blackhole

+ 1 - 1
proxy/dns/config.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.27.1
-// 	protoc        v3.15.6
+// 	protoc        v3.17.3
 // source: proxy/dns/config.proto
 
 package dns

+ 1 - 0
proxy/dns/dns.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package dns

+ 1 - 1
proxy/dokodemo/config.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.27.1
-// 	protoc        v3.15.6
+// 	protoc        v3.17.3
 // source: proxy/dokodemo/config.proto
 
 package dokodemo

+ 1 - 0
proxy/dokodemo/dokodemo.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package dokodemo

+ 1 - 1
proxy/freedom/config.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.27.1
-// 	protoc        v3.15.6
+// 	protoc        v3.17.3
 // source: proxy/freedom/config.proto
 
 package freedom

+ 1 - 0
proxy/freedom/freedom.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package freedom

+ 1 - 0
proxy/http/client.go

@@ -1,3 +1,4 @@
+//go:build !confonly
 // +build !confonly
 
 package http

Some files were not shown because too many files changed in this diff