drop support for go1.7

jmank88 · jmank88 · commit 704bf90d265f · 2017-08-18T14:42:32.000-05:00
diff --git a/.travis.yml b/.travis.yml
@@ -27,7 +27,7 @@ jobs:
         - codeclimate-test-reporter < coverage.txt
     # YAML alias, for settings shared across the simpler builds
     - &simple-test
-      go: 1.7.x
+      go: 1.9.x
       stage: test
       install: skip
       env:
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@
 
 ## Dep
 
-`dep` is a prototype dependency management tool for Go. It requires Go 1.7 or newer to compile.
+`dep` is a prototype dependency management tool for Go. It requires Go 1.8 or newer to compile.
 
 `dep` is the official _experiment_, but not yet the official tool. Check out the [Roadmap](https://github.com/golang/dep/wiki/Roadmap) for more on what this means!
 
diff --git a/internal/fs/fs.go b/internal/fs/fs.go
@@ -109,7 +109,7 @@ func RenameWithFallback(src, dst string) error {
 		return errors.Wrapf(err, "cannot stat %s", src)
 	}
 
-	err = rename(src, dst)
+	err = os.Rename(src, dst)
 	if err == nil {
 		return nil
 	}
diff --git a/internal/fs/rename.go b/internal/fs/rename.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 // +build !windows
-// +build go1.8
 
 package fs
 
@@ -14,10 +13,6 @@ import (
 	"github.com/pkg/errors"
 )
 
-func rename(src, dst string) error {
-	return os.Rename(src, dst)
-}
-
 // renameFallback attempts to determine the appropriate fallback to failed rename
 // operation depending on the resulting error.
 func renameFallback(err error, src, dst string) error {
diff --git a/internal/fs/rename_go17.go b/internal/fs/rename_go17.go
diff --git a/internal/fs/rename_windows.go b/internal/fs/rename_windows.go
@@ -13,10 +13,6 @@ import (
 	"github.com/pkg/errors"
 )
 
-func rename(src, dst string) error {
-	return os.Rename(src, dst)
-}
-
 // renameFallback attempts to determine the appropriate fallback to failed rename
 // operation depending on the resulting error.
 func renameFallback(err error, src, dst string) error {
diff --git a/internal/gps/manager_test.go b/internal/gps/manager_test.go
@@ -47,7 +47,7 @@ func mkNaiveSM(t *testing.T) (*SourceMgr, func()) {
 
 	return sm, func() {
 		sm.Release()
-		err := removeAll(cpath)
+		err := os.RemoveAll(cpath)
 		if err != nil {
 			t.Errorf("removeAll failed: %s", err)
 		}
@@ -65,7 +65,7 @@ func remakeNaiveSM(osm *SourceMgr, t *testing.T) (*SourceMgr, func()) {
 
 	return sm, func() {
 		sm.Release()
-		err := removeAll(cpath)
+		err := os.RemoveAll(cpath)
 		if err != nil {
 			t.Errorf("removeAll failed: %s", err)
 		}
@@ -95,7 +95,7 @@ func TestSourceManagerInit(t *testing.T) {
 	}
 
 	sm.Release()
-	err = removeAll(cpath)
+	err = os.RemoveAll(cpath)
 	if err != nil {
 		t.Errorf("removeAll failed: %s", err)
 	}
@@ -111,7 +111,7 @@ func TestSourceManagerInit(t *testing.T) {
 	}
 
 	sm.Release()
-	err = removeAll(cpath)
+	err = os.RemoveAll(cpath)
 	if err != nil {
 		t.Errorf("removeAll failed: %s", err)
 	}
@@ -135,7 +135,7 @@ func TestSourceInit(t *testing.T) {
 
 	defer func() {
 		sm.Release()
-		err := removeAll(cpath)
+		err := os.RemoveAll(cpath)
 		if err != nil {
 			t.Errorf("removeAll failed: %s", err)
 		}
diff --git a/internal/gps/remove_go16.go b/internal/gps/remove_go16.go
diff --git a/internal/gps/remove_go17.go b/internal/gps/remove_go17.go
diff --git a/internal/gps/result.go b/internal/gps/result.go
@@ -98,7 +98,7 @@ func WriteDepTree(basedir string, l Lock, sm SourceManager, sv bool, logger *log
 			logger.Println(" * ", err)
 		}
 
-		removeAll(basedir)
+		os.RemoveAll(basedir)
 
 		return errors.New("failed to write dep tree")
 	}
diff --git a/internal/gps/source_test.go b/internal/gps/source_test.go
@@ -8,6 +8,7 @@ import (
 	"context"
 	"fmt"
 	"io/ioutil"
+	"os"
 	"reflect"
 	"testing"
 
@@ -30,7 +31,7 @@ func testSourceGateway(t *testing.T) {
 	bgc := context.Background()
 	ctx, cancelFunc := context.WithCancel(bgc)
 	defer func() {
-		removeAll(cachedir)
+		os.RemoveAll(cachedir)
 		cancelFunc()
 	}()
 
diff --git a/internal/gps/strip_vendor.go b/internal/gps/strip_vendor.go
@@ -32,7 +32,7 @@ func stripVendor(path string, info os.FileInfo, err error) error {
 		}
 
 		if info.IsDir() {
-			if err := removeAll(path); err != nil {
+			if err := os.RemoveAll(path); err != nil {
 				return err
 			}
 			return filepath.SkipDir
diff --git a/internal/gps/strip_vendor_windows.go b/internal/gps/strip_vendor_windows.go
@@ -40,7 +40,7 @@ func stripVendor(path string, info os.FileInfo, err error) error {
 				}
 
 			case dir:
-				if err := removeAll(path); err != nil {
+				if err := os.RemoveAll(path); err != nil {
 					return err
 				}
 				return filepath.SkipDir
diff --git a/internal/gps/vcs_source_test.go b/internal/gps/vcs_source_test.go
@@ -49,7 +49,7 @@ func testGitSourceInteractions(t *testing.T) {
 		t.Errorf("Failed to create temp dir: %s", err)
 	}
 	defer func() {
-		if err := removeAll(cpath); err != nil {
+		if err := os.RemoveAll(cpath); err != nil {
 			t.Errorf("removeAll failed: %s", err)
 		}
 	}()
@@ -145,7 +145,7 @@ func testGopkginSourceInteractions(t *testing.T) {
 		t.Errorf("Failed to create temp dir: %s", err)
 	}
 	defer func() {
-		if err := removeAll(cpath); err != nil {
+		if err := os.RemoveAll(cpath); err != nil {
 			t.Errorf("removeAll failed: %s", err)
 		}
 	}()
@@ -296,7 +296,7 @@ func testBzrSourceInteractions(t *testing.T) {
 		t.Errorf("Failed to create temp dir: %s", err)
 	}
 	defer func() {
-		if err := removeAll(cpath); err != nil {
+		if err := os.RemoveAll(cpath); err != nil {
 			t.Errorf("removeAll failed: %s", err)
 		}
 	}()
@@ -406,7 +406,7 @@ func testHgSourceInteractions(t *testing.T) {
 		t.Errorf("Failed to create temp dir: %s", err)
 	}
 	defer func() {
-		if err := removeAll(cpath); err != nil {
+		if err := os.RemoveAll(cpath); err != nil {
 			t.Errorf("removeAll failed: %s", err)
 		}
 	}()

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ func RenameWithFallback(src, dst string) error {`
`109`	`109`	`return errors.Wrapf(err, "cannot stat %s", src)`
`110`	`110`	`}`
`111`	`111`
`112`		`- err = rename(src, dst)`
	`112`	`+ err = os.Rename(src, dst)`
`113`	`113`	`if err == nil {`
`114`	`114`	`return nil`
`115`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ func mkNaiveSM(t testing.T) (SourceMgr, func()) {`
`47`	`47`
`48`	`48`	`return sm, func() {`
`49`	`49`	`sm.Release()`
`50`		`- err := removeAll(cpath)`
	`50`	`+ err := os.RemoveAll(cpath)`
`51`	`51`	`if err != nil {`
`52`	`52`	`t.Errorf("removeAll failed: %s", err)`
`53`	`53`	`}`
`@@ -65,7 +65,7 @@ func remakeNaiveSM(osm SourceMgr, t testing.T) (*SourceMgr, func()) {`
`65`	`65`
`66`	`66`	`return sm, func() {`
`67`	`67`	`sm.Release()`
`68`		`- err := removeAll(cpath)`
	`68`	`+ err := os.RemoveAll(cpath)`
`69`	`69`	`if err != nil {`
`70`	`70`	`t.Errorf("removeAll failed: %s", err)`
`71`	`71`	`}`
`@@ -95,7 +95,7 @@ func TestSourceManagerInit(t *testing.T) {`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`sm.Release()`
`98`		`- err = removeAll(cpath)`
	`98`	`+ err = os.RemoveAll(cpath)`
`99`	`99`	`if err != nil {`
`100`	`100`	`t.Errorf("removeAll failed: %s", err)`
`101`	`101`	`}`
`@@ -111,7 +111,7 @@ func TestSourceManagerInit(t *testing.T) {`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`sm.Release()`
`114`		`- err = removeAll(cpath)`
	`114`	`+ err = os.RemoveAll(cpath)`
`115`	`115`	`if err != nil {`
`116`	`116`	`t.Errorf("removeAll failed: %s", err)`
`117`	`117`	`}`
`@@ -135,7 +135,7 @@ func TestSourceInit(t *testing.T) {`
`135`	`135`
`136`	`136`	`defer func() {`
`137`	`137`	`sm.Release()`
`138`		`- err := removeAll(cpath)`
	`138`	`+ err := os.RemoveAll(cpath)`
`139`	`139`	`if err != nil {`
`140`	`140`	`t.Errorf("removeAll failed: %s", err)`
`141`	`141`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ func WriteDepTree(basedir string, l Lock, sm SourceManager, sv bool, logger *log`
`98`	`98`	`logger.Println(" * ", err)`
`99`	`99`	`}`
`100`	`100`
`101`		`- removeAll(basedir)`
	`101`	`+ os.RemoveAll(basedir)`
`102`	`102`
`103`	`103`	`return errors.New("failed to write dep tree")`
`104`	`104`	`}`