Skip to content

Commit 7389fd3

Browse files
authored
Merge pull request #172 from wallyworld/loggo-v2
#172 Update the juju/loggo dependency to v2
2 parents d0b20a6 + 7fe3b68 commit 7389fd3

8 files changed

Lines changed: 20 additions & 145 deletions

File tree

checkers/log.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"regexp"
99
"strings"
1010

11-
"github.com/juju/loggo"
11+
"github.com/juju/loggo/v2"
1212
gc "gopkg.in/check.v1"
1313
)
1414

checkers/log_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
package checkers_test
55

66
import (
7-
"github.com/juju/loggo"
7+
"github.com/juju/loggo/v2"
88
gc "gopkg.in/check.v1"
99

1010
jc "github.com/juju/testing/checkers"

go.mod

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
11
module github.com/juju/testing
22

3-
go 1.19
3+
go 1.21
4+
5+
toolchain go1.21.6
46

57
require (
68
github.com/juju/errors v1.0.0
7-
github.com/juju/loggo v1.0.0
8-
github.com/juju/utils/v3 v3.0.0
9+
github.com/juju/loggo/v2 v2.0.0
10+
github.com/juju/utils/v3 v3.1.0
911
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
1012
gopkg.in/yaml.v2 v2.4.0
1113
)
1214

1315
require (
1416
github.com/juju/clock v1.0.2 // indirect
17+
github.com/juju/loggo v0.0.0-20210728185423-eebad3a902c4 // indirect
1518
github.com/kr/pretty v0.3.1 // indirect
1619
github.com/kr/text v0.2.0 // indirect
1720
github.com/rogpeppe/go-internal v1.9.0 // indirect
1821
golang.org/x/crypto v0.3.0 // indirect
19-
golang.org/x/net v0.2.0 // indirect
22+
golang.org/x/net v0.7.0 // indirect
2023
)

go.sum

Lines changed: 6 additions & 134 deletions
Large diffs are not rendered by default.

log.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"os"
1010
"path/filepath"
1111

12-
"github.com/juju/loggo"
12+
"github.com/juju/loggo/v2"
1313
gc "gopkg.in/check.v1"
1414
)
1515

log_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package testing
66
import (
77
gc "gopkg.in/check.v1"
88

9-
"github.com/juju/loggo"
9+
"github.com/juju/loggo/v2"
1010
)
1111

1212
type logSuite struct{}

mock_example_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ package testing_test
22

33
import (
44
"fmt"
5-
65
"log"
76

8-
"github.com/juju/loggo"
7+
"github.com/juju/loggo/v2"
8+
99
"github.com/juju/testing"
1010
)
1111

mocker.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"reflect"
55
"sync"
66

7-
"github.com/juju/loggo"
7+
"github.com/juju/loggo/v2"
88
)
99

1010
// NewCallMocker returns a CallMocker which will log calls and results

0 commit comments

Comments
 (0)