update Go to 1.21

ThreeDotsLabs · Sep 24, 2023 · 970bc4b · 970bc4b
1 parent a9a238f
commit 970bc4b
Show file tree

Hide file tree

Showing 55 changed files with 70 additions and 72 deletions.
diff --git a/.github/workflows/pr-examples.yml b/.github/workflows/pr-examples.yml
@@ -11,6 +11,6 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '^1.19.1'
+          go-version: '^1.21.1'
       - run: make validate_examples
         timeout-minutes: 30
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -14,15 +14,15 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '^1.19.1'
+          go-version: '^1.21.1'
       - run: make build
   lint:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '^1.19.1'
+          go-version: '^1.21.1'
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
   tests:
@@ -32,7 +32,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '^1.19.1'
+          go-version: '^1.21.1'
       - run: cat .env >> $GITHUB_ENV || true
       - run: make up
       - run: make wait

diff --git a/_examples/basic/1-your-first-app/docker-compose.yml b/_examples/basic/1-your-first-app/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   server:
-    image: golang:1.19
+    image: golang:1.21
     restart: unless-stopped
     depends_on:
     - kafka

diff --git a/_examples/basic/1-your-first-app/go.mod b/_examples/basic/1-your-first-app/go.mod
@@ -37,4 +37,4 @@ require (
 	golang.org/x/net v0.5.0 // indirect
 )
 
-go 1.19
+go 1.21
diff --git a/_examples/basic/2-realtime-feed/consumer/go.mod b/_examples/basic/2-realtime-feed/consumer/go.mod
@@ -37,4 +37,4 @@ require (
 	golang.org/x/net v0.5.0 // indirect
 )
 
-go 1.19
+go 1.21
diff --git a/_examples/basic/2-realtime-feed/docker-compose.yml b/_examples/basic/2-realtime-feed/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   producer:
-    image: golang:1.19
+    image: golang:1.21
     restart: unless-stopped
     depends_on:
     - kafka
@@ -12,7 +12,7 @@ services:
     command: go run main.go
 
   consumer:
-    image: golang:1.19
+    image: golang:1.21
     restart: unless-stopped
     depends_on:
     - kafka

diff --git a/_examples/basic/2-realtime-feed/producer/go.mod b/_examples/basic/2-realtime-feed/producer/go.mod
@@ -38,4 +38,4 @@ require (
 	golang.org/x/net v0.5.0 // indirect
 )
 
-go 1.19
+go 1.21
diff --git a/_examples/basic/3-router/go.mod b/_examples/basic/3-router/go.mod
@@ -12,4 +12,4 @@ require (
 	github.com/pkg/errors v0.9.1 // indirect
 )
 
-go 1.19
+go 1.21
diff --git a/_examples/basic/4-metrics/docker-compose.yml b/_examples/basic/4-metrics/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   golang:
-    image: golang:1.19
+    image: golang:1.21
     restart: unless-stopped
     ports:
     - 8080:8080

