From f5e59c10e1921771745d20c9d3cc4046ef7715e7 Mon Sep 17 00:00:00 2001 From: "Gerasimos (Makis) Maropoulos" Date: Mon, 4 May 2020 20:23:15 +0300 Subject: [PATCH] update go.mod deps Former-commit-id: 91a0ab6a8cb35bf9143cee0447a6f72ca8a09333 --- _examples/i18n/main.go | 4 +++- _examples/mvc/grpc-compatible/main.go | 4 +++- go.mod | 8 ++++---- sessions/sessiondb/badger/database.go | 9 +-------- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/_examples/i18n/main.go b/_examples/i18n/main.go index 11b15d4c..e0a859b4 100644 --- a/_examples/i18n/main.go +++ b/_examples/i18n/main.go @@ -23,7 +23,9 @@ func newApp() *iris.Application { // Set to false to disallow path (local) redirects, // see https://github.com/kataras/iris/issues/1369. // app.I18n.PathRedirect = true - // See app.I18n.ExtractFunc to change the way a language is extracted from a request. + // + // See `app.I18n.ExtractFunc = func(ctx iris.Context) string` or + // `ctx.SetLanguage(langCode string)` to change the extracted language from a request. app.Get("/", func(ctx iris.Context) { hi := ctx.Tr("hi", "iris") diff --git a/_examples/mvc/grpc-compatible/main.go b/_examples/mvc/grpc-compatible/main.go index 0d00e0fb..de9af996 100644 --- a/_examples/mvc/grpc-compatible/main.go +++ b/_examples/mvc/grpc-compatible/main.go @@ -44,7 +44,9 @@ func newApp() *iris.Application { // serviceName := pb.File_helloworld_proto.Services().Get(0).FullName() - // Register MVC application controller. + // Register MVC application controller for gRPC services. + // You can bind as many mvc gRpc services in the same Party or app, + // as the ServiceName differs. mvc.New(app).Handle(ctrl, mvc.GRPC{ Server: grpcServer, // Required. ServiceName: "helloworld.Greeter", // Required. diff --git a/go.mod b/go.mod index 78c8330b..9b951252 100644 --- a/go.mod +++ b/go.mod @@ -7,12 +7,12 @@ require ( github.com/CloudyKit/jet/v3 v3.0.0 github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398 github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible - github.com/dgraph-io/badger v1.6.1 + github.com/dgraph-io/badger/v2 v2.0.3 github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385 github.com/fatih/structs v1.1.0 github.com/gavv/httpexpect v2.0.0+incompatible github.com/golang/protobuf v1.4.0 - github.com/gomodule/redigo v1.7.1-0.20190724094224-574c33c3df38 + github.com/gomodule/redigo v1.8.0 github.com/hashicorp/go-version v1.2.0 github.com/iris-contrib/blackfriday v2.0.0+incompatible github.com/iris-contrib/go.uuid v2.0.0+incompatible @@ -31,9 +31,9 @@ require ( github.com/schollz/closestmatch v2.1.0+incompatible github.com/vmihailenco/msgpack/v5 v5.0.0-alpha.2 go.etcd.io/bbolt v1.3.4 - golang.org/x/crypto v0.0.0-20200427165652-729f1e841bcc + golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79 golang.org/x/text v0.3.2 golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 gopkg.in/ini.v1 v1.55.0 - gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c + gopkg.in/yaml.v3 v3.0.0-20200504163728-5308cda29e3d ) diff --git a/sessions/sessiondb/badger/database.go b/sessions/sessiondb/badger/database.go index 96509336..d77f76e8 100644 --- a/sessions/sessiondb/badger/database.go +++ b/sessions/sessiondb/badger/database.go @@ -10,17 +10,10 @@ import ( "github.com/kataras/iris/v12/sessions" - "github.com/dgraph-io/badger" + "github.com/dgraph-io/badger/v2" "github.com/kataras/golog" ) -/* - Badger has been updated to 1.6.0 - 2019-07-01 - which contains a lot of breaking changes - that are adapted correctly here. - 2019-07-14 -*/ - // DefaultFileMode used as the default database's "fileMode" // for creating the sessions directory path, opening and write the session file. var (