From b1badeef6333123d32d5974dd5325e87c2e5532b Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Fri, 5 May 2023 17:40:52 +0300 Subject: [PATCH] move to micro v4 Signed-off-by: Vasiliy Tolstov --- env.go | 6 +++--- env_test.go | 4 ++-- go.mod | 8 ++++---- go.sum | 11 ++++------- watcher.go | 6 +++--- 5 files changed, 16 insertions(+), 19 deletions(-) diff --git a/env.go b/env.go index c2b7514..ea6ccb6 100644 --- a/env.go +++ b/env.go @@ -1,4 +1,4 @@ -package env // import "go.unistack.org/micro-config-env/v3" +package env // import "go.unistack.org/micro-config-env/v4" import ( "context" @@ -9,8 +9,8 @@ import ( "strings" "github.com/imdario/mergo" - "go.unistack.org/micro/v3/config" - rutil "go.unistack.org/micro/v3/util/reflect" + "go.unistack.org/micro/v4/config" + rutil "go.unistack.org/micro/v4/util/reflect" ) var DefaultStructTag = "env" diff --git a/env_test.go b/env_test.go index 63d4afd..674bca8 100644 --- a/env_test.go +++ b/env_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "go.unistack.org/micro/v3/config" - rutil "go.unistack.org/micro/v3/util/reflect" + "go.unistack.org/micro/v4/config" + rutil "go.unistack.org/micro/v4/util/reflect" ) type Config struct { diff --git a/go.mod b/go.mod index 9e308ad..8adb537 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ -module go.unistack.org/micro-config-env/v3 +module go.unistack.org/micro-config-env/v4 -go 1.18 +go 1.20 require ( - github.com/imdario/mergo v0.3.13 - go.unistack.org/micro/v3 v3.10.16 + github.com/imdario/mergo v0.3.14 + go.unistack.org/micro/v4 v4.0.1 ) diff --git a/go.sum b/go.sum index 8ff5437..6ac6217 100644 --- a/go.sum +++ b/go.sum @@ -1,10 +1,7 @@ -github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= -github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= -github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= -github.com/silas/dag v0.0.0-20211117232152-9d50aa809f35/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I= -go.unistack.org/micro/v3 v3.10.16 h1:2er/SKKYbV60M+UuJM4eYCF0MZYAIq/yNUrAbTfgq8Q= -go.unistack.org/micro/v3 v3.10.16/go.mod h1:uMAc0U/x7dmtICCrblGf0ZLgYegu3VwQAquu+OFCw1Q= +github.com/imdario/mergo v0.3.14 h1:fOqeC1+nCuuk6PKQdg9YmosXX7Y7mHX6R/0ZldI9iHo= +github.com/imdario/mergo v0.3.14/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= +go.unistack.org/micro/v4 v4.0.1 h1:xo1IxbVfgh8i0eY0VeYa3cbb13u5n/Mxnp3FOgWD4Jo= +go.unistack.org/micro/v4 v4.0.1/go.mod h1:p/J5UcSJjfHsWGT31uKoghQ5rUQZzQJBAFy+Z4+ZVMs= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/watcher.go b/watcher.go index 268dad1..b097183 100644 --- a/watcher.go +++ b/watcher.go @@ -3,9 +3,9 @@ package env import ( "reflect" - "go.unistack.org/micro/v3/config" - "go.unistack.org/micro/v3/util/jitter" - rutil "go.unistack.org/micro/v3/util/reflect" + "go.unistack.org/micro/v4/config" + "go.unistack.org/micro/v4/util/jitter" + rutil "go.unistack.org/micro/v4/util/reflect" ) type envWatcher struct {