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

Update Go and some dependencies #7

Merged
merged 3 commits into from
Jun 3, 2024
Merged

Update Go and some dependencies #7

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
7bc79a7
Update Go and some dependencies
btlogy Jun 3, 2024
1df6bf5
Switch to new Mock location
btlogy Jun 3, 2024
0ebb980
Tidy to clean old Mock
btlogy Jun 3, 2024
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ accessor/mock_trac/accessor.go: accessor/trac/accessor.go
$(MOCKGEN) -destination=$@ $(ROOTPACKAGE)/$(<D) Accessor

mockdeps:
$(GOINSTALL) github.com/golang/mock/mockgen@v1.4.3
$(GOINSTALL) go.uber.org/mock/mockgen@v0.4.0

mockclean:
rm -rf mock_markdown accessor/mock_gitea accessor/mock_giteawiki accessor/mock_trac
Expand Down
49 changes: 34 additions & 15 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,42 @@
module github.com/stevejefferson/trac2gitea

go 1.14
go 1.19

require (
github.com/PuerkitoBio/goquery v1.5.1 // indirect
github.com/go-git/go-git v4.7.0+incompatible
github.com/go-ini/ini v1.57.0
github.com/golang/mock v1.4.3
github.com/jackc/pgx/v5 v5.3.1 // indirect
github.com/mattn/go-sqlite3 v1.14.16
github.com/go-ini/ini v1.67.0
github.com/mattn/go-sqlite3 v1.14.22
github.com/pkg/errors v0.8.1
github.com/smartystreets/goconvey v1.6.4 // indirect
github.com/spf13/pflag v1.0.5
golang.org/x/crypto v0.8.0 // indirect
gopkg.in/ini.v1 v1.57.0 // indirect
go.uber.org/mock v0.4.0
gopkg.in/src-d/go-git.v4 v4.13.1
gorm.io/driver/mysql v1.5.0 // indirect
gorm.io/driver/postgres v1.5.0 // indirect
gorm.io/driver/sqlite v1.5.0 // indirect
gorm.io/driver/sqlserver v1.4.3 // indirect
gorm.io/gorm v1.25.0 // indirect
gorm.io/driver/mysql v1.5.0
gorm.io/driver/postgres v1.5.0
gorm.io/driver/sqlite v1.5.0
gorm.io/driver/sqlserver v1.4.3
gorm.io/gorm v1.25.0
)

require (
github.com/emirpasic/gods v1.12.0 // indirect
github.com/go-sql-driver/mysql v1.7.0 // indirect
github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
github.com/golang-sql/sqlexp v0.1.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
github.com/jackc/pgx/v5 v5.3.1 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/jinzhu/now v1.1.5 // indirect
github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect
github.com/microsoft/go-mssqldb v0.21.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/sergi/go-diff v1.0.0 // indirect
github.com/src-d/gcfg v1.4.0 // indirect
github.com/xanzy/ssh-agent v0.2.1 // indirect
golang.org/x/crypto v0.8.0 // indirect
golang.org/x/net v0.9.0 // indirect
golang.org/x/sys v0.7.0 // indirect
golang.org/x/text v0.9.0 // indirect
gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
)
57 changes: 10 additions & 47 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion importer/label_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/stevejefferson/trac2gitea/accessor/gitea"
"github.com/stevejefferson/trac2gitea/accessor/trac"

"github.com/golang/mock/gomock"
"go.uber.org/mock/gomock"
)

var labelMap map[string]string
Expand Down
2 changes: 1 addition & 1 deletion importer/milestone_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package importer_test
import (
"testing"

"github.com/golang/mock/gomock"
"go.uber.org/mock/gomock"
"github.com/stevejefferson/trac2gitea/accessor/gitea"
"github.com/stevejefferson/trac2gitea/accessor/trac"
)
Expand Down
2 changes: 1 addition & 1 deletion importer/setup_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"runtime/debug"
"testing"

"github.com/golang/mock/gomock"
"go.uber.org/mock/gomock"
"github.com/stevejefferson/trac2gitea/accessor/mock_gitea"
"github.com/stevejefferson/trac2gitea/accessor/mock_trac"
"github.com/stevejefferson/trac2gitea/importer"
Expand Down
2 changes: 1 addition & 1 deletion importer/setup_ticketAttachment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strings"
"testing"

