Updated to Go 1.23

uhppoted · Aug 23, 2024 · 7ad80d7 · 7ad80d7
1 parent 2c95fc2
commit 7ad80d7
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 18 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ jobs:
     - name: Set up Go 1.x
       uses: actions/setup-go@v5
       with:
-        go-version: ^1.22
+        go-version: ^1.23
         cache: false
 
     - name: Checkout uhppote-core

diff --git a/.github/workflows/ghcr.yml b/.github/workflows/ghcr.yml
@@ -15,7 +15,7 @@ jobs:
     - name: Set up Go 1.x
       uses: actions/setup-go@v5
       with:
-        go-version: ^1.22
+        go-version: ^1.23
         cache: false
 
     - name: Install staticcheck

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 
 ### Updated
 1. Reworked event handling to use connected UDP socket to send events.
+2. Updated to Go 1.23.
 
 
 ## [0.8.8](https://github.com/uhppoted/uhppote-simulator/releases/tag/v0.8.8) - 2024-03-27

diff --git a/TODO.md b/TODO.md
@@ -1,19 +1,8 @@
 # TODO
 
 - [x] https://github.com/uhppoted/uhppote-simulator/issues/9
-
 - [x] TCP/IP protocol (cf. https://github.com/uhppoted/uhppote-core/issues/17)
-      - [x] Rework UDP handling so that `if request.SerialNumber == s.SerialNumber` returns false
-      - [x] TCP accept socket
-      - [x] Rework UDP request handling
-      - [x] Rework UDP event handling
-      - [x] Update docker images, etc
-      - [x] CHANGELOG
-      - [x] README
-
-- [x] _405419896   error loading tasklist (unexpected end of JSON input)_
-- [x] Check `dump` udp/tcp packet labellingmay be mislabelling udp/tcp packets
-
+- [x] Update to Go 1.23 (cf. https://github.com/uhppoted/uhppoted/issues/53)
 
 ## TODO
 

diff --git a/go.mod b/go.mod
@@ -1,8 +1,8 @@
 module github.com/uhppoted/uhppote-simulator
 
-go 1.22
+go 1.23
 
 require (
-	github.com/uhppoted/uhppote-core v0.8.9-0.20240624170631-6e4dc3a26486
-	github.com/uhppoted/uhppoted-lib v0.8.9-0.20240624171129-71bfbf7969b5
+	github.com/uhppoted/uhppote-core v0.8.9-0.20240823182843-e0981da9c4a4
+	github.com/uhppoted/uhppoted-lib v0.8.9-0.20240823183521-d127a710cea0
 )
diff --git a/go.sum b/go.sum
@@ -78,6 +78,8 @@ github.com/uhppoted/uhppote-core v0.8.9-0.20240621163845-0f2c4816e848 h1:BXgPJVS
 github.com/uhppoted/uhppote-core v0.8.9-0.20240621163845-0f2c4816e848/go.mod h1:Q+DHtT8s74efLs2b0eF20DRBUL9yBkySwaTQ+0lsEVM=
 github.com/uhppoted/uhppote-core v0.8.9-0.20240624170631-6e4dc3a26486 h1:mUSkpgClFvkWJ84L1S1066cjd2RRUjksmXO7HSHTZDY=
 github.com/uhppoted/uhppote-core v0.8.9-0.20240624170631-6e4dc3a26486/go.mod h1:Q+DHtT8s74efLs2b0eF20DRBUL9yBkySwaTQ+0lsEVM=
+github.com/uhppoted/uhppote-core v0.8.9-0.20240823182843-e0981da9c4a4 h1:7zcs93hYt0sBp+kCIbgju4Tgc1zvaRVgReksSs4K1uM=
+github.com/uhppoted/uhppote-core v0.8.9-0.20240823182843-e0981da9c4a4/go.mod h1:oUQdz4NBMXkcwzEHUd6lYQgF6He32+jnb+FMwehZRwg=
 github.com/uhppoted/uhppoted-lib v0.8.5 h1:X5RarX5QMRGJvOwPk8ceowrH8k6Ow3t+TraWmhYO950=
 github.com/uhppoted/uhppoted-lib v0.8.5/go.mod h1:euK2cLO934w0GDgvvnWMjYNtZ29K1xSMrMse6THOzDQ=
 github.com/uhppoted/uhppoted-lib v0.8.6-0.20230714155133-57e68f2d1360 h1:XaVqmMmjwskTrX6iCdUl2I4ezrvuoA/yhLzf/455E10=
@@ -158,3 +160,5 @@ github.com/uhppoted/uhppoted-lib v0.8.9-0.20240621164457-8103bdf55831 h1:Y67K5dB
 github.com/uhppoted/uhppoted-lib v0.8.9-0.20240621164457-8103bdf55831/go.mod h1:Pj+5dhzmwQiLJK9aMQBMoaLU00Loeyv/UdGspDozReQ=
 github.com/uhppoted/uhppoted-lib v0.8.9-0.20240624171129-71bfbf7969b5 h1:Vo0V3T/VMFaZlqTDre3ht9DGxEceuUXmDlAZeKeEx+g=
 github.com/uhppoted/uhppoted-lib v0.8.9-0.20240624171129-71bfbf7969b5/go.mod h1:Rrms8n4z4xoLAcpmeMmXdXG9kakovAbw+7/zSmjzY2s=
+github.com/uhppoted/uhppoted-lib v0.8.9-0.20240823183521-d127a710cea0 h1:ZD9n1Q6w2ykR2KoORUKo2s4lFLiWsCwMj5ByYec12bU=
+github.com/uhppoted/uhppoted-lib v0.8.9-0.20240823183521-d127a710cea0/go.mod h1:vz01fBAy8QYbwUGBCfFEZh5naPt9Ma6SHlzp/SIRLcE=
diff --git a/simulator/UT0311L04/UTC0311L04.go b/simulator/UT0311L04/UTC0311L04.go
@@ -348,7 +348,7 @@ func unmarshal(bytes []byte, filepath string, compressed bool) (*UT0311L04, erro
 		Tasks: []types.Task{},
 	}
 
-	if object.TaskList != nil && len(object.TaskList) > 0 {
+	if len(object.TaskList) > 0 {
 		if err := json.Unmarshal(object.TaskList, &tasklist); err != nil {
 			warnf(object.SerialNumber, "error loading tasklist (%v)", err)
 		}