Skip to content

Commit

Permalink
Upgrade dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@erickskrauch
erickskrauch committed Dec 14, 2023
1 parent 1543e98 commit d678f61
Show file tree
Hide file tree
Showing 15 changed files with 105 additions and 88 deletions.
2 changes: 1 addition & 1 deletion api/mojang/mojang_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"net/http"
"testing"

"gopkg.in/h2non/gock.v1"
"github.com/h2non/gock"

testify "github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/root.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"os"
"strings"

. "github.com/goava/di"
. "github.com/defval/di"
"github.com/spf13/cobra"
"github.com/spf13/viper"

Expand Down
2 changes: 1 addition & 1 deletion di/config.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package di

import (
"github.com/goava/di"
"github.com/defval/di"
"github.com/spf13/viper"
)

Expand Down
2 changes: 1 addition & 1 deletion di/db.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"path"
"time"

"github.com/goava/di"
"github.com/defval/di"
"github.com/spf13/viper"

"github.com/elyby/chrly/db/fs"
Expand Down
2 changes: 1 addition & 1 deletion di/di.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package di

import "github.com/goava/di"
import "github.com/defval/di"

func New() (*di.Container, error) {
container, err := di.New(
Expand Down
4 changes: 2 additions & 2 deletions di/dispatcher.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package di

import (
"github.com/goava/di"
"github.com/defval/di"
"github.com/mono83/slf"

d "github.com/elyby/chrly/dispatcher"
Expand Down Expand Up @@ -30,7 +30,7 @@ func enableEventsHandlers(
logger slf.Logger,
statsReporter slf.StatsReporter,
) {
// TODO: use idea from https://github.com/goava/di/issues/10#issuecomment-615869852
// TODO: use idea from https://github.com/defval/di/issues/10#issuecomment-615869852
(&eventsubscribers.Logger{Logger: logger}).ConfigureWithDispatcher(dispatcher)
(&eventsubscribers.StatsReporter{StatsReporter: statsReporter}).ConfigureWithDispatcher(dispatcher)
}
6 changes: 3 additions & 3 deletions di/handlers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"net/http"
"strings"

"github.com/etherlabsio/healthcheck"
"github.com/goava/di"
"github.com/defval/di"
"github.com/etherlabsio/healthcheck/v2"
"github.com/gorilla/mux"
"github.com/spf13/viper"

Expand Down Expand Up @@ -82,7 +82,7 @@ func newHandlerFactory(
// Resolve health checkers last, because all the services required by the application
// must first be initialized and each of them can publish its own checkers
var healthCheckers []*namedHealthChecker
if container.Has(&healthCheckers) {
if has, _ := container.Has(&healthCheckers); has {
if err := container.Resolve(&healthCheckers); err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion di/logger.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package di
import (
"os"

"github.com/defval/di"
"github.com/getsentry/raven-go"
"github.com/goava/di"
"github.com/mono83/slf"
"github.com/mono83/slf/rays"
"github.com/mono83/slf/recievers/sentry"
Expand Down
2 changes: 1 addition & 1 deletion di/mojang_textures.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net/url"
"time"

"github.com/goava/di"
"github.com/defval/di"
"github.com/spf13/viper"

"github.com/elyby/chrly/api/mojang"
Expand Down
2 changes: 1 addition & 1 deletion di/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"runtime/debug"
"time"

"github.com/defval/di"
"github.com/getsentry/raven-go"
"github.com/goava/di"
"github.com/spf13/viper"

. "github.com/elyby/chrly/http"
Expand Down
2 changes: 1 addition & 1 deletion di/signer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
. "github.com/elyby/chrly/signer"
"strings"

"github.com/goava/di"
"github.com/defval/di"
"github.com/spf13/viper"
)

Expand Down
2 changes: 1 addition & 1 deletion eventsubscribers/health_checkers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"sync"
"time"

"github.com/etherlabsio/healthcheck"
"github.com/etherlabsio/healthcheck/v2"

"github.com/elyby/chrly/api/mojang"
)
Expand Down
46 changes: 25 additions & 21 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,45 +8,49 @@ replace github.com/asaskevich/EventBus v0.0.0-20200330115301-33b3bc6a7ddc => git
require (
github.com/SermoDigital/jose v0.9.2-0.20161205224733-f6df55f235c2
github.com/asaskevich/EventBus v0.0.0-20200330115301-33b3bc6a7ddc
github.com/etherlabsio/healthcheck v0.0.0-20191224061800-dd3d2fd8c3f6
github.com/defval/di v1.12.0
github.com/etherlabsio/healthcheck/v2 v2.0.0
github.com/getsentry/raven-go v0.2.1-0.20190419175539-919484f041ea
github.com/goava/di v1.1.1-0.20200420103225-1eb6eb721bf0
github.com/gorilla/mux v1.7.1
github.com/gorilla/mux v1.8.1
github.com/mediocregopher/radix.v2 v0.0.0-20181115013041-b67df6e626f9
github.com/mono83/slf v0.0.0-20170919161409-79153e9636db
github.com/spf13/cobra v0.0.3
github.com/spf13/viper v1.3.2
github.com/thedevsaddam/govalidator v1.9.6
github.com/spf13/cobra v1.8.0
github.com/spf13/viper v1.18.1
github.com/thedevsaddam/govalidator v1.9.10
)

// Dev dependencies
require (
github.com/h2non/gock v1.2.0
github.com/stretchr/testify v1.8.4
gopkg.in/h2non/gock.v1 v1.0.15
)

require (
github.com/BurntSushi/toml v1.3.2 // indirect
github.com/certifi/gocertifi v0.0.0-20210507211836-431795d63e8d // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/fsnotify/fsnotify v1.4.7 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/levenlabs/golib v0.0.0-20180911183212-0f8974794783 // indirect
github.com/magiconair/properties v1.8.0 // indirect
github.com/mitchellh/mapstructure v1.1.2 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mono83/udpwriter v1.0.2 // indirect
github.com/oschwald/geoip2-golang v1.9.0 // indirect
github.com/pelletier/go-toml v1.2.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/spf13/afero v1.1.2 // indirect
github.com/spf13/cast v1.3.0 // indirect
github.com/spf13/jwalterweatherman v1.0.0 // indirect
github.com/spf13/pflag v1.0.3 // indirect
github.com/pelletier/go-toml/v2 v2.1.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/objx v0.5.0 // indirect
golang.org/x/sys v0.9.0 // indirect
golang.org/x/text v0.3.0 // indirect
gopkg.in/yaml.v2 v2.2.2 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/text v0.14.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit d678f61

Please sign in to comment.