Merge 60a7ff150d into a6481c8847

.github/workflows/go.yml

@@ -9,14 +9,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-      - name: Set up Go 1.21
+      - name: Set up Go 1.22
         uses: actions/setup-go@v5
         with:
-          go-version: 1.21
+          go-version: 1.22
         id: go
 
       - name: Check out code into the Go module directory
         uses: actions/checkout@v4
 
-      - name: Build
+      - name: Build icecon binary
-        run: go build -v .
+        run: go build -v ./cmd/icecon

cmd/icecon/main.go

@@ -98,10 +98,8 @@ func main() {
 	}
 
 	// Which UI should be run?
-	log.Println("Starting user interface.")
 	if err := ui.Run(rconClient, wantGui); err != nil {
 		log.Fatal("User interface failed:", err)
 		return
 	}
-	log.Println("Done.")
 }

internal/ui/ui.go

@@ -3,8 +3,6 @@ package ui
 import (
 	"errors"
 	"fmt"
-	"log"
-	"reflect"
 	"slices"
 
 	"github.com/icedream/icecon/internal/rcon"
@@ -59,7 +57,6 @@ func Run(rconClient *rcon.Client, wantGraphical bool) error {
 		if err != nil {
 			return fmt.Errorf("failed to instantiate user interface: %w", err)
 		}
-		log.Println("Found user interface:", reflect.TypeOf(ui))
 		return ui.Run()
 	}
 	return ErrNotSupported

internal/ui/windows/connectdialog_windows_ui.go

@@ -1,7 +1,8 @@
 // This file was created by ui2walk and may be regenerated.
 // DO NOT EDIT OR YOUR MODIFICATIONS WILL BE LOST!
 
-//+build windows
+//go:build windows
+// +build windows
 
 package windows
 

internal/ui/windows/dialog_windows_ui.go

@@ -1,7 +1,8 @@
 // This file was created by ui2walk and may be regenerated.
 // DO NOT EDIT OR YOUR MODIFICATIONS WILL BE LOST!
 
-//+build windows
+//go:build windows
+// +build windows
 
 package windows
 

internal/ui/windows/gen.go

@@ -1,3 +1,3 @@
 package windows
 
-//go:generate go run -mod=mod github.com/icedream/ui2walk
+//go:generate go run -mod=mod github.com/icedream/ui2walk -pkg $GOPACKAGE