Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix go modules implementation to work with versions > v6 #36

Closed
wants to merge 3 commits into from
Closed

Fix go modules implementation to work with versions > v6 #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d619b76
update module definition to proper path
SinisterMinister Oct 5, 2019
716b8c2
Update imports to proper module path
SinisterMinister Oct 5, 2019
d518fb9
update imports of upstream packages
SinisterMinister Oct 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ package main
import (
"errors"

"github.com/go-playground/log"
"github.com/go-playground/log/handlers/console"
"github.com/go-playground/log/v7"
"github.com/go-playground/log/v7/handlers/console"
)

func main() {
Expand Down Expand Up @@ -96,7 +96,7 @@ import (
"bytes"
"fmt"

"github.com/go-playground/log"
"github.com/go-playground/log/v7"
)

// CustomHandler is your custom handler
Expand Down
4 changes: 2 additions & 2 deletions _examples/basic/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package main

import (
"github.com/go-playground/errors"
"github.com/go-playground/log"
"github.com/go-playground/errors/v5"
"github.com/go-playground/log/v7"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion _examples/custom-handler/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"bytes"
"fmt"

"github.com/go-playground/log"
"github.com/go-playground/log/v7"
)

// CustomHandler is your custom handler
Expand Down
6 changes: 3 additions & 3 deletions _examples/handler/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package main

import (
"github.com/go-playground/errors"
"github.com/go-playground/errors/v5"

"github.com/go-playground/log"
"github.com/go-playground/log/handlers/console"
"github.com/go-playground/log/v7"
"github.com/go-playground/log/v7/handlers/console"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions benchmarks/benchmark_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"testing"
"time"

"github.com/go-playground/log"
"github.com/go-playground/log/handlers/console"
"github.com/go-playground/log/v7"
"github.com/go-playground/log/v7/handlers/console"
)

var errExample = errors.New("fail")
Expand Down
2 changes: 1 addition & 1 deletion benchmarks_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
stderr "errors"
"testing"

"github.com/go-playground/errors"
"github.com/go-playground/errors/v5"
)

func BenchmarkWithError(b *testing.B) {
Expand Down
4 changes: 2 additions & 2 deletions errors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package log
import (
"fmt"

"github.com/go-playground/errors"
runtimeext "github.com/go-playground/pkg/runtime"
"github.com/go-playground/errors/v5"
runtimeext "github.com/go-playground/pkg/v3/runtime"
)

func errorsWithError(e Entry, err error) Entry {
Expand Down
2 changes: 1 addition & 1 deletion errors/pkg/pkg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strings"

"github.com/go-playground/log"
"github.com/go-playground/log/v7"
"github.com/pkg/errors"
)

Expand Down
2 changes: 1 addition & 1 deletion errors/pkg/pkg_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"
"testing"

"github.com/go-playground/log"
"github.com/go-playground/log/v7"
"github.com/pkg/errors"
)

Expand Down
2 changes: 1 addition & 1 deletion errors/segmentio/segmentio.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strings"

"github.com/go-playground/log"
"github.com/go-playground/log/v7"

"github.com/segmentio/errors-go"
)
Expand Down
2 changes: 1 addition & 1 deletion errors/segmentio/segmentio_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"
"testing"

"github.com/go-playground/log"
"github.com/go-playground/log/v7"
"github.com/segmentio/errors-go"
)

Expand Down
6 changes: 3 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
module github.com/go-playground/log
module github.com/go-playground/log/v7

go 1.11

require (
github.com/RackSec/srslog v0.0.0-20180709174129-a4725f04ec91
github.com/go-playground/ansi v2.1.0+incompatible
github.com/go-playground/errors v0.0.0-20190511183022-b661b75d4162
github.com/go-playground/pkg v0.0.0-20190511145249-fa4bcb050f1d
github.com/go-playground/errors/v5 v5.0.0
github.com/go-playground/pkg/v3 v3.1.5
github.com/pkg/errors v0.8.1
github.com/segmentio/errors-go v1.0.0
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ github.com/go-playground/ansi v2.1.0+incompatible h1:f9ldskdk1seTFmYjbmPaYB+WYsD
github.com/go-playground/ansi v2.1.0+incompatible/go.mod h1:OCdnfTFO/GfFtp+ktUt+PhElbGOwyTRUuRUsA+Y5pSU=
github.com/go-playground/errors v0.0.0-20190511183022-b661b75d4162 h1:E0/Tcjy4E1wyBgwyb+ufYEzQaxnPXkBbs0nbfy9HNVw=
github.com/go-playground/errors v0.0.0-20190511183022-b661b75d4162/go.mod h1:V/gdJTQRLs5Bsu3bIcSmQbIRdQwXq+OajaRrGpCNEqY=
github.com/go-playground/errors v3.3.0+incompatible h1:w7qP6bdFXNmI86aV8VEfhXrGxoQWYHc/OX4Muw4FgW0=
github.com/go-playground/errors v3.3.0+incompatible/go.mod h1:n+RcthKmtLxDczVHKkhqiUSOGtTjvRl+HB4Gga0vWSI=
github.com/go-playground/form v3.1.4+incompatible/go.mod h1:lhcKXfTuhRtIZCIKUeJ0b5F207aeQCPbZU09ScKjwWg=
github.com/go-playground/pkg v0.0.0-20190511145249-fa4bcb050f1d h1:dLyXECWWFoQAp49e+ayPJyTcVAVOSAEmZ/QALeOuIfg=
github.com/go-playground/pkg v0.0.0-20190511145249-fa4bcb050f1d/go.mod h1:Wg1j+HqWLhhVIfYdaoOuBzdutBEVcqwvBxgFZRWbybk=
Expand Down
2 changes: 1 addition & 1 deletion handlers/console/console.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strconv"

"github.com/go-playground/ansi"
"github.com/go-playground/log"
"github.com/go-playground/log/v7"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion handlers/console/console_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"testing"
"time"

"github.com/go-playground/log"
"github.com/go-playground/log/v7"
)

