Update Masterminds/semver to latest 2.x

internal/gps/constraints.go

@@ -58,7 +58,7 @@ func NewSemverConstraint(body string) (Constraint, error) {
 	}
 	// If we got a simple semver.Version, simplify by returning our
 	// corresponding type
-	if sv, ok := c.(*semver.Version); ok {
+	if sv, ok := c.(semver.Version); ok {
 		return semVersion{sv: sv}, nil
 	}
 	return semverConstraint{c: c}, nil

internal/gps/manager_test.go

@@ -35,7 +35,7 @@ func (a naiveAnalyzer) Info() (name string, version int) {
 	return "naive-analyzer", 1
 }
 
-func sv(s string) *semver.Version {
+func sv(s string) semver.Version {
 	sv, err := semver.NewVersion(s)
 	if err != nil {
 		panic(fmt.Sprintf("Error creating semver from %q: %s", s, err))

internal/gps/vcs_source.go

@@ -291,7 +291,7 @@ func (s *gopkginSource) listVersions(ctx context.Context) ([]PairedVersion, erro
 	vlist := make([]PairedVersion, len(ovlist))
 	k := 0
 	var dbranch int // index of branch to be marked default
-	var bsv *semver.Version
+	var bsv semver.Version
 	for _, v := range ovlist {
 		// all git versions will always be paired
 		pv := v.(versionPair)
@@ -318,7 +318,7 @@ func (s *gopkginSource) listVersions(ctx context.Context) ([]PairedVersion, erro
 			// which one to mark as default until we've seen them all
 			tv.isDefault = false
 			// Figure out if this is the current leader for default branch
-			if bsv == nil || bsv.LessThan(sv) {
+			if bsv == (semver.Version{}) || bsv.LessThan(sv) {
 				bsv = sv
 				dbranch = k
 			}
@@ -331,7 +331,7 @@ func (s *gopkginSource) listVersions(ctx context.Context) ([]PairedVersion, erro
 	}
 
 	vlist = vlist[:k]
-	if bsv != nil {
+	if bsv != (semver.Version{}) {
 		dbv := vlist[dbranch].(versionPair)
 		vlist[dbranch] = branchVersion{
 			name:      dbv.v.(branchVersion).name,

internal/gps/version.go

@@ -344,7 +344,7 @@ func (v plainVersion) Is(r Revision) PairedVersion {
 }
 
 type semVersion struct {
-	sv *semver.Version
+	sv semver.Version
 }
 
 func (v semVersion) String() string {

manifest_test.go

@@ -25,7 +25,7 @@ func TestReadManifest(t *testing.T) {
 		t.Fatalf("Should have read Manifest correctly, but got err %q", err)
 	}
 
-	c, _ := gps.NewSemverConstraint(">=0.12.0, <1.0.0")
+	c, _ := gps.NewSemverConstraint("^0.12.0")
 	want := Manifest{
 		Dependencies: map[gps.ProjectRoot]gps.ProjectProperties{
 			gps.ProjectRoot("github.com/golang/dep/internal/gps"): {

testdata/manifest/golden.toml

@@ -6,7 +6,7 @@ ignored = ["github.com/foo/bar"]
 
 [[dependencies]]
   name = "github.com/golang/dep/internal/gps"
-  version = ">=0.12.0, <1.0.0"
+  version = "^0.12.0"
 
 [[overrides]]
   branch = "master"