Skip to content

Commit

Permalink
[#146]: Bump github.com/goccy/go-json from 0.9.1 to 0.9.3
Browse files Browse the repository at this point in the history
  • Loading branch information
rustatian authored Jan 17, 2022
2 parents 354a52e + ef8a7b0 commit 31d0aaa
Show file tree
Hide file tree
Showing 12 changed files with 84 additions and 165 deletions.
4 changes: 2 additions & 2 deletions activity/activity.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"time"

"github.com/google/uuid"
"github.com/spiral/errors"
"github.com/spiral/roadrunner/v2/utils"
"github.com/roadrunner-server/errors"
"github.com/roadrunner-server/sdk/v2/utils"
tActivity "github.com/spiral/sdk-go/activity"
temporalClient "github.com/spiral/sdk-go/client"
"github.com/spiral/sdk-go/converter"
Expand Down
2 changes: 1 addition & 1 deletion config.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package roadrunner_temporal //nolint:revive,stylecheck

import "github.com/spiral/roadrunner/v2/pool"
import "github.com/roadrunner-server/sdk/v2/pool"

const (
MetricsTypeSummary string = "summary"
Expand Down
38 changes: 24 additions & 14 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,8 @@ require (
github.com/google/uuid v1.3.0
github.com/json-iterator/go v1.1.12 // indirect
github.com/pborman/uuid v1.2.1
github.com/roadrunner-server/api/v2 v2.0.0-rc.1
// SPIRAL ========
github.com/spiral/endure v1.1.0
github.com/spiral/errors v1.0.12
github.com/spiral/goridge/v3 v3.2.7
github.com/spiral/roadrunner-plugins/v2 v2.7.1
github.com/spiral/roadrunner/v2 v2.7.1
github.com/roadrunner-server/api/v2 v2.0.0-rc.2
github.com/roadrunner-server/logger/v2 v2.0.0-rc.2
github.com/spiral/sdk-go v1.12.0
github.com/spiral/sdk-go/contrib/tally v0.0.0-20211210212330-614642034d01
// ===========
Expand All @@ -33,7 +28,7 @@ require (
github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a // indirect
github.com/fsnotify/fsnotify v1.5.1 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/goccy/go-json v0.9.1
github.com/goccy/go-json v0.9.3
github.com/gogo/googleapis v1.4.1 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/gogo/status v1.1.0 // indirect
Expand Down Expand Up @@ -62,7 +57,6 @@ require (
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/viper v1.10.1 // indirect
github.com/spiral/tcplisten v1.0.0 // indirect
github.com/stretchr/objx v0.3.0 // indirect
github.com/subosito/gotenv v1.2.0 // indirect
github.com/tklauser/go-sysconf v0.3.9 // indirect
Expand All @@ -74,16 +68,32 @@ require (
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/goleak v1.1.12 // indirect
go.uber.org/multierr v1.7.0 // indirect
golang.org/x/net v0.0.0-20220111093109-d55c255bac03 // indirect
golang.org/x/sys v0.0.0-20220111092808-5a964db01320 // indirect
golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d // indirect
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect
google.golang.org/genproto v0.0.0-20220112215332-a9c7c0acf9f2 // indirect
google.golang.org/genproto v0.0.0-20220114231437-d2e6a121cae0 // indirect
google.golang.org/grpc v1.43.0 // indirect
gopkg.in/ini.v1 v1.66.2 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
)

require golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
require (
github.com/roadrunner-server/config/v2 v2.0.0-rc.3
github.com/roadrunner-server/endure v1.2.1
github.com/roadrunner-server/errors v1.1.0
github.com/roadrunner-server/goridge/v3 v3.3.0
github.com/roadrunner-server/informer/v2 v2.0.0-rc.2
github.com/roadrunner-server/resetter/v2 v2.0.0-rc.1
github.com/roadrunner-server/rpc/v2 v2.0.0-rc.2
github.com/roadrunner-server/sdk/v2 v2.0.0-rc.1
github.com/roadrunner-server/server/v2 v2.0.0-rc.1
)

require (
github.com/roadrunner-server/api v0.0.0-20220109175659-238f1b160729 // indirect
github.com/roadrunner-server/tcplisten v1.1.0 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
)
165 changes: 37 additions & 128 deletions go.sum

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions internal/codec/proto/proto.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"github.com/fatih/color"
"github.com/goccy/go-json"
"github.com/google/uuid"
"github.com/spiral/errors"
"github.com/spiral/roadrunner/v2/payload"
"github.com/spiral/roadrunner/v2/pool"
"github.com/spiral/roadrunner/v2/utils"
"github.com/roadrunner-server/errors"
"github.com/roadrunner-server/sdk/v2/payload"
"github.com/roadrunner-server/sdk/v2/pool"
"github.com/roadrunner-server/sdk/v2/utils"
temporalClient "github.com/spiral/sdk-go/client"
"github.com/spiral/sdk-go/converter"
"github.com/spiral/sdk-go/internalbindings"
Expand Down
2 changes: 1 addition & 1 deletion internal/protocol.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package internal
import (
"time"

"github.com/spiral/errors"
"github.com/roadrunner-server/errors"
"github.com/spiral/sdk-go/activity"
bindings "github.com/spiral/sdk-go/internalbindings"
"github.com/spiral/sdk-go/workflow"
Expand Down
6 changes: 3 additions & 3 deletions plugin.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (

"github.com/roadrunner-server/api/v2/plugins/config"
"github.com/roadrunner-server/api/v2/plugins/server"
"github.com/spiral/errors"
rrPool "github.com/spiral/roadrunner/v2/pool"
"github.com/spiral/roadrunner/v2/state/process"
"github.com/roadrunner-server/errors"
rrPool "github.com/roadrunner-server/sdk/v2/pool"
"github.com/roadrunner-server/sdk/v2/state/process"
temporalClient "github.com/spiral/sdk-go/client"
"github.com/spiral/sdk-go/contrib/tally"
"github.com/spiral/sdk-go/converter"
Expand Down
4 changes: 2 additions & 2 deletions tests/disaster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"testing"
"time"

goridgeRpc "github.com/spiral/goridge/v3/pkg/rpc"
"github.com/spiral/roadrunner/v2/state/process"
goridgeRpc "github.com/roadrunner-server/goridge/v3/pkg/rpc"
"github.com/roadrunner-server/sdk/v2/state/process"
"github.com/spiral/sdk-go/client"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion tests/hp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"testing"
"time"

goridgeRpc "github.com/spiral/goridge/v3/pkg/rpc"
goridgeRpc "github.com/roadrunner-server/goridge/v3/pkg/rpc"
"github.com/stretchr/testify/require"
"go.temporal.io/api/common/v1"

Expand Down
14 changes: 7 additions & 7 deletions tests/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ import (
"time"

"github.com/roadrunner-server/api/v2/plugins/config"
endure "github.com/spiral/endure/pkg/container"
configImpl "github.com/spiral/roadrunner-plugins/v2/config"
"github.com/spiral/roadrunner-plugins/v2/informer"
"github.com/spiral/roadrunner-plugins/v2/logger"
"github.com/spiral/roadrunner-plugins/v2/resetter"
"github.com/spiral/roadrunner-plugins/v2/rpc"
"github.com/spiral/roadrunner-plugins/v2/server"
configImpl "github.com/roadrunner-server/config/v2"
endure "github.com/roadrunner-server/endure/pkg/container"
"github.com/roadrunner-server/informer/v2"
"github.com/roadrunner-server/logger/v2"
"github.com/roadrunner-server/resetter/v2"
"github.com/roadrunner-server/rpc/v2"
"github.com/roadrunner-server/server/v2"
temporalClient "github.com/spiral/sdk-go/client"
"github.com/spiral/sdk-go/converter"
"github.com/stretchr/testify/assert"
Expand Down
2 changes: 1 addition & 1 deletion workflow/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"sync/atomic"
"time"

"github.com/spiral/errors"
"github.com/roadrunner-server/errors"
bindings "github.com/spiral/sdk-go/internalbindings"
"github.com/spiral/sdk-go/workflow"
"github.com/temporalio/roadrunner-temporal/internal"
Expand Down
2 changes: 1 addition & 1 deletion workflow/workflow.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"time"

"github.com/google/uuid"
"github.com/spiral/errors"
"github.com/roadrunner-server/errors"
temporalClient "github.com/spiral/sdk-go/client"
bindings "github.com/spiral/sdk-go/internalbindings"
"github.com/spiral/sdk-go/worker"
Expand Down

0 comments on commit 31d0aaa

Please sign in to comment.