// NOTES:
Expand Down
4 changes: 2 additions & 2 deletions handlers/console/doc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ simple console
import (
"errors"

"github.com/go-playground/log"
"github.com/go-playground/log/handlers/console"
"github.com/go-playground/log/v7"
"github.com/go-playground/log/v7/handlers/console"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions handlers/email/doc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ simple email
package main

import (
"github.com/go-playground/log"
"github.com/go-playground/log/handlers/email"
"github.com/go-playground/log/v7"
"github.com/go-playground/log/v7/handlers/email"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion handlers/email/email.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

gomail "gopkg.in/gomail.v2"

"github.com/go-playground/log"
"github.com/go-playground/log/v7"
)

// FormatFunc is the function that the workers use to create
Expand Down
2 changes: 1 addition & 1 deletion handlers/email/email_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

gomail "gopkg.in/gomail.v2"

"github.com/go-playground/log"
"github.com/go-playground/log/v7"
)

// NOTES:
Expand Down
4 changes: 2 additions & 2 deletions handlers/http/doc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ NOTE: you can use the HTTP handler as a base for creating other handlers
import (
stdhttp "net/http"

"github.com/go-playground/log"
"github.com/go-playground/log/handlers/http"
"github.com/go-playground/log/v7"
"github.com/go-playground/log/v7/handlers/http"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions handlers/http/hipchat/doc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ NOTE: "/notification" is added to the host url automatically.
package main

import (
"github.com/go-playground/log"
"github.com/go-playground/log/handlers/http/hipchat"
"github.com/go-playground/log/v7"
"github.com/go-playground/log/v7/handlers/http/hipchat"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions handlers/http/hipchat/hipchat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
stdhttp "net/http"
"strings"

"github.com/go-playground/log"
"github.com/go-playground/log/handlers/http"
"github.com/go-playground/log/v7"
"github.com/go-playground/log/v7/handlers/http"
)

// APIVersion specifies the HipChat API version to use
Expand Down
2 changes: 1 addition & 1 deletion handlers/http/hipchat/hipchat_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"
"testing"

"github.com/go-playground/log"
"github.com/go-playground/log/v7"
)

// NOTES:
Expand Down
2 changes: 1 addition & 1 deletion handlers/http/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strconv"
"sync"

"github.com/go-playground/log"
"github.com/go-playground/log/v7"
)

// FormatFunc is the function that the workers use to create
Expand Down
2 changes: 1 addition & 1 deletion handlers/http/http_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net/http/httptest"
"testing"

"github.com/go-playground/log"
"github.com/go-playground/log/v7"
)

// NOTES:
Expand Down
2 changes: 1 addition & 1 deletion handlers/json/json.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"io"
"sync"

"github.com/go-playground/log"
"github.com/go-playground/log/v7"
)

// Handler implementation.
Expand Down
2 changes: 1 addition & 1 deletion handlers/json/json_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"strings"
"testing"

"github.com/go-playground/log"
"github.com/go-playground/log/v7"
)

func TestJSONLogger(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions handlers/syslog/doc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ NOTE: syslog uses github.com/RackSec/srslog as the stdlib syslog
import (
stdsyslog "log/syslog"

"github.com/go-playground/log"
"github.com/go-playground/log/handlers/syslog"
"github.com/go-playground/log/v7"
"github.com/go-playground/log/v7/handlers/syslog"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion handlers/syslog/syslog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
syslog "github.com/RackSec/srslog"

"github.com/go-playground/ansi"
"github.com/go-playground/log"
"github.com/go-playground/log/v7"
)

// FormatFunc is the function that the workers use to create
Expand Down
2 changes: 1 addition & 1 deletion handlers/syslog/syslog_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"testing"
"time"

"github.com/go-playground/log"
"github.com/go-playground/log/v7"
)

// NOTES:
Expand Down
2 changes: 1 addition & 1 deletion log_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"testing"
"time"

"github.com/go-playground/errors"
"github.com/go-playground/errors/v5"
)

// NOTES:
Expand Down