From 4fc22e25baaedd9c0bedd45d671e883a41ce860c Mon Sep 17 00:00:00 2001
From: James Houlahan <james.houlahan@proton.ch>
Date: Tue, 4 Oct 2022 09:04:56 +0200
Subject: [PATCH] GODT-1650: Bump gluon to latest version

---
 go.mod                                   | 2 +-
 go.sum                                   | 4 ++--
 internal/frontend/grpc/bridge.pb.go      | 5 +++--
 internal/frontend/grpc/bridge_grpc.pb.go | 1 +
 internal/user/user.go                    | 4 ++--
 utils/gobinsec_update/main.go            | 3 ++-
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/go.mod b/go.mod
index 8365427d..1905b0b8 100644
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ go 1.18
 require (
 	github.com/0xAX/notificator v0.0.0-20220220101646-ee9b8921e557
 	github.com/Masterminds/semver/v3 v3.1.1
-	github.com/ProtonMail/gluon v0.11.1-0.20221001180052-2e11f5804b8a
+	github.com/ProtonMail/gluon v0.11.1-0.20221003131446-151fe7c114e2
 	github.com/ProtonMail/go-autostart v0.0.0-20210130080809-00ed301c8e9a
 	github.com/ProtonMail/go-rfc5322 v0.11.0
 	github.com/ProtonMail/gopenpgp/v2 v2.4.10
diff --git a/go.sum b/go.sum
index 88dd4047..1b8d6912 100644
--- a/go.sum
+++ b/go.sum
@@ -29,8 +29,8 @@ github.com/ProtonMail/bcrypt v0.0.0-20211005172633-e235017c1baf h1:yc9daCCYUefEs
 github.com/ProtonMail/bcrypt v0.0.0-20211005172633-e235017c1baf/go.mod h1:o0ESU9p83twszAU8LBeJKFAAMX14tISa0yk4Oo5TOqo=
 github.com/ProtonMail/docker-credential-helpers v1.1.0 h1:+kvUIpwWcbtP3WFv5sSvkFn/XLzSqPOB5AAthuk9xPk=
 github.com/ProtonMail/docker-credential-helpers v1.1.0/go.mod h1:mK0aBveCxhnQ756AmaTfXMZDeULvheYVhF/MWMErN5g=
-github.com/ProtonMail/gluon v0.11.1-0.20221001180052-2e11f5804b8a h1:JUjaQ7bUifpYdnLKviBPrVKOPfW6r4Mm8xCL1fdevaA=
-github.com/ProtonMail/gluon v0.11.1-0.20221001180052-2e11f5804b8a/go.mod h1:9k3URQEASX9XSA+JEcukjIiK3S6aR9GzhLhwccy8AnI=
+github.com/ProtonMail/gluon v0.11.1-0.20221003131446-151fe7c114e2 h1:4AVKhOmX5n0xa7fEbq6DUFj0yO9PTK5V/k7633oyBwg=
+github.com/ProtonMail/gluon v0.11.1-0.20221003131446-151fe7c114e2/go.mod h1:9k3URQEASX9XSA+JEcukjIiK3S6aR9GzhLhwccy8AnI=
 github.com/ProtonMail/go-autostart v0.0.0-20210130080809-00ed301c8e9a h1:D+aZah+k14Gn6kmL7eKxoo/4Dr/lK3ChBcwce2+SQP4=
 github.com/ProtonMail/go-autostart v0.0.0-20210130080809-00ed301c8e9a/go.mod h1:oTGdE7/DlWIr23G0IKW3OXK9wZ5Hw1GGiaJFccTvZi4=
 github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo=
diff --git a/internal/frontend/grpc/bridge.pb.go b/internal/frontend/grpc/bridge.pb.go
index e2f81136..e3dd3b44 100644
--- a/internal/frontend/grpc/bridge.pb.go
+++ b/internal/frontend/grpc/bridge.pb.go
@@ -24,12 +24,13 @@
 package grpc
 
 import (
+	reflect "reflect"
+	sync "sync"
+
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	emptypb "google.golang.org/protobuf/types/known/emptypb"
 	wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
-	reflect "reflect"
-	sync "sync"
 )
 
 const (
diff --git a/internal/frontend/grpc/bridge_grpc.pb.go b/internal/frontend/grpc/bridge_grpc.pb.go
index 6e60a11f..a4d7dc52 100644
--- a/internal/frontend/grpc/bridge_grpc.pb.go
+++ b/internal/frontend/grpc/bridge_grpc.pb.go
@@ -8,6 +8,7 @@ package grpc
 
 import (
 	context "context"
+
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
diff --git a/internal/user/user.go b/internal/user/user.go
index 37f7b90b..21e0cc03 100644
--- a/internal/user/user.go
+++ b/internal/user/user.go
@@ -6,10 +6,10 @@ import (
 	"runtime"
 	"time"
 
-	"github.com/ProtonMail/gluon"
 	"github.com/ProtonMail/gluon/connector"
 	"github.com/ProtonMail/gluon/imap"
 	"github.com/ProtonMail/gluon/queue"
+	"github.com/ProtonMail/gluon/wait"
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
 	"github.com/ProtonMail/proton-bridge/v2/internal/events"
 	"github.com/ProtonMail/proton-bridge/v2/internal/pool"
@@ -39,7 +39,7 @@ type User struct {
 	settings liteapi.MailSettings
 
 	updateCh map[string]*queue.QueuedChannel[imap.Update]
-	syncWG   gluon.WaitGroup
+	syncWG   wait.Group
 }
 
 func New(
diff --git a/utils/gobinsec_update/main.go b/utils/gobinsec_update/main.go
index 5539b5ab..90bcadc4 100644
--- a/utils/gobinsec_update/main.go
+++ b/utils/gobinsec_update/main.go
@@ -19,10 +19,11 @@ package main
 
 import (
 	"fmt"
-	"github.com/intercloud/gobinsec/gobinsec"
 	"io/ioutil"
 	"regexp"
 	"strings"
+
+	"github.com/intercloud/gobinsec/gobinsec"
 )
 
 type Depend struct {