From 5016f529af6189ab5941b97a8467bf7048e9b80e Mon Sep 17 00:00:00 2001 From: Skyxim Date: Sat, 14 May 2022 23:36:19 +0800 Subject: [PATCH] revert: yaml v2 --- adapter/provider/provider.go | 2 +- config/config.go | 2 +- go.mod | 3 ++- rule/provider/provider.go | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/adapter/provider/provider.go b/adapter/provider/provider.go index b49c122c..1a3850a6 100644 --- a/adapter/provider/provider.go +++ b/adapter/provider/provider.go @@ -13,7 +13,7 @@ import ( C "github.com/Dreamacro/clash/constant" types "github.com/Dreamacro/clash/constant/provider" - "gopkg.in/yaml.v3" + "gopkg.in/yaml.v2" ) const ( diff --git a/config/config.go b/config/config.go index 9a315577..655ac832 100644 --- a/config/config.go +++ b/config/config.go @@ -36,7 +36,7 @@ import ( "github.com/Dreamacro/clash/log" T "github.com/Dreamacro/clash/tunnel" - "gopkg.in/yaml.v3" + "gopkg.in/yaml.v2" ) // General config diff --git a/go.mod b/go.mod index 8def7c57..ad3de92a 100644 --- a/go.mod +++ b/go.mod @@ -29,7 +29,7 @@ require ( golang.zx2c4.com/wireguard v0.0.0-20220407013110-ef5c587f782d golang.zx2c4.com/wireguard/windows v0.5.4-0.20220317000008-6432784c2469 google.golang.org/protobuf v1.28.0 - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b + gopkg.in/yaml.v2 v2.4.0 gvisor.dev/gvisor v0.0.0-20220506231117-8ef340c14150 ) @@ -54,6 +54,7 @@ require ( golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect golang.zx2c4.com/wintun v0.0.0-20211104114900-415007cec224 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect ) replace golang.zx2c4.com/wintun v0.0.0-20211104114900-415007cec224 => github.com/MetaCubeX/wintun-go v0.0.0-20220319102620-bbc5e6b2015e diff --git a/rule/provider/provider.go b/rule/provider/provider.go index a92df718..f2a4547d 100644 --- a/rule/provider/provider.go +++ b/rule/provider/provider.go @@ -4,7 +4,7 @@ import ( "encoding/json" C "github.com/Dreamacro/clash/constant" P "github.com/Dreamacro/clash/constant/provider" - "gopkg.in/yaml.v3" + "gopkg.in/yaml.v2" "runtime" "time" )