diff --git a/_examples/basic/4-metrics/go.mod b/_examples/basic/4-metrics/go.mod
@@ -26,4 +26,4 @@ require (
 // uncomment to use local sources
 // replace github.com/ThreeDotsLabs/watermill => ../../../../watermill
 
-go 1.19
+go 1.21
diff --git a/_examples/basic/5-cqrs-protobuf/go.mod b/_examples/basic/5-cqrs-protobuf/go.mod
@@ -19,4 +19,4 @@ require (
 	google.golang.org/protobuf v1.28.1 // indirect
 )
 
-go 1.19
+go 1.21
diff --git a/_examples/pubsubs/amqp/docker-compose.yml b/_examples/pubsubs/amqp/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   server:
-    image: golang:1.19
+    image: golang:1.21
     restart: unless-stopped
     depends_on:
       - rabbitmq

diff --git a/_examples/pubsubs/amqp/go.mod b/_examples/pubsubs/amqp/go.mod
@@ -16,4 +16,4 @@ require (
 	github.com/rabbitmq/amqp091-go v1.6.1 // indirect
 )
 
-go 1.19
+go 1.21
diff --git a/_examples/pubsubs/go-channel/go.mod b/_examples/pubsubs/go-channel/go.mod
@@ -9,4 +9,4 @@ require (
 	github.com/pkg/errors v0.9.1 // indirect
 )
 
-go 1.19
+go 1.21
diff --git a/_examples/pubsubs/googlecloud/docker-compose.yml b/_examples/pubsubs/googlecloud/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   server:
-    image: golang:1.19
+    image: golang:1.21
     restart: unless-stopped
     depends_on:
       - googlecloud

diff --git a/_examples/pubsubs/googlecloud/go.mod b/_examples/pubsubs/googlecloud/go.mod
@@ -36,4 +36,4 @@ require (
 	google.golang.org/protobuf v1.28.1 // indirect
 )
 
-go 1.19
+go 1.21
diff --git a/_examples/pubsubs/googlecloud/go.sum b/_examples/pubsubs/googlecloud/go.sum
@@ -137,7 +137,7 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
 google.golang.org/genproto v0.0.0-20230202175211-008b39050e57 h1:vArvWooPH749rNHpBGgVl+U9B9dATjiEhJzcWGlovNs=
 google.golang.org/genproto v0.0.0-20230202175211-008b39050e57/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
-google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.21.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=

diff --git a/_examples/pubsubs/kafka/docker-compose.yml b/_examples/pubsubs/kafka/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   server:
-    image: golang:1.19
+    image: golang:1.21
     restart: unless-stopped
     depends_on:
       - kafka

diff --git a/_examples/pubsubs/kafka/go.mod b/_examples/pubsubs/kafka/go.mod
@@ -36,4 +36,4 @@ require (
 	golang.org/x/net v0.5.0 // indirect
 )
 
-go 1.19
+go 1.21
diff --git a/_examples/pubsubs/nats-core/docker-compose.yml b/_examples/pubsubs/nats-core/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   server:
-    image: golang:1.19
+    image: golang:1.21
     restart: unless-stopped
     depends_on:
       - nats

diff --git a/_examples/pubsubs/nats-core/go.mod b/_examples/pubsubs/nats-core/go.mod
@@ -1,6 +1,6 @@
 module main
 
-go 1.19
+go 1.21
 
 require (
 	github.com/ThreeDotsLabs/watermill v1.2.0

diff --git a/_examples/pubsubs/nats-jetstream/docker-compose.yml b/_examples/pubsubs/nats-jetstream/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   server:
-    image: golang:1.19
+    image: golang:1.21
     restart: unless-stopped
     depends_on:
       - nats

diff --git a/_examples/pubsubs/nats-jetstream/go.mod b/_examples/pubsubs/nats-jetstream/go.mod
@@ -1,6 +1,6 @@
 module main
 
-go 1.19
+go 1.21
 
 require (
 	github.com/ThreeDotsLabs/watermill v1.2.0

diff --git a/_examples/pubsubs/nats-streaming/docker-compose.yml b/_examples/pubsubs/nats-streaming/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   server:
-    image: golang:1.19
+    image: golang:1.21
     restart: unless-stopped
     depends_on:
       - nats-streaming

diff --git a/_examples/pubsubs/nats-streaming/go.mod b/_examples/pubsubs/nats-streaming/go.mod
@@ -27,4 +27,4 @@ require (
 	golang.org/x/time v0.3.0 // indirect
 )
 
-go 1.19
+go 1.21
diff --git a/_examples/pubsubs/redisstream/docker-compose.yml b/_examples/pubsubs/redisstream/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   server:
-    image: golang:1.19
+    image: golang:1.21
     restart: unless-stopped
     depends_on:
       - redis

diff --git a/_examples/pubsubs/redisstream/go.mod b/_examples/pubsubs/redisstream/go.mod
@@ -1,6 +1,6 @@
 module main.go
 
-go 1.19
+go 1.21
 
 require (
 	github.com/ThreeDotsLabs/watermill v1.2.0-rc.11

diff --git a/_examples/pubsubs/sql/go.mod b/_examples/pubsubs/sql/go.mod
@@ -1,6 +1,6 @@
 module main.go
 
-go 1.19
+go 1.21
 
 require (
 	github.com/ThreeDotsLabs/watermill v1.3.1

diff --git a/_examples/real-world-examples/consumer-groups/docker-compose.yml b/_examples/real-world-examples/consumer-groups/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   api:
-    image: golang:1.19
+    image: golang:1.21
     restart: unless-stopped
     depends_on:
       - redis
@@ -13,7 +13,7 @@ services:
     command: go run .
 
   newsletter-1:
-    image: golang:1.19
+    image: golang:1.21
     restart: unless-stopped
     depends_on:
       - redis
@@ -25,7 +25,7 @@ services:
       REPLICA: 1
 
   newsletter-2:
-    image: golang:1.19
+    image: golang:1.21
     restart: unless-stopped
     depends_on:
       - redis
@@ -37,7 +37,7 @@ services:
       REPLICA: 2
 
   crm-1:
-    image: golang:1.19
+    image: golang:1.21
     restart: unless-stopped
     depends_on:
       - redis
@@ -49,7 +49,7 @@ services:
       REPLICA: 1
 
   crm-2:
-    image: golang:1.19
+    image: golang:1.21
     restart: unless-stopped
     depends_on:
       - redis

diff --git a/_examples/real-world-examples/consumer-groups/go.mod b/_examples/real-world-examples/consumer-groups/go.mod
@@ -1,6 +1,6 @@
 module github.com/ThreeDotsLabs/watermill-routing-example/server
 
-go 1.19
+go 1.21
 
 require (
 	github.com/ThreeDotsLabs/watermill v1.2.0

diff --git a/_examples/real-world-examples/exactly-once-delivery-counter/server/go.mod b/_examples/real-world-examples/exactly-once-delivery-counter/server/go.mod
@@ -1,6 +1,6 @@
 module exactly-once-delivery
 
-go 1.19
+go 1.21
 
 require (
 	github.com/ThreeDotsLabs/watermill v1.3.1

diff --git a/_examples/real-world-examples/exactly-once-delivery-counter/worker/go.mod b/_examples/real-world-examples/exactly-once-delivery-counter/worker/go.mod
@@ -1,6 +1,6 @@
 module exactly-once-delivery
 
-go 1.19
+go 1.21
 
 require (
 	github.com/ThreeDotsLabs/watermill v1.3.1

diff --git a/_examples/real-world-examples/persistent-event-log/go.mod b/_examples/real-world-examples/persistent-event-log/go.mod
@@ -1,6 +1,6 @@
 module main.go
 
-go 1.19
+go 1.21
 
 require (
 	github.com/ThreeDotsLabs/watermill v1.3.1

diff --git a/_examples/real-world-examples/persistent-event-log/go.sum b/_examples/real-world-examples/persistent-event-log/go.sum
@@ -152,7 +152,7 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
 google.golang.org/genproto v0.0.0-20230202175211-008b39050e57 h1:vArvWooPH749rNHpBGgVl+U9B9dATjiEhJzcWGlovNs=
 google.golang.org/genproto v0.0.0-20230202175211-008b39050e57/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
-google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.21.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=

diff --git a/_examples/real-world-examples/receiving-webhooks/docker-compose.yml b/_examples/real-world-examples/receiving-webhooks/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   golang:
-    image: golang:1.19
+    image: golang:1.21
     restart: unless-stopped
     ports:
     - 8080:8080

diff --git a/_examples/real-world-examples/receiving-webhooks/go.mod b/_examples/real-world-examples/receiving-webhooks/go.mod
@@ -41,4 +41,4 @@ require (
 	golang.org/x/net v0.5.0 // indirect
 )
 
-go 1.19
+go 1.21
diff --git a/_examples/real-world-examples/sending-webhooks/docker-compose.yml b/_examples/real-world-examples/sending-webhooks/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   webhooks-server:
-    image: golang:1.19
+    image: golang:1.21
     restart: unless-stopped
     volumes:
     - .:/app
@@ -10,7 +10,7 @@ services:
     command: go run main.go
 
   router:
-    image: golang:1.19
+    image: golang:1.21
     restart: unless-stopped
     depends_on:
       - kafka
@@ -21,7 +21,7 @@ services:
     command: go run main.go
 
   producer:
-    image: golang:1.19
+    image: golang:1.21
     restart: unless-stopped
     depends_on:
     - kafka

diff --git a/_examples/real-world-examples/sending-webhooks/producer/go.mod b/_examples/real-world-examples/sending-webhooks/producer/go.mod
@@ -36,4 +36,4 @@ require (
 	golang.org/x/net v0.5.0 // indirect
 )
 
-go 1.19
+go 1.21
diff --git a/_examples/real-world-examples/sending-webhooks/router/go.mod b/_examples/real-world-examples/sending-webhooks/router/go.mod
@@ -40,4 +40,4 @@ require (
 	golang.org/x/net v0.5.0 // indirect
 )
 
-go 1.19
+go 1.21
diff --git a/_examples/real-world-examples/server-sent-events/docker-compose.yml b/_examples/real-world-examples/server-sent-events/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   server:
-    image: golang:1.19
+    image: golang:1.21
     restart: unless-stopped
     ports:
       - 8080:8080

diff --git a/_examples/real-world-examples/server-sent-events/server/go.mod b/_examples/real-world-examples/server-sent-events/server/go.mod
@@ -1,6 +1,6 @@
 module main.go
 
-go 1.19
+go 1.21
 
 require (
 	github.com/ThreeDotsLabs/watermill v1.2.0-rc.11
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,4 +37,4 @@ require ( @@
     	golang.org/x/net v0.5.0 // indirect
     )
-    go 1.19
+    go 1.21