From 36c52990ee50ae676a541f661bcb359ba3b9847f Mon Sep 17 00:00:00 2001
From: Evstigneev Denis <danteevstigneev@yandex.ru>
Date: Mon, 3 Mar 2025 09:44:35 +0300
Subject: [PATCH] resolve conflict

---
 codec.go      |  2 +-
 codec_test.go |  5 +++--
 go.mod        |  2 ++
 grpc.go       | 10 +++++-----
 stream.go     |  1 +
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/codec.go b/codec.go
index 7111807..6181259 100644
--- a/codec.go
+++ b/codec.go
@@ -1,7 +1,7 @@
 package grpc
 
 import (
-	"go.unistack.org/micro/v3/codec"
+	"go.unistack.org/micro/v4/codec"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/encoding"
 )
diff --git a/codec_test.go b/codec_test.go
index 54b9e90..d08644f 100644
--- a/codec_test.go
+++ b/codec_test.go
@@ -2,9 +2,10 @@ package grpc
 
 import (
 	"context"
-	"go.unistack.org/micro/v3/codec"
-	gmetadata "google.golang.org/grpc/metadata"
 	"testing"
+
+	"go.unistack.org/micro/v4/codec"
+	gmetadata "google.golang.org/grpc/metadata"
 )
 
 type mockStream struct {
diff --git a/go.mod b/go.mod
index fd2d73a..a6fc461 100644
--- a/go.mod
+++ b/go.mod
@@ -2,6 +2,8 @@ module go.unistack.org/micro-client-grpc/v4
 
 go 1.23.0
 
+toolchain go1.23.3
+
 require (
 	go.unistack.org/micro/v4 v4.1.2
 	google.golang.org/grpc v1.70.0
diff --git a/grpc.go b/grpc.go
index a5aa9e5..4e09370 100644
--- a/grpc.go
+++ b/grpc.go
@@ -5,11 +5,6 @@ import (
 	"context"
 	"crypto/tls"
 	"fmt"
-	"go.unistack.org/micro/v4/options"
-	"go.unistack.org/micro/v4/semconv"
-	"go.unistack.org/micro/v4/tracer"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
 	"net"
 	"reflect"
 	"strconv"
@@ -21,12 +16,17 @@ import (
 	"go.unistack.org/micro/v4/codec"
 	"go.unistack.org/micro/v4/errors"
 	"go.unistack.org/micro/v4/metadata"
+	"go.unistack.org/micro/v4/options"
 	"go.unistack.org/micro/v4/selector"
+	"go.unistack.org/micro/v4/semconv"
+	"go.unistack.org/micro/v4/tracer"
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/grpc/encoding"
 	gmetadata "google.golang.org/grpc/metadata"
+	"google.golang.org/grpc/status"
 )
 
 const (
diff --git a/stream.go b/stream.go
index 445a8f7..b591017 100644
--- a/stream.go
+++ b/stream.go
@@ -6,6 +6,7 @@ import (
 	"sync"
 
 	"go.unistack.org/micro/v4/client"
+	"go.unistack.org/micro/v4/tracer"
 	"google.golang.org/grpc"
 )