Update deps and Go (#245)

* Fix master build due deps error * update deps * update Go in build image * update all Go versions
ThreeDotsLabs · Oct 9, 2021 · 4cbfb90 · 4cbfb90
1 parent 08b7014
commit 4cbfb90
Show file tree

Hide file tree

Showing 12 changed files with 169 additions and 63 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -35,7 +35,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: golang:1.12
+      - image: golang:1.17
     steps:
       - checkout
       - run: go build ./...

diff --git a/.circleci/docker-compose.override.yml b/.circleci/docker-compose.override.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   watermill:
-    image: golang:1.12
+    image: golang:1.17
     command: /bin/true
     volumes:
       - .:/app

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.12
+    image: golang:1.17
     restart: unless-stopped
     depends_on:
     - kafka

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.12
+    image: golang:1.17
     restart: unless-stopped
     depends_on:
     - kafka
@@ -12,7 +12,7 @@ services:
     command: go run main.go
 
   consumer:
-    image: golang:1.12
+    image: golang:1.17
     restart: unless-stopped
     depends_on:
     - kafka

diff --git a/_examples/basic/5-cqrs-protobuf/docker-compose.yml b/_examples/basic/5-cqrs-protobuf/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   golang:
-    image: golang:1.12
+    image: golang:1.17
     restart: unless-stopped
     ports:
     - 8080:8080

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

diff --git a/_examples/real-world-examples/persistent-event-log/docker-compose.yml b/_examples/real-world-examples/persistent-event-log/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   server:
-    image: golang:1.12
+    image: golang:1.17
     restart: unless-stopped
     depends_on:
       - mysql

diff --git a/_examples/real-world-examples/synchronizing-databases/docker-compose.yml b/_examples/real-world-examples/synchronizing-databases/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   server:
-    image: golang:1.12
+    image: golang:1.17
     restart: unless-stopped
     depends_on:
       - mysql

diff --git a/_examples/real-world-examples/transactional-events/docker-compose.yml b/_examples/real-world-examples/transactional-events/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   server:
-    image: golang:1.12
+    image: golang:1.17
     restart: unless-stopped
     depends_on:
       - mysql

diff --git a/go.mod b/go.mod
@@ -1,30 +1,32 @@
 module github.com/ThreeDotsLabs/watermill
 
+go 1.17
+
 require (
-	github.com/cenkalti/backoff/v3 v3.0.0
+	github.com/cenkalti/backoff/v3 v3.2.2
 	github.com/go-chi/chi/v5 v5.0.4
-	github.com/gogo/protobuf v1.2.1
-	github.com/golang/protobuf v1.3.2
+	github.com/gogo/protobuf v1.3.2
+	github.com/golang/protobuf v1.5.2
 	github.com/google/uuid v1.3.0
-	github.com/hashicorp/go-multierror v1.0.0
+	github.com/hashicorp/go-multierror v1.1.1
 	github.com/lithammer/shortuuid/v3 v3.0.7
 	github.com/oklog/ulid v1.3.1
-	github.com/pkg/errors v0.8.1
-	github.com/prometheus/client_golang v1.0.0
-	github.com/prometheus/procfs v0.0.3 // indirect
-	github.com/stretchr/testify v1.4.0
-	golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa // indirect
+	github.com/pkg/errors v0.9.1
+	github.com/prometheus/client_golang v1.11.0
+	github.com/stretchr/testify v1.7.0
 )
 
 require (
-	github.com/beorn7/perks v1.0.0 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cespare/xxhash/v2 v2.1.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 // indirect
-	github.com/prometheus/common v0.4.1 // indirect
-	gopkg.in/yaml.v2 v2.2.2 // indirect
+	github.com/prometheus/client_model v0.2.0 // indirect
+	github.com/prometheus/common v0.26.0 // indirect
+	github.com/prometheus/procfs v0.6.0 // indirect
+	golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40 // indirect
+	google.golang.org/protobuf v1.26.0 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
 )
-
-go 1.17
diff --git a/go.sum b/go.sum
diff --git a/tools/mill/go.mod b/tools/mill/go.mod
@@ -1,46 +1,40 @@
 module github.com/ThreeDotsLabs/watermill/tools/mill
 
+go 1.17
+
 require (
-	cloud.google.com/go v0.97.0 // indirect
 	cloud.google.com/go/pubsub v1.17.0
 	github.com/Shopify/sarama v1.30.0
 	github.com/ThreeDotsLabs/watermill v1.2.0-rc.5
 	github.com/ThreeDotsLabs/watermill-amqp v1.1.2
 	github.com/ThreeDotsLabs/watermill-googlecloud v1.0.9
 	github.com/ThreeDotsLabs/watermill-io v1.0.3
 	github.com/ThreeDotsLabs/watermill-kafka/v2 v2.2.1
-	github.com/cenkalti/backoff/v3 v3.2.2 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/google/uuid v1.3.0 // indirect
-	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/lithammer/shortuuid/v3 v3.0.7 // indirect
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/pkg/errors v0.9.1
 	github.com/spf13/cobra v1.2.1
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.9.0
-	github.com/streadway/amqp v1.0.0 // indirect
-	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
-	golang.org/x/net v0.0.0-20211008194852-3b03d305991f // indirect
-	golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1 // indirect
-	golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac // indirect
-	google.golang.org/api v0.58.0 // indirect
-	google.golang.org/genproto v0.0.0-20211008145708-270636b82663 // indirect
-	google.golang.org/grpc v1.41.0 // indirect
+	google.golang.org/api v0.58.0
 	gopkg.in/yaml.v2 v2.4.0
 )
 
 require (
+	cloud.google.com/go v0.97.0 // indirect
+	github.com/cenkalti/backoff/v3 v3.2.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/eapache/go-resiliency v1.2.0 // indirect
 	github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
 	github.com/eapache/queue v1.1.0 // indirect
 	github.com/fsnotify/fsnotify v1.5.1 // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/go-cmp v0.5.6 // indirect
+	github.com/google/uuid v1.3.0 // indirect
 	github.com/googleapis/gax-go/v2 v2.1.1 // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/go-uuid v1.0.2 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
@@ -50,6 +44,7 @@ require (
 	github.com/jcmturner/gokrb5/v8 v8.4.2 // indirect
 	github.com/jcmturner/rpc/v2 v2.0.3 // indirect
 	github.com/klauspost/compress v1.13.6 // indirect
+	github.com/lithammer/shortuuid/v3 v3.0.7 // indirect
 	github.com/magiconair/properties v1.8.5 // indirect
 	github.com/mitchellh/mapstructure v1.4.2 // indirect
 	github.com/oklog/ulid v1.3.1 // indirect
@@ -59,13 +54,18 @@ require (
 	github.com/spf13/afero v1.6.0 // indirect
 	github.com/spf13/cast v1.4.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/streadway/amqp v1.0.0 // indirect
 	github.com/subosito/gotenv v1.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
+	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
+	golang.org/x/net v0.0.0-20211008194852-3b03d305991f // indirect
+	golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1 // indirect
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
+	golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac // indirect
 	golang.org/x/text v0.3.7 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/genproto v0.0.0-20211008145708-270636b82663 // indirect
+	google.golang.org/grpc v1.41.0 // indirect
 	google.golang.org/protobuf v1.27.1 // indirect
 	gopkg.in/ini.v1 v1.63.2 // indirect
 )
-
-go 1.17