Migrate gobuffalo/uuid to gofrs/uuid (#348)

SHOULDERS.md

@@ -1,6 +1,6 @@
-# github.com/gobuffalo/pop Stands on the Shoulders of Giants
+# Pop Stands on the Shoulders of Giants
 
-github.com/gobuffalo/pop does not try to reinvent the wheel! Instead, it uses the already great wheels developed by the Go community and puts them all together in the best way possible. Without these giants this project would not be possible. Please make sure to check them out and thank them for all of their hard work.
+Pop does not try to reinvent the wheel! Instead, it uses the already great wheels developed by the Go community and puts them all together in the best way possible. Without these giants, this project would not be possible. Please make sure to check them out and thank them for all of their hard work.
 
 Thank you to the following **GIANTS**:
 
@@ -113,10 +113,6 @@ Thank you to the following **GIANTS**:
 
 * [github.com/markbates/oncer](https://godoc.org/github.com/markbates/oncer)
 
-* [github.com/mattn/go-colorable](https://godoc.org/github.com/mattn/go-colorable)
-
-* [github.com/mattn/go-isatty](https://godoc.org/github.com/mattn/go-isatty)
-
 * [github.com/microcosm-cc/bluemonday](https://godoc.org/github.com/microcosm-cc/bluemonday)
 
 * [github.com/pkg/errors](https://godoc.org/github.com/pkg/errors)

associations/belongs_to_association_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/gobuffalo/pop/associations"
-	"github.com/gobuffalo/uuid"
+	"github.com/gofrs/uuid"
 	"github.com/stretchr/testify/require"
 )
 

associations/has_one_association_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/gobuffalo/pop/associations"
 	"github.com/gobuffalo/pop/nulls"
-	"github.com/gobuffalo/uuid"
+	"github.com/gofrs/uuid"
 	"github.com/stretchr/testify/require"
 )
 

associations/many_to_many_association.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/gobuffalo/flect"
-	"github.com/gobuffalo/uuid"
+	"github.com/gofrs/uuid"
 )
 
 type manyToManyAssociation struct {

associations/many_to_many_association_test.go

@@ -5,13 +5,13 @@ import (
 	"testing"
 
 	"github.com/gobuffalo/pop/associations"
-	"github.com/gobuffalo/uuid"
+	"github.com/gofrs/uuid"
 	"github.com/stretchr/testify/require"
 )
 
 type fooManyToMany struct {
-	ID                  uuid.UUID       `db:"id"`
-	BarManyToManies     barManyToManies `many_to_many:"foos_and_bars"`
+	ID              uuid.UUID       `db:"id"`
+	BarManyToManies barManyToManies `many_to_many:"foos_and_bars"`
 }
 
 type fooManyToMany2 struct {
@@ -63,4 +63,4 @@ func Test_Many_To_Many_PrimaryId_Tag(t *testing.T) {
 	where, args := as[0].Constraint()
 	a.Equal("id in (select bar_many_to_many_id from foos_and_bars where fufu_id = ?)", where)
 	a.Equal(id, args[0].(uuid.UUID))
-}
+}

dialect.go

@@ -13,7 +13,7 @@ import (
 	"github.com/gobuffalo/fizz"
 	"github.com/gobuffalo/pop/columns"
 	"github.com/gobuffalo/pop/logging"
-	"github.com/gobuffalo/uuid"
+	"github.com/gofrs/uuid"
 	"github.com/jmoiron/sqlx"
 	"github.com/pkg/errors"
 )

executors.go

@@ -6,8 +6,8 @@ import (
 	"github.com/gobuffalo/pop/associations"
 	"github.com/gobuffalo/pop/columns"
 	"github.com/gobuffalo/pop/logging"
-	"github.com/gobuffalo/uuid"
 	"github.com/gobuffalo/validate"
+	"github.com/gofrs/uuid"
 )
 
 // Reload fetch fresh data for a given model, using its ID.

executors_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/gobuffalo/pop/nulls"
-	"github.com/gobuffalo/uuid"
+	"github.com/gofrs/uuid"
 	"github.com/stretchr/testify/require"
 )
 

finders.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/gobuffalo/pop/associations"
 	"github.com/gobuffalo/pop/logging"
-	"github.com/gobuffalo/uuid"
+	"github.com/gofrs/uuid"
 	"github.com/pkg/errors"
 )
 

finders_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/gobuffalo/pop/nulls"
-	"github.com/gobuffalo/uuid"
+	"github.com/gofrs/uuid"
 	"github.com/stretchr/testify/require"
 )
 

model.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/gobuffalo/flect"
 	nflect "github.com/gobuffalo/flect/name"
-	"github.com/gobuffalo/uuid"
+	"github.com/gofrs/uuid"
 	"github.com/pkg/errors"
 )
 

nulls/nulls.go

@@ -3,7 +3,7 @@ package nulls
 import (
 	"database/sql/driver"
 
-	"github.com/gobuffalo/uuid"
+	"github.com/gofrs/uuid"
 )
 
 // nullable a generic representation of nulls type.

nulls/types_test.go

@@ -10,7 +10,7 @@ import (
 	"time"
 
 	. "github.com/gobuffalo/pop/nulls"
-	"github.com/gobuffalo/uuid"
+	"github.com/gofrs/uuid"
 	"github.com/jmoiron/sqlx"
 	_ "github.com/mattn/go-sqlite3"
 	"github.com/stretchr/testify/require"

nulls/uuid.go

@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"strings"
 
-	"github.com/gobuffalo/uuid"
+	"github.com/gofrs/uuid"
 	"github.com/pkg/errors"
 )
 

nulls/uuid_test.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/gobuffalo/uuid"
+	"github.com/gofrs/uuid"
 	"github.com/stretchr/testify/require"
 )
 

pop_test.go

@@ -8,9 +8,9 @@ import (
 
 	"github.com/gobuffalo/pop/logging"
 	"github.com/gobuffalo/pop/nulls"
-	"github.com/gobuffalo/uuid"
 	"github.com/gobuffalo/validate"
 	"github.com/gobuffalo/validate/validators"
+	"github.com/gofrs/uuid"
 	"github.com/stretchr/testify/suite"
 )
 

query_test.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/gobuffalo/uuid"
+	"github.com/gofrs/uuid"
 	"github.com/stretchr/testify/require"
 )
 

slices/uuid.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/gobuffalo/uuid"
+	"github.com/gofrs/uuid"
 	"github.com/pkg/errors"
 )
 

slices/uuid_test.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/gobuffalo/uuid"
+	"github.com/gofrs/uuid"
 	"github.com/stretchr/testify/require"
 )
 

soda/cmd/generate/attribute.go

@@ -50,7 +50,7 @@ func newAttribute(base string, model *model) (attribute, error) {
 		model.Imports = append(model.Imports, "github.com/gobuffalo/pop/slices")
 	} else if !model.HasUUID && col[1] == "uuid" {
 		model.HasUUID = true
-		model.Imports = append(model.Imports, "github.com/gobuffalo/uuid")
+		model.Imports = append(model.Imports, "github.com/gofrs/uuid")
 	}
 
 	got := colType(col[1])

soda/cmd/generate/model.go

@@ -144,7 +144,7 @@ func (m *model) addID() {
 
 	if !m.HasUUID {
 		m.HasUUID = true
-		m.Imports = append(m.Imports, "github.com/gobuffalo/uuid")
+		m.Imports = append(m.Imports, "github.com/gofrs/uuid")
 	}
 
 	id := flect.New("id")