Merge pull request #39 from yulog/replace-ioutil

replace ioutil

builder.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"compress/flate"
 	"compress/gzip"
-	"io/ioutil"
 	"log"
 	"os"
 	"os/exec"
@@ -128,7 +127,7 @@ func (bdr *builder) build() (string, error) {
 				pkg, bdr.platform.os, bdr.platform.arch, string(bs))
 		}
 	}
-	files, err := ioutil.ReadDir(workDir)
+	files, err := os.ReadDir(workDir)
 	if err != nil {
 		return "", err
 	}

cli_test.go

@@ -1,7 +1,7 @@
 package goxz
 
 import (
-	"io/ioutil"
+	"io"
 	"os"
 	"reflect"
 	"sort"
@@ -10,7 +10,7 @@ import (
 )
 
 func setup(t *testing.T) string {
-	tmpd, err := ioutil.TempDir("", "goxz-")
+	tmpd, err := os.MkdirTemp("", "goxz-")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -92,7 +92,7 @@ func TestCliRun(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			cl := &cli{outStream: ioutil.Discard, errStream: ioutil.Discard}
+			cl := &cli{outStream: io.Discard, errStream: io.Discard}
 			tmpd := setup(t)
 			defer os.RemoveAll(tmpd)
 			args := append([]string{"-d=" + tmpd}, tc.input...)
@@ -108,7 +108,7 @@ func TestCliRun(t *testing.T) {
 					t.Errorf("%s: error should be contains %q, but %q", tc.name, tc.errStr, err)
 				}
 			}
-			files, err := ioutil.ReadDir(tmpd)
+			files, err := os.ReadDir(tmpd)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -140,7 +140,7 @@ func TestCliRun_projDir(t *testing.T) {
 		"goxz_0.1.1_freebsd_arm64.tar.gz",
 	}
 
-	cl := &cli{outStream: ioutil.Discard, errStream: ioutil.Discard}
+	cl := &cli{outStream: io.Discard, errStream: io.Discard}
 	tmpd := setup(t)
 	// This deletion process is performed to check whether goxz itself creates
 	// a directory correctly
@@ -156,7 +156,7 @@ func TestCliRun_projDir(t *testing.T) {
 		t.Errorf("error should be nil but: %s", err)
 	}
 
-	files, err := ioutil.ReadDir(tmpd)
+	files, err := os.ReadDir(tmpd)
 	if err != nil {
 		t.Fatal(err)
 	}

goxz.go

@@ -3,7 +3,6 @@ package goxz
 import (
 	"context"
 	"io"
-	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
@@ -44,7 +43,7 @@ func (gx *goxz) run() error {
 		return err
 	}
 
-	gx.workDir, err = ioutil.TempDir(gx.dest, ".goxz-")
+	gx.workDir, err = os.MkdirTemp(gx.dest, ".goxz-")
 	if err != nil {
 		return err
 	}
@@ -185,12 +184,12 @@ func (gx *goxz) gatherResources() ([]string, error) {
 	dir := gx.projDir
 
 	var ret []string
-	files, err := ioutil.ReadDir(dir)
+	files, err := os.ReadDir(dir)
 	if err != nil {
 		return nil, err
 	}
 	for _, f := range files {
-		if !f.Mode().IsRegular() {
+		if !f.Type().IsRegular() {
 			continue
 		}
 		n := f.Name()

goxz_test.go

@@ -3,15 +3,15 @@ package goxz
 import (
 	"context"
 	"flag"
-	"io/ioutil"
+	"io"
 	"path/filepath"
 	"reflect"
 	"sort"
 	"testing"
 )
 
 func TestRun_help(t *testing.T) {
-	err := Run(context.Background(), []string{"-h"}, ioutil.Discard, ioutil.Discard)
+	err := Run(context.Background(), []string{"-h"}, io.Discard, io.Discard)
 	if err != flag.ErrHelp {
 		t.Errorf("somthing went wrong: %s", err)
 	}