Updated dependencies (#362)

Southclaws · May 23, 2020 · 8b052e6 · 8b052e6
1 parent f1b39a1
commit 8b052e6
Show file tree

Hide file tree

Showing 12 changed files with 211 additions and 149 deletions.
diff --git a/commands/app.go b/commands/app.go
@@ -7,14 +7,14 @@ import (
 	"time"
 
 	"github.com/Masterminds/semver"
+	"github.com/go-git/go-git/v5/plumbing/transport"
+	"github.com/go-git/go-git/v5/plumbing/transport/http"
+	"github.com/go-git/go-git/v5/plumbing/transport/ssh"
 	"github.com/google/go-github/github"
 	"github.com/joho/godotenv"
 	_ "github.com/joho/godotenv/autoload"
 	"github.com/pkg/errors"
 	"golang.org/x/oauth2"
-	"gopkg.in/src-d/go-git.v4/plumbing/transport"
-	"gopkg.in/src-d/go-git.v4/plumbing/transport/http"
-	"gopkg.in/src-d/go-git.v4/plumbing/transport/ssh"
 	"gopkg.in/urfave/cli.v1"
 
 	"github.com/Southclaws/sampctl/download"
@@ -260,7 +260,10 @@ func Run(args []string, version string) error {
 		}
 
 		if config.GitUsername != "" && config.GitPassword != "" {
-			gitAuth = http.NewBasicAuth(config.GitUsername, config.GitPassword)
+			gitAuth = &http.BasicAuth{
+				Username: config.GitUsername,
+				Password: config.GitPassword,
+			}
 		} else {
 			gitAuth, err = ssh.DefaultAuthBuilder("git")
 			if err != nil {

diff --git a/go.mod b/go.mod
@@ -3,59 +3,36 @@ module github.com/Southclaws/sampctl
 go 1.14
 
 require (
-	github.com/BurntSushi/toml v0.3.0 // indirect
-	github.com/Masterminds/semver v1.4.2
-	github.com/Microsoft/go-winio v0.4.10 // indirect
-	github.com/Netflix/go-expect v0.0.0-20180928190340-9d1f4485533b // indirect
-	github.com/Southclaws/configor v0.0.0-20180822075847-6d429b53d4bd
-	github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 // indirect
-	github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/docker/distribution v2.6.2+incompatible // indirect
+	github.com/BurntSushi/toml v0.3.1 // indirect
+	github.com/Masterminds/semver v1.5.0
+	github.com/Microsoft/go-winio v0.4.14 // indirect
+	github.com/Netflix/go-expect v0.0.0-20200312175327-da48e75238e2 // indirect
+	github.com/Southclaws/configor v1.0.0
+	github.com/docker/distribution v2.7.1+incompatible // indirect
 	github.com/docker/docker v1.13.1
-	github.com/docker/go-connections v0.3.0
-	github.com/docker/go-units v0.3.3 // indirect
-	github.com/fatih/color v1.7.0
-	github.com/fsnotify/fsnotify v1.4.7
-	github.com/go-yaml/yaml v2.1.0+incompatible // indirect
-	github.com/golang/protobuf v1.2.0 // indirect
+	github.com/docker/go-connections v0.4.0
+	github.com/docker/go-units v0.4.0 // indirect
+	github.com/fatih/color v1.9.0
+	github.com/fsnotify/fsnotify v1.4.9
+	github.com/go-git/go-git/v5 v5.0.0
+	github.com/golang/protobuf v1.4.2 // indirect
 	github.com/google/go-github v0.0.0-20180819205025-d7732128a00e
-	github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135 // indirect
-	github.com/google/uuid v0.0.0-20161128191214-064e2069ce9c
+	github.com/google/go-querystring v1.0.0 // indirect
+	github.com/google/uuid v1.1.1
 	github.com/hinshun/vt10x v0.0.0-20180809195222-d55458df857c // indirect
-	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
-	github.com/joho/godotenv v1.2.0
-	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
-	github.com/kr/pretty v0.1.0
-	github.com/kr/pty v1.1.2
-	github.com/mattn/go-colorable v0.0.9 // indirect
-	github.com/mattn/go-isatty v0.0.3 // indirect
-	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
+	github.com/joho/godotenv v1.3.0
+	github.com/kr/pretty v0.2.0
+	github.com/kr/pty v1.1.8
 	github.com/michaelbironneau/garbler v0.0.0-20180525195632-2018e2dc9c11
 	github.com/mitchellh/go-homedir v1.1.0
-	github.com/nbutton23/zxcvbn-go v0.0.0-20180510020640-780cc39d5c78
-	github.com/pkg/errors v0.8.0
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/sergi/go-diff v1.0.0 // indirect
-	github.com/src-d/gcfg v1.3.0 // indirect
-	github.com/src-d/go-git-fixtures v3.1.1+incompatible // indirect
-	github.com/stevvooe/resumable v0.0.0-20180830230917-22b14a53ba50 // indirect
-	github.com/stretchr/testify v1.2.2
-	github.com/xanzy/ssh-agent v0.2.0 // indirect
-	github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect
-	golang.org/x/crypto v0.0.0-20180820150726-614d502a4dac // indirect
-	golang.org/x/net v0.0.0-20180821023952-922f4815f713 // indirect
-	golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be
-	golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f // indirect
-	golang.org/x/sys v0.0.0-20190209173611-3b5209105503 // indirect
-	golang.org/x/text v0.3.0 // indirect
-	google.golang.org/appengine v1.1.0 // indirect
-	gopkg.in/AlecAivazis/survey.v1 v1.6.2
+	github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d
+	github.com/opencontainers/go-digest v1.0.0 // indirect
+	github.com/pkg/errors v0.9.1
+	github.com/stretchr/testify v1.5.1
+	golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2 // indirect
+	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
+	gopkg.in/AlecAivazis/survey.v1 v1.8.8
 	gopkg.in/eapache/go-resiliency.v1 v1.2.0
-	gopkg.in/src-d/go-billy.v3 v3.1.0 // indirect
-	gopkg.in/src-d/go-billy.v4 v4.3.0 // indirect
-	gopkg.in/src-d/go-git.v4 v4.0.0-rc15
 	gopkg.in/urfave/cli.v1 v1.20.0
-	gopkg.in/warnings.v0 v0.1.2 // indirect
-	gopkg.in/yaml.v2 v2.2.1
+	gopkg.in/yaml.v2 v2.3.0
 )