Skip to content

Commit

Permalink
Merge pull request #73 from dropbox/dep
Browse files Browse the repository at this point in the history
Switch to `dep` and update dependencies
  • Loading branch information
diwakergupta authored Jul 24, 2017
2 parents e45288c + 5340d0c commit 1870736
Show file tree
Hide file tree
Showing 348 changed files with 78,099 additions and 23,013 deletions.
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
language: go

go:
- 1.8
- 1.8.3

before_script:
- go get -u github.com/mitchellh/gox
- go vet github.com/dropbox/dbxcli

install: true

script:
- ./build.sh

Expand Down
93 changes: 93 additions & 0 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

50 changes: 50 additions & 0 deletions Gopkg.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@

# Gopkg.toml example
#
# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
# for detailed Gopkg.toml documentation.
#
# required = ["github.com/user/thing/cmd/thing"]
# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
#
# [[constraint]]
# name = "github.com/user/project"
# version = "1.0.0"
#
# [[constraint]]
# name = "github.com/user/project2"
# branch = "dev"
# source = "github.com/myfork/project2"
#
# [[override]]
# name = "github.com/x/y"
# version = "2.4.0"


[[constraint]]
branch = "master"
name = "github.com/dropbox/dropbox-sdk-go-unofficial"

[[constraint]]
branch = "master"
name = "github.com/dustin/go-humanize"

[[constraint]]
branch = "master"
name = "github.com/grantseltzer/golumns"

[[constraint]]
branch = "master"
name = "github.com/mitchellh/go-homedir"

[[constraint]]
branch = "master"
name = "github.com/mitchellh/ioprogress"

[[constraint]]
branch = "master"
name = "github.com/spf13/cobra"

[[constraint]]
branch = "master"
name = "golang.org/x/oauth2"
4 changes: 3 additions & 1 deletion cmd/add-member.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ func addMember(cmd *cobra.Command, args []string) (err error) {
email := args[0]
firstName := args[1]
lastName := args[2]
member := team.NewMemberAddArg(email, firstName, lastName)
member := team.NewMemberAddArg(email)
member.MemberGivenName = firstName
member.MemberSurname = lastName
arg := team.NewMembersAddArg([]*team.MemberAddArg{member})
res, err := dbx.MembersAdd(arg)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion cmd/logout.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func logout(cmd *cobra.Command, args []string) error {

for domain, tokens := range tokMap {
for _, token := range tokens {
config := dropbox.Config{token, false, "", domain}
config := dropbox.Config{token, false, "", domain, nil, nil, nil}
client := auth.New(config)
client.TokenRevoke()
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ func initDbx(cmd *cobra.Command, args []string) (err error) {
writeTokens(filePath, tokenMap)
}

config = dropbox.Config{tokens[tokType], verbose, asMember, domain}
config = dropbox.Config{tokens[tokType], verbose, asMember, domain, nil, nil, nil}

return
}
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions vendor/github.com/dropbox/dropbox-sdk-go-unofficial/.travis.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

95 changes: 95 additions & 0 deletions vendor/github.com/dropbox/dropbox-sdk-go-unofficial/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 1870736

Please sign in to comment.