diff --git a/bake.go b/bake.go index bf8e858..d7ea974 100644 --- a/bake.go +++ b/bake.go @@ -2,7 +2,7 @@ package main import ( "fmt" - "github.com/sirupsen/logrus" + logrus "github.com/sirupsen/logrus" "gopkg.in/cheggaaa/pb.v1" "os" "sync" diff --git a/chat.go b/chat.go index 48b9cf4..65e5d2f 100644 --- a/chat.go +++ b/chat.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/graarh/golang-socketio" "github.com/graarh/golang-socketio/transport" - "github.com/libgit2/git2go" + "github.com/libgit2/git2go/v34" "gopkg.in/sorcix/irc.v2" "net" "net/url" diff --git a/data.go b/data.go index 34b66d1..27eb5c7 100644 --- a/data.go +++ b/data.go @@ -5,9 +5,9 @@ import ( "encoding/json" "errors" "fmt" - "github.com/libgit2/git2go" + "github.com/libgit2/git2go/v34" // "io/ioutil" - "github.com/cavaliercoder/grab" + "github.com/cavaliergopher/grab/v3" "gopkg.in/cheggaaa/pb.v1" "net/url" // "path/filepath" @@ -73,7 +73,7 @@ func DownloadData() error { defer t.Stop() var bar *pb.ProgressBar - bar = pb.StartNew(int(resp.Size)) + bar = pb.StartNew(int(resp.Size())) bar.ShowTimeLeft = true bar.SetUnits(pb.U_BYTES) bar.Start() diff --git a/docs/install.md b/docs/install.md index 232b189..0016295 100644 --- a/docs/install.md +++ b/docs/install.md @@ -33,9 +33,9 @@ export GOPATH=$HOME/go cd ~/go/src/github.com/ximeraproject git clone https://github.com/XimeraProject/xake.git cd xake -go get . -go build . - +go mod init +go mod tidy +go install . ``` That may not work, though, depending on your version of libgit2. To build libgit2 statically, you could instead follow the following recipe: diff --git a/files.go b/files.go index 4da4c7e..7c60e26 100644 --- a/files.go +++ b/files.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" "github.com/PuerkitoBio/goquery" - "github.com/libgit2/git2go" + "github.com/libgit2/git2go/v34" "github.com/stevenle/topsort" "io" "io/ioutil" diff --git a/find-repository-root.go b/find-repository-root.go index 2233a74..d403374 100644 --- a/find-repository-root.go +++ b/find-repository-root.go @@ -2,7 +2,7 @@ package main import ( "fmt" - "github.com/libgit2/git2go" + "github.com/libgit2/git2go/v34" "path/filepath" ) diff --git a/frost.go b/frost.go index 3467719..3804e3a 100644 --- a/frost.go +++ b/frost.go @@ -3,7 +3,7 @@ package main import ( "encoding/json" "fmt" - "github.com/libgit2/git2go" + "github.com/libgit2/git2go/v34" "io/ioutil" "os" "path/filepath" diff --git a/main.go b/main.go index b6619a1..3ecc727 100644 --- a/main.go +++ b/main.go @@ -3,8 +3,9 @@ package main import ( "fmt" "github.com/fatih/color" - prefixed "github.com/kisonecat/logrus-prefixed-formatter" - "github.com/sirupsen/logrus" + // prefixed "github.com/kisonecat/logrus-prefixed-formatter" + prefixed "github.com/AVENTER-UG/go-logrus-formatter" + logrus "github.com/sirupsen/logrus" //"github.com/tcnksm/go-latest" "github.com/urfave/cli" "net/url" @@ -33,7 +34,7 @@ func main() { app.Name = "xake" app.Usage = "a build tool (make) for Ximera" - app.Version = "0.9.4" + app.Version = "0.9.5" // Check to see if this is the newest version Humorously, // go-latest depends on go>=1.7 because that was when "context" diff --git a/name.go b/name.go index 60c31df..7edc0f0 100644 --- a/name.go +++ b/name.go @@ -3,7 +3,7 @@ package main import ( "fmt" "github.com/briandowns/spinner" - "github.com/libgit2/git2go" + "github.com/libgit2/git2go/v34" "net/url" "time" ) diff --git a/serve.go b/serve.go index 59f9a86..9433d51 100644 --- a/serve.go +++ b/serve.go @@ -2,7 +2,7 @@ package main import ( "github.com/fatih/color" - "github.com/libgit2/git2go" + "github.com/libgit2/git2go/v34" "net/url" "os" "os/exec" diff --git a/ximera-version.go b/ximera-version.go index 8800805..b3833ce 100644 --- a/ximera-version.go +++ b/ximera-version.go @@ -2,7 +2,7 @@ package main import ( "encoding/json" - "github.com/libgit2/git2go" + "github.com/libgit2/git2go/v34" "net/http" "os/exec" "path/filepath"