v3 refactor (#1868)
* Move to v3 Co-authored-by: Ben Toogood <bentoogood@gmail.com>
This commit is contained in:
@@ -5,10 +5,10 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/imdario/mergo"
|
||||
"github.com/micro/go-micro/v2/config/encoder"
|
||||
"github.com/micro/go-micro/v2/config/encoder/json"
|
||||
"github.com/micro/go-micro/v2/config/reader"
|
||||
"github.com/micro/go-micro/v2/config/source"
|
||||
"github.com/micro/go-micro/v3/config/encoder"
|
||||
"github.com/micro/go-micro/v3/config/encoder/json"
|
||||
"github.com/micro/go-micro/v3/config/reader"
|
||||
"github.com/micro/go-micro/v3/config/source"
|
||||
)
|
||||
|
||||
type jsonReader struct {
|
||||
|
@@ -3,8 +3,8 @@ package json
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/micro/go-micro/v2/config/reader"
|
||||
"github.com/micro/go-micro/v2/config/source"
|
||||
"github.com/micro/go-micro/v3/config/reader"
|
||||
"github.com/micro/go-micro/v3/config/source"
|
||||
)
|
||||
|
||||
func TestReader(t *testing.T) {
|
||||
|
@@ -8,8 +8,8 @@ import (
|
||||
"time"
|
||||
|
||||
simple "github.com/bitly/go-simplejson"
|
||||
"github.com/micro/go-micro/v2/config/reader"
|
||||
"github.com/micro/go-micro/v2/config/source"
|
||||
"github.com/micro/go-micro/v3/config/reader"
|
||||
"github.com/micro/go-micro/v3/config/source"
|
||||
)
|
||||
|
||||
type jsonValues struct {
|
||||
|
@@ -4,8 +4,8 @@ import (
|
||||
"reflect"
|
||||
"testing"
|
||||
|
||||
"github.com/micro/go-micro/v2/config/reader"
|
||||
"github.com/micro/go-micro/v2/config/source"
|
||||
"github.com/micro/go-micro/v3/config/reader"
|
||||
"github.com/micro/go-micro/v3/config/source"
|
||||
)
|
||||
|
||||
func TestValues(t *testing.T) {
|
||||
|
@@ -1,12 +1,12 @@
|
||||
package reader
|
||||
|
||||
import (
|
||||
"github.com/micro/go-micro/v2/config/encoder"
|
||||
"github.com/micro/go-micro/v2/config/encoder/hcl"
|
||||
"github.com/micro/go-micro/v2/config/encoder/json"
|
||||
"github.com/micro/go-micro/v2/config/encoder/toml"
|
||||
"github.com/micro/go-micro/v2/config/encoder/xml"
|
||||
"github.com/micro/go-micro/v2/config/encoder/yaml"
|
||||
"github.com/micro/go-micro/v3/config/encoder"
|
||||
"github.com/micro/go-micro/v3/config/encoder/hcl"
|
||||
"github.com/micro/go-micro/v3/config/encoder/json"
|
||||
"github.com/micro/go-micro/v3/config/encoder/toml"
|
||||
"github.com/micro/go-micro/v3/config/encoder/xml"
|
||||
"github.com/micro/go-micro/v3/config/encoder/yaml"
|
||||
)
|
||||
|
||||
type Options struct {
|
||||
|
@@ -4,7 +4,7 @@ package reader
|
||||
import (
|
||||
"time"
|
||||
|
||||
"github.com/micro/go-micro/v2/config/source"
|
||||
"github.com/micro/go-micro/v3/config/source"
|
||||
)
|
||||
|
||||
// Reader is an interface for merging changesets
|
||||
|
Reference in New Issue
Block a user