"github.com/golang/mock/gomock"
"go.uber.org/mock/gomock"
"github.com/stevejefferson/trac2gitea/accessor/gitea"
"github.com/stevejefferson/trac2gitea/accessor/trac"
)
Expand Down
2 changes: 1 addition & 1 deletion importer/setup_ticketChange_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package importer_test
import (
"testing"

"github.com/golang/mock/gomock"
"go.uber.org/mock/gomock"
"github.com/stevejefferson/trac2gitea/accessor/trac"
)

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

"github.com/golang/mock/gomock"
"go.uber.org/mock/gomock"
"github.com/stevejefferson/trac2gitea/accessor/gitea"
"github.com/stevejefferson/trac2gitea/accessor/trac"
)
Expand Down
2 changes: 1 addition & 1 deletion importer/setup_ticketLabel_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package importer_test
import (
"testing"

"github.com/golang/mock/gomock"
"go.uber.org/mock/gomock"
"github.com/stevejefferson/trac2gitea/accessor/gitea"
"github.com/stevejefferson/trac2gitea/accessor/trac"
)
Expand Down
2 changes: 1 addition & 1 deletion importer/setup_ticketMilestone_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package importer_test
import (
"testing"

"github.com/golang/mock/gomock"
"go.uber.org/mock/gomock"
"github.com/stevejefferson/trac2gitea/accessor/gitea"
"github.com/stevejefferson/trac2gitea/accessor/trac"
)
Expand Down
2 changes: 1 addition & 1 deletion importer/setup_ticketOwnership_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package importer_test
import (
"testing"

"github.com/golang/mock/gomock"
"go.uber.org/mock/gomock"
"github.com/stevejefferson/trac2gitea/accessor/gitea"
"github.com/stevejefferson/trac2gitea/accessor/trac"
)
Expand Down
2 changes: 1 addition & 1 deletion importer/setup_ticketStatus_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package importer_test
import (
"testing"

"github.com/golang/mock/gomock"
"go.uber.org/mock/gomock"
"github.com/stevejefferson/trac2gitea/accessor/gitea"
"github.com/stevejefferson/trac2gitea/accessor/trac"
)
Expand Down
2 changes: 1 addition & 1 deletion importer/setup_ticketSummary_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package importer_test
import (
"testing"

"github.com/golang/mock/gomock"
"go.uber.org/mock/gomock"
"github.com/stevejefferson/trac2gitea/accessor/gitea"
"github.com/stevejefferson/trac2gitea/accessor/trac"
)
Expand Down
2 changes: 1 addition & 1 deletion importer/setup_ticketUser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package importer_test
import (
"testing"

"github.com/golang/mock/gomock"
"go.uber.org/mock/gomock"
)

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

"github.com/golang/mock/gomock"
"go.uber.org/mock/gomock"
"github.com/stevejefferson/trac2gitea/accessor/gitea"
"github.com/stevejefferson/trac2gitea/accessor/trac"
)
Expand Down
2 changes: 1 addition & 1 deletion importer/user_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package importer_test
import (
"testing"

"github.com/golang/mock/gomock"
"go.uber.org/mock/gomock"
)

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

"github.com/golang/mock/gomock"
"go.uber.org/mock/gomock"
"github.com/stevejefferson/trac2gitea/accessor/trac"
)

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

"github.com/golang/mock/gomock"
"go.uber.org/mock/gomock"
)

func TestSingleLineCodeBlock(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion markdown/link_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"path/filepath"
"testing"

"github.com/golang/mock/gomock"
"go.uber.org/mock/gomock"
)

// functions returning trac and markdown formats for various types of link
Expand Down
2 changes: 1 addition & 1 deletion markdown/setup_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"runtime/debug"
"testing"

"github.com/golang/mock/gomock"
"go.uber.org/mock/gomock"
"github.com/stevejefferson/trac2gitea/accessor/mock_gitea"
"github.com/stevejefferson/trac2gitea/accessor/mock_trac"
"github.com/stevejefferson/trac2gitea/markdown"
Expand Down
Loading