Bump

.github/workflows/build_darwin.yml

@@ -9,12 +9,12 @@ jobs:
   build:
     runs-on: macos-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Set up Go
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v4
       with:
-        go-version: 1.17
+        go-version: 1.21
 
     - name: Build
       run: ./tools/build_darwin.sh

.github/workflows/build_linux_gtk3.yaml

@@ -9,12 +9,12 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Set up Go
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v4
       with:
-        go-version: 1.17
+        go-version: 1.21
 
     - name: Build dependents
       run: |

.github/workflows/build_windows.yml

@@ -9,12 +9,12 @@ jobs:
   build:
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Set up Go
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v4
       with:
-        go-version: 1.17
+        go-version: 1.21
 
     - name: Build
       run: ./tools/build_windows.bat

app/tray/app.go

@@ -5,11 +5,11 @@ import (
 	"path/filepath"
 	"time"
 
+	"fyne.io/systray"
 	"github.com/wzshiming/jumpway/config"
 	"github.com/wzshiming/jumpway/i18n"
 	"github.com/wzshiming/jumpway/log"
 	"github.com/wzshiming/notify"
-	"github.com/wzshiming/systray"
 )
 
 type App struct {

app/tray/on_ready.go

@@ -1,9 +1,9 @@
 package tray
 
 import (
+	"fyne.io/systray"
 	"github.com/wzshiming/jumpway/i18n"
 	"github.com/wzshiming/jumpway/icon"
-	"github.com/wzshiming/systray"
 )
 
 func (a *App) onReady() {

app/tray/tray_about.go

@@ -1,10 +1,10 @@
 package tray
 
 import (
+	"fyne.io/systray"
 	"github.com/pkg/browser"
 	"github.com/wzshiming/jumpway/i18n"
 	"github.com/wzshiming/jumpway/log"
-	"github.com/wzshiming/systray"
 )
 
 func (a *App) ItemAbout(menu *systray.MenuItem) {

app/tray/tray_daemon.go

@@ -1,8 +1,8 @@
 package tray
 
 import (
+	"fyne.io/systray"
 	"github.com/wzshiming/jumpway/daemon"
-	"github.com/wzshiming/systray"
 )
 
 func (a *App) ItemDaemon(menu *systray.MenuItem) {

app/tray/tray_edit_config.go

@@ -1,10 +1,10 @@
 package tray
 
 import (
+	"fyne.io/systray"
 	"github.com/wzshiming/jumpway/config"
 	"github.com/wzshiming/jumpway/i18n"
 	"github.com/wzshiming/jumpway/log"
-	"github.com/wzshiming/systray"
 )
 
 func (a *App) ItemEditConfig(menu *systray.MenuItem) {

app/tray/tray_export_command.go

@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"net"
 
+	"fyne.io/systray"
 	"github.com/atotto/clipboard"
 	"github.com/wzshiming/jumpway/i18n"
 	"github.com/wzshiming/jumpway/log"
-	"github.com/wzshiming/systray"
 )
 
 func (a *App) ItemExportCommand(menu *systray.MenuItem) {

app/tray/tray_log.go

@@ -1,10 +1,10 @@
 package tray
 
 import (
+	"fyne.io/systray"
 	"github.com/pkg/browser"
 	"github.com/wzshiming/jumpway/i18n"
 	"github.com/wzshiming/jumpway/log"
-	"github.com/wzshiming/systray"
 )
 
 func (a *App) ItemLog(menu *systray.MenuItem) {

app/tray/tray_quit.go

@@ -1,7 +1,7 @@
 package tray
 
 import (
-	"github.com/wzshiming/systray"
+	"fyne.io/systray"
 )
 
 func (a *App) ItemQuit(menu *systray.MenuItem) {

app/tray/tray_reload_config.go

@@ -5,6 +5,7 @@ import (
 	"net"
 	"strconv"
 
+	"fyne.io/systray"
 	"github.com/wzshiming/bridge/chain"
 	"github.com/wzshiming/bridge/protocols/local"
 	"github.com/wzshiming/hostmatcher"
@@ -13,7 +14,6 @@ import (
 	"github.com/wzshiming/jumpway/i18n"
 	"github.com/wzshiming/jumpway/log"
 	"github.com/wzshiming/jumpway/utils"
-	"github.com/wzshiming/systray"
 )
 
 func (a *App) ItemReloadConfig(menu *systray.MenuItem) {

app/tray/tray_status.go

@@ -1,8 +1,8 @@
 package tray
 
 import (
+	"fyne.io/systray"
 	"github.com/wzshiming/jumpway/i18n"
-	"github.com/wzshiming/systray"
 )
 
 func (a *App) ItemStatus(menu *systray.MenuItem) {

app/tray/tray_system_proxy.go

@@ -1,10 +1,10 @@
 package tray
 
 import (
+	"fyne.io/systray"
 	"github.com/wzshiming/jumpway/i18n"
 	"github.com/wzshiming/jumpway/log"
 	"github.com/wzshiming/sysproxy"
-	"github.com/wzshiming/systray"
 )
 
 func (a *App) ItemProxyMode(global, manual *systray.MenuItem) {

app/tray/tray_view.go

@@ -3,18 +3,18 @@ package tray
 import (
 	"fmt"
 
+	"fyne.io/systray"
 	"github.com/pkg/browser"
 	"github.com/wzshiming/jumpway/i18n"
-	"github.com/wzshiming/logger"
-	"github.com/wzshiming/systray"
+	"github.com/wzshiming/jumpway/log"
 )
 
 func (a *App) ItemView(menu *systray.MenuItem) {
 	var err error
 	for range menu.ClickedCh {
 		err = browser.OpenURL(fmt.Sprintf("http://%s", a.Address))
 		if err != nil {
-			logger.Log.Error(err, i18n.ViewEditConfig())
+			log.Error(err, i18n.ViewEditConfig())
 		}
 	}
 }

daemon/kind_darwin.go

@@ -1,3 +1,4 @@
+//go:build darwin
 // +build darwin
 
 package daemon

daemon/kind_other.go

@@ -1,3 +1,4 @@
+//go:build !darwin
 // +build !darwin
 
 package daemon

go.mod

@@ -1,52 +1,50 @@
 module github.com/wzshiming/jumpway
 
-go 1.19
+go 1.21
 
 require (
+	fyne.io/systray v1.10.0
 	github.com/Xuanwo/go-locale v1.1.0
 	github.com/atotto/clipboard v0.1.4
-	github.com/gorilla/handlers v1.5.1
-	github.com/gorilla/mux v1.8.0
+	github.com/gorilla/handlers v1.5.2
+	github.com/gorilla/mux v1.8.1
 	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
 	github.com/takama/daemon v1.0.0
 	github.com/wzshiming/anyproxy v0.5.4
 	github.com/wzshiming/bridge v0.7.13
-	github.com/wzshiming/cmux v0.2.2
+	github.com/wzshiming/cmux v0.3.2
 	github.com/wzshiming/hostmatcher v0.0.1
-	github.com/wzshiming/httpcache v0.3.1
-	github.com/wzshiming/logger v0.1.0
+	github.com/wzshiming/httpcache v0.4.0
 	github.com/wzshiming/notify v0.1.1
 	github.com/wzshiming/openapiui/v2 v2.0.0
 	github.com/wzshiming/sysnotify v0.0.2
 	github.com/wzshiming/sysproxy v0.2.2
-	github.com/wzshiming/systray v1.2.1
-	golang.org/x/text v0.4.0
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
+	golang.org/x/text v0.14.0
+	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
 	github.com/Microsoft/go-winio v0.5.2 // indirect
 	github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
-	github.com/felixge/httpsnoop v1.0.1 // indirect
-	github.com/go-logr/logr v0.3.0 // indirect
-	github.com/go-logr/zapr v0.3.0 // indirect
+	github.com/felixge/httpsnoop v1.0.3 // indirect
+	github.com/godbus/dbus/v5 v5.0.4 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
+	github.com/kr/pretty v0.1.0 // indirect
+	github.com/tevino/abool v1.2.0 // indirect
 	github.com/wzshiming/commandproxy v0.2.0 // indirect
 	github.com/wzshiming/emux v0.2.1 // indirect
-	github.com/wzshiming/httpproxy v0.4.1 // indirect
+	github.com/wzshiming/httpproxy v0.5.4 // indirect
 	github.com/wzshiming/schedialer v0.2.1 // indirect
-	github.com/wzshiming/shadowsocks v0.3.1 // indirect
-	github.com/wzshiming/socks4 v0.3.1 // indirect
-	github.com/wzshiming/socks5 v0.4.1 // indirect
-	github.com/wzshiming/sshd v0.2.1 // indirect
-	github.com/wzshiming/sshproxy v0.4.1 // indirect
-	github.com/wzshiming/trie v0.0.1 // indirect
+	github.com/wzshiming/shadowsocks v0.4.0 // indirect
+	github.com/wzshiming/socks4 v0.3.2 // indirect
+	github.com/wzshiming/socks5 v0.4.3 // indirect
+	github.com/wzshiming/sshd v0.2.2 // indirect
+	github.com/wzshiming/sshproxy v0.4.3 // indirect
+	github.com/wzshiming/trie v0.1.1 // indirect
 	github.com/xtaci/smux v1.5.16 // indirect
-	go.uber.org/atomic v1.7.0 // indirect
-	go.uber.org/multierr v1.6.0 // indirect
-	go.uber.org/zap v1.20.0 // indirect
-	golang.org/x/crypto v0.1.0 // indirect
-	golang.org/x/net v0.1.0 // indirect
-	golang.org/x/sync v0.1.0 // indirect
-	golang.org/x/sys v0.1.0 // indirect
+	golang.org/x/crypto v0.16.0 // indirect
+	golang.org/x/net v0.10.0 // indirect
+	golang.org/x/sync v0.5.0 // indirect
+	golang.org/x/sys v0.15.0 // indirect
+	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
 )