chore: modernize Go toolchain and dependencies

.github/workflows/ci.yaml

@@ -8,7 +8,7 @@ on:
     branches: [ "*" ]
 
 env:
-  GO_VERSION: "1.21"
+  GO_VERSION: "1.26"
 
 jobs:
 
@@ -29,7 +29,7 @@ jobs:
 
       # step 2: Set up go
       - name: Set up Go ${{ env.GO_VERSION }}
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ env.GO_VERSION }}
 
@@ -61,7 +61,7 @@ jobs:
 
       # step 8: Upload results
       - name: Upload test results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: coverage-${{ matrix.os }}
           path: coverage-${{ matrix.os }}.txt
@@ -78,7 +78,7 @@ jobs:
 
       # step 2: Set up go
       - name: Set up Go ${{ env.GO_VERSION }}
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ env.GO_VERSION }}
 
@@ -91,7 +91,7 @@ jobs:
 
       # step 4: Download results
       - name: Download test results
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: data/coverage/
 
@@ -141,7 +141,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up Go ${{ env.GO_VERSION }}
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ env.GO_VERSION }}
 

commands/alias/add.go

@@ -10,7 +10,7 @@ import (
 	"github.com/0xcfff/hostsctl/hosts/dom"
 	"github.com/0xcfff/hostsctl/iptools"
 	"github.com/spf13/cobra"
-	"golang.org/x/exp/slices"
+	"slices"
 )
 
 type AliasAddOptions struct {

commands/alias/list.go

@@ -4,6 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"maps"
+	"slices"
 	"strings"
 
 	"github.com/0xcfff/hostsctl/commands/common"
@@ -12,7 +14,6 @@ import (
 	"github.com/0xcfff/hostsctl/iotools"
 	"github.com/0xcfff/hostsctl/iptools"
 	"github.com/spf13/cobra"
-	"golang.org/x/exp/maps"
 	"gopkg.in/yaml.v3"
 )
 
@@ -71,8 +72,8 @@ func NewCmdAliasList() *cobra.Command {
 	}
 
 	cmd.Flags().BoolVar(&opt.noHeaders, "no-headers", opt.noHeaders, "Disable printing headers")
-	cmd.Flags().StringVarP(&opt.output, "output", "o", opt.output, fmt.Sprintf("Output format. One of %s", strings.Join(maps.Keys(formats), ",")))
-	cmd.Flags().StringVarP(&opt.arrange, "arrange", "a", opt.arrange, fmt.Sprintf("IPs output grouping. One of %s.", strings.Join(maps.Keys(groupings), ",")))
+	cmd.Flags().StringVarP(&opt.output, "output", "o", opt.output, fmt.Sprintf("Output format. One of %s", strings.Join(slices.Sorted(maps.Keys(formats)), ",")))
+	cmd.Flags().StringVarP(&opt.arrange, "arrange", "a", opt.arrange, fmt.Sprintf("IPs output grouping. One of %s.", strings.Join(slices.Sorted(maps.Keys(groupings)), ",")))
 
 	return cmd
 }

commands/alias/model.go

@@ -4,7 +4,7 @@ import (
 	"strings"
 
 	"github.com/0xcfff/hostsctl/hosts/dom"
-	"golang.org/x/exp/slices"
+	"slices"
 )
 
 type AliasModel struct {

commands/block/delete.go

@@ -9,7 +9,7 @@ import (
 	"github.com/0xcfff/hostsctl/hosts"
 	"github.com/0xcfff/hostsctl/hosts/dom"
 	"github.com/spf13/cobra"
-	"golang.org/x/exp/slices"
+	"slices"
 )
 
 type BlockDeleteOptions struct {

commands/block/list.go

@@ -4,6 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"maps"
+	"slices"
 	"strconv"
 	"strings"
 
@@ -12,7 +14,6 @@ import (
 	"github.com/0xcfff/hostsctl/hosts/dom"
 	"github.com/0xcfff/hostsctl/iotools"
 	"github.com/spf13/cobra"
-	"golang.org/x/exp/maps"
 	"gopkg.in/yaml.v3"
 )
 
@@ -60,7 +61,7 @@ func NewCmdBlockList() *cobra.Command {
 	}
 
 	cmd.Flags().BoolVar(&opt.noHeaders, "no-headers", opt.noHeaders, "Disable printing headers")
-	cmd.Flags().StringVarP(&opt.output, "output", "o", opt.output, fmt.Sprintf("Output format. One of %s", strings.Join(maps.Keys(formats), ",")))
+	cmd.Flags().StringVarP(&opt.output, "output", "o", opt.output, fmt.Sprintf("Output format. One of %s", strings.Join(slices.Sorted(maps.Keys(formats)), ",")))
 
 	return cmd
 }

commands/block/model.go

@@ -10,7 +10,7 @@ type BlockModel struct {
 	Name               string `json:"name"              yaml:"name"`
 	Comment            string `json:"comment,omitempty" yaml:"comment,omitempty"`
 	AliasesCount       int    `json:"count,omitempty"   yaml:"count,omitempty"`
-	SystemAliasesCount int    `json:"-"   				yaml:"-"`
+	SystemAliasesCount int    `json:"-"                  yaml:"-"`
 }
 
 func NewBlocksModels(doc *dom.Document) []*BlockModel {

go.mod

@@ -1,26 +1,22 @@
 module github.com/0xcfff/hostsctl
 
-go 1.20
+go 1.26
 
 require (
-	github.com/sirupsen/logrus v1.9.0
-	github.com/spf13/cobra v1.5.0
+	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de
+	github.com/spf13/cobra v1.10.2
 )
 
 require (
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/kr/pretty v0.3.0 // indirect
-	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spf13/pflag v1.0.9 // indirect
+	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
 )
 
 require (
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/spf13/afero v1.9.2
-	github.com/stretchr/testify v1.8.0
-	golang.org/x/exp v0.0.0-20221002003631-540bb7301a08
-	golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
-	golang.org/x/text v0.3.7 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
+	github.com/spf13/afero v1.15.0
+	github.com/stretchr/testify v1.12.0
+	golang.org/x/text v0.41.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1
 )