From 544fff6a0f904304eb02af33f587fb6bab8f31fd Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Tue, 29 Jan 2019 17:53:14 +0000 Subject: [PATCH 1/5] Bump minimum go version to 1.10 --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fadc326..5ba0bae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: go go: - - 1.8 + - 1.10 + - 1.11 install: - go get github.com/golang/lint/golint - go get github.com/fzipp/gocyclo From d0a3393bc992293a37dfedd44ab6db9bb949a607 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Tue, 29 Jan 2019 18:47:24 +0000 Subject: [PATCH 2/5] Fix go version --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5ba0bae..3547599 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: go go: - - 1.10 - - 1.11 + - 1.10.x + - 1.11.x install: - go get github.com/golang/lint/golint - go get github.com/fzipp/gocyclo From 2e135b1860fc6c9acf1347061f56784454b4f77a Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Wed, 30 Jan 2019 11:32:41 +0000 Subject: [PATCH 3/5] Fix responses uncommented field --- responses.go | 1 + 1 file changed, 1 insertion(+) diff --git a/responses.go b/responses.go index fe0eeb3..d6044aa 100644 --- a/responses.go +++ b/responses.go @@ -168,6 +168,7 @@ type RespSync struct { } `json:"rooms"` } +// RespTurnServer is the JSON response from a Turn Server type RespTurnServer struct { Username string `json:"username"` Password string `json:"password"` From c3f65ede3b8bd5f455d6e492ff6eef1ca2297130 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Wed, 30 Jan 2019 11:59:03 +0000 Subject: [PATCH 4/5] gofmt --- userids.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/userids.go b/userids.go index 23e7807..70002c5 100644 --- a/userids.go +++ b/userids.go @@ -125,6 +125,6 @@ func ExtractUserLocalpart(userID string) (string, error) { } return strings.TrimPrefix( strings.SplitN(userID, ":", 2)[0], // @foo:bar:8448 => [ "@foo", "bar:8448" ] - "@", // remove "@" prefix + "@", // remove "@" prefix ), nil } From 2c47a0c60984dee7001ddceaaa470d9f48173ad8 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Wed, 30 Jan 2019 12:20:48 +0000 Subject: [PATCH 5/5] gofmt is different between go versions and makes everything break --- .travis.yml | 1 - userids.go | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3547599..13585d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: go go: - 1.10.x - - 1.11.x install: - go get github.com/golang/lint/golint - go get github.com/fzipp/gocyclo diff --git a/userids.go b/userids.go index 70002c5..23e7807 100644 --- a/userids.go +++ b/userids.go @@ -125,6 +125,6 @@ func ExtractUserLocalpart(userID string) (string, error) { } return strings.TrimPrefix( strings.SplitN(userID, ":", 2)[0], // @foo:bar:8448 => [ "@foo", "bar:8448" ] - "@", // remove "@" prefix + "@", // remove "@" prefix ), nil }