Other: Add v2 to module name

Makefile

@@ -23,7 +23,7 @@ BUILD_TIME:=$(shell date +%FT%T%z)
 BUILD_FLAGS:=-tags='${BUILD_TAGS}'
 BUILD_FLAGS_LAUNCHER:=${BUILD_FLAGS}
 BUILD_FLAGS_GUI:=-tags='${BUILD_TAGS} build_qt'
-GO_LDFLAGS:=$(addprefix -X github.com/ProtonMail/proton-bridge/internal/constants.,Version=${APP_VERSION} Revision=${REVISION} BuildTime=${BUILD_TIME})
+GO_LDFLAGS:=$(addprefix -X github.com/ProtonMail/proton-bridge/v2/internal/constants.,Version=${APP_VERSION} Revision=${REVISION} BuildTime=${BUILD_TIME})
 ifneq "${BUILD_LDFLAGS}" ""
     GO_LDFLAGS+=${BUILD_LDFLAGS}
 endif
@@ -228,12 +228,12 @@ integration-test-bridge:
 	${MAKE} -C test test-bridge
 
 mocks:
-	mockgen --package mocks github.com/ProtonMail/proton-bridge/internal/users Locator,PanicHandler,CredentialsStorer,StoreMaker > internal/users/mocks/mocks.go
-	mockgen --package mocks github.com/ProtonMail/proton-bridge/pkg/listener Listener > internal/users/mocks/listener_mocks.go
-	mockgen --package mocks github.com/ProtonMail/proton-bridge/internal/store PanicHandler,BridgeUser,ChangeNotifier,Storer > internal/store/mocks/mocks.go
-	mockgen --package mocks github.com/ProtonMail/proton-bridge/pkg/listener Listener > internal/store/mocks/utils_mocks.go
-	mockgen --package mocks github.com/ProtonMail/proton-bridge/pkg/pmapi Client,Manager > pkg/pmapi/mocks/mocks.go
-	mockgen --package mocks github.com/ProtonMail/proton-bridge/pkg/message Fetcher > pkg/message/mocks/mocks.go
+	mockgen --package mocks github.com/ProtonMail/proton-bridge/v2/internal/users Locator,PanicHandler,CredentialsStorer,StoreMaker > internal/users/mocks/mocks.go
+	mockgen --package mocks github.com/ProtonMail/proton-bridge/v2/pkg/listener Listener > internal/users/mocks/listener_mocks.go
+	mockgen --package mocks github.com/ProtonMail/proton-bridge/v2/internal/store PanicHandler,BridgeUser,ChangeNotifier,Storer > internal/store/mocks/mocks.go
+	mockgen --package mocks github.com/ProtonMail/proton-bridge/v2/pkg/listener Listener > internal/store/mocks/utils_mocks.go
+	mockgen --package mocks github.com/ProtonMail/proton-bridge/v2/pkg/pmapi Client,Manager > pkg/pmapi/mocks/mocks.go
+	mockgen --package mocks github.com/ProtonMail/proton-bridge/v2/pkg/message Fetcher > pkg/message/mocks/mocks.go
 
 lint: gofiles lint-golang lint-license lint-dependencies lint-changelog
 

cmd/Desktop-Bridge/main.go

@@ -37,8 +37,8 @@ package main
 import (
 	"os"
 
-	"github.com/ProtonMail/proton-bridge/internal/app/base"
-	"github.com/ProtonMail/proton-bridge/internal/app/bridge"
+	"github.com/ProtonMail/proton-bridge/v2/internal/app/base"
+	"github.com/ProtonMail/proton-bridge/v2/internal/app/bridge"
 	"github.com/sirupsen/logrus"
 )
 

cmd/launcher/main.go

@@ -26,14 +26,14 @@ import (
 
 	"github.com/Masterminds/semver/v3"
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/ProtonMail/proton-bridge/internal/config/useragent"
-	"github.com/ProtonMail/proton-bridge/internal/constants"
-	"github.com/ProtonMail/proton-bridge/internal/crash"
-	"github.com/ProtonMail/proton-bridge/internal/locations"
-	"github.com/ProtonMail/proton-bridge/internal/logging"
-	"github.com/ProtonMail/proton-bridge/internal/sentry"
-	"github.com/ProtonMail/proton-bridge/internal/updater"
-	"github.com/ProtonMail/proton-bridge/internal/versioner"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/useragent"
+	"github.com/ProtonMail/proton-bridge/v2/internal/constants"
+	"github.com/ProtonMail/proton-bridge/v2/internal/crash"
+	"github.com/ProtonMail/proton-bridge/v2/internal/locations"
+	"github.com/ProtonMail/proton-bridge/v2/internal/logging"
+	"github.com/ProtonMail/proton-bridge/v2/internal/sentry"
+	"github.com/ProtonMail/proton-bridge/v2/internal/updater"
+	"github.com/ProtonMail/proton-bridge/v2/internal/versioner"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )

go.mod

@@ -1,4 +1,4 @@
-module github.com/ProtonMail/proton-bridge
+module github.com/ProtonMail/proton-bridge/v2
 
 go 1.15
 

internal/api/api.go

@@ -25,17 +25,15 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/ProtonMail/proton-bridge/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/internal/config/settings"
-	"github.com/ProtonMail/proton-bridge/internal/events"
-	"github.com/ProtonMail/proton-bridge/pkg/listener"
-	"github.com/ProtonMail/proton-bridge/pkg/ports"
+	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/settings"
+	"github.com/ProtonMail/proton-bridge/v2/internal/events"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/listener"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/ports"
 	"github.com/sirupsen/logrus"
 )
 
-var (
-	log = logrus.WithField("pkg", "api") //nolint:gochecknoglobals
-)
+var log = logrus.WithField("pkg", "api") //nolint:gochecknoglobals
 
 type apiServer struct {
 	host          string

internal/api/ctx.go

@@ -20,7 +20,7 @@ package api
 import (
 	"net/http"
 
-	"github.com/ProtonMail/proton-bridge/pkg/listener"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/listener"
 )
 
 // httpHandler with Go's Response and Request.

internal/api/focus.go

@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/ProtonMail/proton-bridge/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/internal/events"
+	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/v2/internal/events"
 )
 
 // focusHandler should be called from other instances (attempt to start bridge

internal/app/base/base.go

@@ -39,24 +39,24 @@ import (
 	"github.com/Masterminds/semver/v3"
 	"github.com/ProtonMail/go-autostart"
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/ProtonMail/proton-bridge/internal/api"
-	"github.com/ProtonMail/proton-bridge/internal/config/cache"
-	"github.com/ProtonMail/proton-bridge/internal/config/settings"
-	"github.com/ProtonMail/proton-bridge/internal/config/tls"
-	"github.com/ProtonMail/proton-bridge/internal/config/useragent"
-	"github.com/ProtonMail/proton-bridge/internal/constants"
-	"github.com/ProtonMail/proton-bridge/internal/cookies"
-	"github.com/ProtonMail/proton-bridge/internal/crash"
-	"github.com/ProtonMail/proton-bridge/internal/events"
-	"github.com/ProtonMail/proton-bridge/internal/locations"
-	"github.com/ProtonMail/proton-bridge/internal/logging"
-	"github.com/ProtonMail/proton-bridge/internal/sentry"
-	"github.com/ProtonMail/proton-bridge/internal/updater"
-	"github.com/ProtonMail/proton-bridge/internal/users/credentials"
-	"github.com/ProtonMail/proton-bridge/internal/versioner"
-	"github.com/ProtonMail/proton-bridge/pkg/keychain"
-	"github.com/ProtonMail/proton-bridge/pkg/listener"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/internal/api"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/cache"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/settings"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/tls"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/useragent"
+	"github.com/ProtonMail/proton-bridge/v2/internal/constants"
+	"github.com/ProtonMail/proton-bridge/v2/internal/cookies"
+	"github.com/ProtonMail/proton-bridge/v2/internal/crash"
+	"github.com/ProtonMail/proton-bridge/v2/internal/events"
+	"github.com/ProtonMail/proton-bridge/v2/internal/locations"
+	"github.com/ProtonMail/proton-bridge/v2/internal/logging"
+	"github.com/ProtonMail/proton-bridge/v2/internal/sentry"
+	"github.com/ProtonMail/proton-bridge/v2/internal/updater"
+	"github.com/ProtonMail/proton-bridge/v2/internal/users/credentials"
+	"github.com/ProtonMail/proton-bridge/v2/internal/versioner"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/keychain"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/listener"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/allan-simon/go-singleinstance"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"

internal/app/base/migration.go

@@ -21,8 +21,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/ProtonMail/proton-bridge/internal/constants"
-	"github.com/ProtonMail/proton-bridge/internal/locations"
+	"github.com/ProtonMail/proton-bridge/v2/internal/constants"
+	"github.com/ProtonMail/proton-bridge/v2/internal/locations"
 	"github.com/sirupsen/logrus"
 )
 

internal/app/base/migration_rebranding.go

@@ -24,8 +24,8 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/ProtonMail/proton-bridge/internal/config/settings"
-	"github.com/ProtonMail/proton-bridge/pkg/keychain"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/settings"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/keychain"
 	"github.com/hashicorp/go-multierror"
 	"github.com/sirupsen/logrus"
 )

internal/app/base/restart_test.go

@@ -25,7 +25,7 @@ import (
 )
 
 func TestIncrementRestartFlag(t *testing.T) {
-	var tests = []struct {
+	tests := []struct {
 		in  []string
 		out []string
 	}{

internal/app/bridge/bridge.go

@@ -22,20 +22,20 @@ import (
 	"crypto/tls"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/internal/api"
-	"github.com/ProtonMail/proton-bridge/internal/app/base"
-	pkgBridge "github.com/ProtonMail/proton-bridge/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/internal/config/settings"
-	pkgTLS "github.com/ProtonMail/proton-bridge/internal/config/tls"
-	"github.com/ProtonMail/proton-bridge/internal/constants"
-	"github.com/ProtonMail/proton-bridge/internal/frontend"
-	"github.com/ProtonMail/proton-bridge/internal/frontend/types"
-	"github.com/ProtonMail/proton-bridge/internal/imap"
-	"github.com/ProtonMail/proton-bridge/internal/smtp"
-	"github.com/ProtonMail/proton-bridge/internal/store"
-	"github.com/ProtonMail/proton-bridge/internal/store/cache"
-	"github.com/ProtonMail/proton-bridge/internal/updater"
-	"github.com/ProtonMail/proton-bridge/pkg/message"
+	"github.com/ProtonMail/proton-bridge/v2/internal/api"
+	"github.com/ProtonMail/proton-bridge/v2/internal/app/base"
+	pkgBridge "github.com/ProtonMail/proton-bridge/v2/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/settings"
+	pkgTLS "github.com/ProtonMail/proton-bridge/v2/internal/config/tls"
+	"github.com/ProtonMail/proton-bridge/v2/internal/constants"
+	"github.com/ProtonMail/proton-bridge/v2/internal/frontend"
+	"github.com/ProtonMail/proton-bridge/v2/internal/frontend/types"
+	"github.com/ProtonMail/proton-bridge/v2/internal/imap"
+	"github.com/ProtonMail/proton-bridge/v2/internal/smtp"
+	"github.com/ProtonMail/proton-bridge/v2/internal/store"
+	"github.com/ProtonMail/proton-bridge/v2/internal/store/cache"
+	"github.com/ProtonMail/proton-bridge/v2/internal/updater"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/message"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
@@ -57,13 +57,16 @@ func New(base *base.Base) *cli.App {
 	app.Flags = append(app.Flags, []cli.Flag{
 		&cli.StringFlag{
 			Name:  flagLogIMAP,
-			Usage: "Enable logging of IMAP communications (all|client|server) (may contain decrypted data!)"},
+			Usage: "Enable logging of IMAP communications (all|client|server) (may contain decrypted data!)",
+		},
 		&cli.BoolFlag{
 			Name:  flagLogSMTP,
-			Usage: "Enable logging of SMTP communications (may contain decrypted data!)"},
+			Usage: "Enable logging of SMTP communications (may contain decrypted data!)",
+		},
 		&cli.BoolFlag{
 			Name:  flagNonInteractive,
-			Usage: "Start Bridge entirely noninteractively"},
+			Usage: "Start Bridge entirely noninteractively",
+		},
 	}...)
 
 	return app
@@ -305,7 +308,6 @@ func loadMessageCache(b *base.Base) (cache.Cache, error) {
 		ConcurrentRead:  b.Settings.GetInt(settings.CacheConcurrencyRead),
 		ConcurrentWrite: b.Settings.GetInt(settings.CacheConcurrencyWrite),
 	})
-
 	if err != nil {
 		return cache.NewInMemoryCache(inMemoryCacheLimnit), err
 	}

internal/bridge/autostart.go

@@ -18,7 +18,7 @@
 // Package bridge provides core functionality of Bridge app.
 package bridge
 
-import "github.com/ProtonMail/proton-bridge/internal/config/settings"
+import "github.com/ProtonMail/proton-bridge/v2/internal/config/settings"
 
 // IsAutostartEnabled checks if link file exits.
 func (b *Bridge) IsAutostartEnabled() bool {

internal/bridge/bridge.go

@@ -26,17 +26,17 @@ import (
 
 	"github.com/Masterminds/semver/v3"
 	"github.com/ProtonMail/go-autostart"
-	"github.com/ProtonMail/proton-bridge/internal/config/settings"
-	"github.com/ProtonMail/proton-bridge/internal/constants"
-	"github.com/ProtonMail/proton-bridge/internal/metrics"
-	"github.com/ProtonMail/proton-bridge/internal/sentry"
-	"github.com/ProtonMail/proton-bridge/internal/store/cache"
-	"github.com/ProtonMail/proton-bridge/internal/updater"
-	"github.com/ProtonMail/proton-bridge/internal/users"
-	"github.com/ProtonMail/proton-bridge/pkg/message"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/settings"
+	"github.com/ProtonMail/proton-bridge/v2/internal/constants"
+	"github.com/ProtonMail/proton-bridge/v2/internal/metrics"
+	"github.com/ProtonMail/proton-bridge/v2/internal/sentry"
+	"github.com/ProtonMail/proton-bridge/v2/internal/store/cache"
+	"github.com/ProtonMail/proton-bridge/v2/internal/updater"
+	"github.com/ProtonMail/proton-bridge/v2/internal/users"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/message"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 
-	"github.com/ProtonMail/proton-bridge/pkg/listener"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/listener"
 	logrus "github.com/sirupsen/logrus"
 )
 

internal/bridge/bug_report.go

@@ -28,12 +28,14 @@ import (
 	"path/filepath"
 	"sort"
 
-	"github.com/ProtonMail/proton-bridge/internal/logging"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/internal/logging"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 )
 
-const MaxAttachmentSize = 7 * 1024 * 1024 // 7 MB total limit
-const MaxCompressedFilesCount = 6
+const (
+	MaxAttachmentSize       = 7 * 1024 * 1024 // 7 MB total limit
+	MaxCompressedFilesCount = 6
+)
 
 var ErrSizeTooLarge = errors.New("file is too big")
 

internal/bridge/store_factory.go

@@ -21,12 +21,12 @@ import (
 	"fmt"
 	"path/filepath"
 
-	"github.com/ProtonMail/proton-bridge/internal/sentry"
-	"github.com/ProtonMail/proton-bridge/internal/store"
-	"github.com/ProtonMail/proton-bridge/internal/store/cache"
-	"github.com/ProtonMail/proton-bridge/internal/users"
-	"github.com/ProtonMail/proton-bridge/pkg/listener"
-	"github.com/ProtonMail/proton-bridge/pkg/message"
+	"github.com/ProtonMail/proton-bridge/v2/internal/sentry"
+	"github.com/ProtonMail/proton-bridge/v2/internal/store"
+	"github.com/ProtonMail/proton-bridge/v2/internal/store/cache"
+	"github.com/ProtonMail/proton-bridge/v2/internal/users"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/listener"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/message"
 )
 
 type storeFactory struct {

internal/bridge/types.go

@@ -20,7 +20,7 @@ package bridge
 import (
 	"github.com/Masterminds/semver/v3"
 
-	"github.com/ProtonMail/proton-bridge/internal/updater"
+	"github.com/ProtonMail/proton-bridge/v2/internal/updater"
 )
 
 type Locator interface {

internal/config/cache/cache.go

@@ -22,7 +22,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/ProtonMail/proton-bridge/pkg/files"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/files"
 )
 
 type Cache struct {
@@ -30,7 +30,7 @@ type Cache struct {
 }
 
 func New(dir, version string) (*Cache, error) {
-	if err := os.MkdirAll(filepath.Join(dir, version), 0700); err != nil {
+	if err := os.MkdirAll(filepath.Join(dir, version), 0o700); err != nil {
 		return nil, err
 	}
 

internal/config/cache/cache_test.go

@@ -61,7 +61,7 @@ func TestRemoveOldVersions(t *testing.T) {
 
 func createFilesInDir(t *testing.T, dir string, files ...string) {
 	for _, target := range files {
-		require.NoError(t, os.MkdirAll(filepath.Dir(filepath.Join(dir, target)), 0700))
+		require.NoError(t, os.MkdirAll(filepath.Dir(filepath.Join(dir, target)), 0o700))
 
 		f, err := os.Create(filepath.Join(dir, target))
 		require.NoError(t, err)

internal/config/settings/kvs.go

@@ -79,7 +79,7 @@ func (p *keyValueStore) save() error {
 		return err
 	}
 
-	return ioutil.WriteFile(p.path, b, 0600)
+	return ioutil.WriteFile(p.path, b, 0o600)
 }
 
 func (p *keyValueStore) setDefault(key, value string) {

internal/config/settings/kvs_test.go

@@ -38,7 +38,7 @@ func TestLoadBadKeyValueStore(t *testing.T) {
 	path, clean := newTmpFile(r)
 	defer clean()
 
-	r.NoError(ioutil.WriteFile(path, []byte("{\"key\":\"MISSING_QUOTES"), 0700))
+	r.NoError(ioutil.WriteFile(path, []byte("{\"key\":\"MISSING_QUOTES"), 0o700))
 	pref := newKeyValueStore(path)
 	r.Equal("", pref.Get("key"))
 }
@@ -131,7 +131,7 @@ func newTestEmptyKeyValueStore(r *require.Assertions) (*keyValueStore, func()) {
 
 func newTestKeyValueStore(r *require.Assertions) (*keyValueStore, func()) {
 	path, clean := newTmpFile(r)
-	r.NoError(ioutil.WriteFile(path, []byte("{\"str\":\"value\",\"int\":\"42\",\"bool\":\"true\",\"falseBool\":\"t\"}"), 0700))
+	r.NoError(ioutil.WriteFile(path, []byte("{\"str\":\"value\",\"int\":\"42\",\"bool\":\"true\",\"falseBool\":\"t\"}"), 0o700))
 	return newKeyValueStore(path), clean
 }
 

internal/config/tls/tls.go

@@ -116,7 +116,7 @@ func (t *TLS) GenerateCerts(template *x509.Certificate) error {
 		return err
 	}
 
-	keyOut, err := os.OpenFile(t.getTLSKeyPath(), os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)
+	keyOut, err := os.OpenFile(t.getTLSKeyPath(), os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0o600)
 	if err != nil {
 		return err
 	}

internal/cookies/jar.go

@@ -27,7 +27,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/internal/config/settings"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/settings"
 )
 
 type cookiesByHost map[string][]*http.Cookie

internal/cookies/jar_test.go

@@ -24,7 +24,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/internal/config/settings"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/settings"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

internal/crash/handler.go

@@ -19,7 +19,7 @@
 package crash
 
 import (
-	"github.com/ProtonMail/proton-bridge/internal/sentry"
+	"github.com/ProtonMail/proton-bridge/v2/internal/sentry"
 	"github.com/sirupsen/logrus"
 )
 

internal/events/events.go

@@ -21,7 +21,7 @@ package events
 import (
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/pkg/listener"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/listener"
 )
 
 // Constants of events used by the event listener in bridge.

internal/frontend/cli/account_utils.go

@@ -22,7 +22,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/ProtonMail/proton-bridge/internal/frontend/types"
+	"github.com/ProtonMail/proton-bridge/v2/internal/frontend/types"
 	"github.com/abiosoft/ishell"
 )
 

internal/frontend/cli/accounts.go

@@ -21,9 +21,9 @@ import (
 	"context"
 	"strings"
 
-	"github.com/ProtonMail/proton-bridge/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/internal/config/settings"
-	"github.com/ProtonMail/proton-bridge/internal/frontend/types"
+	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/settings"
+	"github.com/ProtonMail/proton-bridge/v2/internal/frontend/types"
 	"github.com/abiosoft/ishell"
 )
 

internal/frontend/cli/frontend.go

@@ -19,20 +19,18 @@
 package cli
 
 import (
-	"github.com/ProtonMail/proton-bridge/internal/config/settings"
-	"github.com/ProtonMail/proton-bridge/internal/events"
-	"github.com/ProtonMail/proton-bridge/internal/frontend/types"
-	"github.com/ProtonMail/proton-bridge/internal/locations"
-	"github.com/ProtonMail/proton-bridge/internal/updater"
-	"github.com/ProtonMail/proton-bridge/pkg/listener"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/settings"
+	"github.com/ProtonMail/proton-bridge/v2/internal/events"
+	"github.com/ProtonMail/proton-bridge/v2/internal/frontend/types"
+	"github.com/ProtonMail/proton-bridge/v2/internal/locations"
+	"github.com/ProtonMail/proton-bridge/v2/internal/updater"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/listener"
 
 	"github.com/abiosoft/ishell"
 	"github.com/sirupsen/logrus"
 )
 
-var (
-	log = logrus.WithField("pkg", "frontend/cli") //nolint:gochecknoglobals
-)
+var log = logrus.WithField("pkg", "frontend/cli") //nolint:gochecknoglobals
 
 type frontendCLI struct {
 	*ishell.Shell
@@ -70,21 +68,25 @@ func New( //nolint:funlen
 	}
 
 	// Clear commands.
-	clearCmd := &ishell.Cmd{Name: "clear",
+	clearCmd := &ishell.Cmd{
+		Name:    "clear",
 		Help:    "remove stored accounts and preferences. (alias: cl)",
 		Aliases: []string{"cl"},
 	}
-	clearCmd.AddCmd(&ishell.Cmd{Name: "cache",
+	clearCmd.AddCmd(&ishell.Cmd{
+		Name:    "cache",
 		Help:    "remove stored preferences for accounts (aliases: c, prefs, preferences)",
 		Aliases: []string{"c", "prefs", "preferences"},
 		Func:    fe.deleteCache,
 	})
-	clearCmd.AddCmd(&ishell.Cmd{Name: "accounts",
+	clearCmd.AddCmd(&ishell.Cmd{
+		Name:    "accounts",
 		Help:    "remove all accounts from keychain. (aliases: a, k, keychain)",
 		Aliases: []string{"a", "k", "keychain"},
 		Func:    fe.deleteAccounts,
 	})
-	clearCmd.AddCmd(&ishell.Cmd{Name: "everything",
+	clearCmd.AddCmd(&ishell.Cmd{
+		Name:    "everything",
 		Help:    "remove everything",
 		Aliases: []string{"a", "k", "keychain"},
 		Func:    fe.deleteEverything,
@@ -92,22 +94,26 @@ func New( //nolint:funlen
 	fe.AddCmd(clearCmd)
 
 	// Change commands.
-	changeCmd := &ishell.Cmd{Name: "change",
+	changeCmd := &ishell.Cmd{
+		Name:    "change",
 		Help:    "change server or account settings (aliases: ch, switch)",
 		Aliases: []string{"ch", "switch"},
 	}
-	changeCmd.AddCmd(&ishell.Cmd{Name: "mode",
+	changeCmd.AddCmd(&ishell.Cmd{
+		Name:      "mode",
 		Help:      "switch between combined addresses and split addresses mode for account. Use index or account name as parameter. (alias: m)",
 		Aliases:   []string{"m"},
 		Func:      fe.changeMode,
 		Completer: fe.completeUsernames,
 	})
-	changeCmd.AddCmd(&ishell.Cmd{Name: "port",
+	changeCmd.AddCmd(&ishell.Cmd{
+		Name:    "port",
 		Help:    "change port numbers of IMAP and SMTP servers. (alias: p)",
 		Aliases: []string{"p"},
 		Func:    fe.changePort,
 	})
-	changeCmd.AddCmd(&ishell.Cmd{Name: "smtp-security",
+	changeCmd.AddCmd(&ishell.Cmd{
+		Name:    "smtp-security",
 		Help:    "change port numbers of IMAP and SMTP servers.(alias: ssl, starttls)",
 		Aliases: []string{"ssl", "starttls"},
 		Func:    fe.changeSMTPSecurity,
@@ -115,113 +121,136 @@ func New( //nolint:funlen
 	fe.AddCmd(changeCmd)
 
 	// DoH commands.
-	dohCmd := &ishell.Cmd{Name: "proxy",
+	dohCmd := &ishell.Cmd{
+		Name: "proxy",
 		Help: "allow or disallow bridge to securely connect to proton via a third party when it is being blocked",
 	}
-	dohCmd.AddCmd(&ishell.Cmd{Name: "allow",
+	dohCmd.AddCmd(&ishell.Cmd{
+		Name: "allow",
 		Help: "allow bridge to securely connect to proton via a third party when it is being blocked",
 		Func: fe.allowProxy,
 	})
-	dohCmd.AddCmd(&ishell.Cmd{Name: "disallow",
+	dohCmd.AddCmd(&ishell.Cmd{
+		Name: "disallow",
 		Help: "disallow bridge to securely connect to proton via a third party when it is being blocked",
 		Func: fe.disallowProxy,
 	})
 	fe.AddCmd(dohCmd)
 
 	// Cache-On-Disk commands.
-	codCmd := &ishell.Cmd{Name: "local-cache",
+	codCmd := &ishell.Cmd{
+		Name: "local-cache",
 		Help: "manage the local encrypted message cache",
 	}
-	codCmd.AddCmd(&ishell.Cmd{Name: "enable",
+	codCmd.AddCmd(&ishell.Cmd{
+		Name: "enable",
 		Help: "enable the local cache",
 		Func: fe.enableCacheOnDisk,
 	})
-	codCmd.AddCmd(&ishell.Cmd{Name: "disable",
+	codCmd.AddCmd(&ishell.Cmd{
+		Name: "disable",
 		Help: "disable the local cache",
 		Func: fe.disableCacheOnDisk,
 	})
-	codCmd.AddCmd(&ishell.Cmd{Name: "change-location",
+	codCmd.AddCmd(&ishell.Cmd{
+		Name: "change-location",
 		Help: "change the location of the local cache",
 		Func: fe.setCacheOnDiskLocation,
 	})
 	fe.AddCmd(codCmd)
 
 	// Updates commands.
-	updatesCmd := &ishell.Cmd{Name: "updates",
+	updatesCmd := &ishell.Cmd{
+		Name: "updates",
 		Help: "manage bridge updates",
 	}
-	updatesCmd.AddCmd(&ishell.Cmd{Name: "check",
+	updatesCmd.AddCmd(&ishell.Cmd{
+		Name: "check",
 		Help: "check for Bridge updates",
 		Func: fe.checkUpdates,
 	})
-	autoUpdatesCmd := &ishell.Cmd{Name: "autoupdates",
+	autoUpdatesCmd := &ishell.Cmd{
+		Name: "autoupdates",
 		Help: "manage bridge updates",
 	}
 	updatesCmd.AddCmd(autoUpdatesCmd)
-	autoUpdatesCmd.AddCmd(&ishell.Cmd{Name: "enable",
+	autoUpdatesCmd.AddCmd(&ishell.Cmd{
+		Name: "enable",
 		Help: "automatically keep bridge up to date",
 		Func: fe.enableAutoUpdates,
 	})
-	autoUpdatesCmd.AddCmd(&ishell.Cmd{Name: "disable",
+	autoUpdatesCmd.AddCmd(&ishell.Cmd{
+		Name: "disable",
 		Help: "require bridge to be manually updated",
 		Func: fe.disableAutoUpdates,
 	})
-	updatesChannelCmd := &ishell.Cmd{Name: "channel",
+	updatesChannelCmd := &ishell.Cmd{
+		Name: "channel",
 		Help: "switch updates channel",
 	}
 	updatesCmd.AddCmd(updatesChannelCmd)
-	updatesChannelCmd.AddCmd(&ishell.Cmd{Name: "early",
+	updatesChannelCmd.AddCmd(&ishell.Cmd{
+		Name: "early",
 		Help: "switch to the early-access updates channel",
 		Func: fe.selectEarlyChannel,
 	})
-	updatesChannelCmd.AddCmd(&ishell.Cmd{Name: "stable",
+	updatesChannelCmd.AddCmd(&ishell.Cmd{
+		Name: "stable",
 		Help: "switch to the stable updates channel",
 		Func: fe.selectStableChannel,
 	})
 	fe.AddCmd(updatesCmd)
 
 	// Print info commands.
-	fe.AddCmd(&ishell.Cmd{Name: "log-dir",
+	fe.AddCmd(&ishell.Cmd{
+		Name:    "log-dir",
 		Help:    "print path to directory with logs. (aliases: log, logs)",
 		Aliases: []string{"log", "logs"},
 		Func:    fe.printLogDir,
 	})
-	fe.AddCmd(&ishell.Cmd{Name: "manual",
+	fe.AddCmd(&ishell.Cmd{
+		Name:    "manual",
 		Help:    "print URL with instructions. (alias: man)",
 		Aliases: []string{"man"},
 		Func:    fe.printManual,
 	})
 
-	fe.AddCmd(&ishell.Cmd{Name: "credits",
+	fe.AddCmd(&ishell.Cmd{
+		Name: "credits",
 		Help: "print used resources.",
 		Func: fe.printCredits,
 	})
 
 	// Account commands.
-	fe.AddCmd(&ishell.Cmd{Name: "list",
+	fe.AddCmd(&ishell.Cmd{
+		Name:    "list",
 		Help:    "print the list of accounts. (aliases: l, ls)",
 		Func:    fe.noAccountWrapper(fe.listAccounts),
 		Aliases: []string{"l", "ls"},
 	})
-	fe.AddCmd(&ishell.Cmd{Name: "info",
+	fe.AddCmd(&ishell.Cmd{
+		Name:      "info",
 		Help:      "print the configuration for account. Use index or account name as parameter. (alias: i)",
 		Func:      fe.noAccountWrapper(fe.showAccountInfo),
 		Completer: fe.completeUsernames,
 		Aliases:   []string{"i"},
 	})
-	fe.AddCmd(&ishell.Cmd{Name: "login",
+	fe.AddCmd(&ishell.Cmd{
+		Name:      "login",
 		Help:      "login procedure to add or connect account. Optionally use index or account as parameter. (aliases: a, add, con, connect)",
 		Func:      fe.loginAccount,
 		Aliases:   []string{"add", "a", "con", "connect"},
 		Completer: fe.completeUsernames,
 	})
-	fe.AddCmd(&ishell.Cmd{Name: "logout",
+	fe.AddCmd(&ishell.Cmd{
+		Name:      "logout",
 		Help:      "disconnect the account. Use index or account name as parameter. (aliases: d, disconnect)",
 		Func:      fe.noAccountWrapper(fe.logoutAccount),
 		Aliases:   []string{"d", "disconnect"},
 		Completer: fe.completeUsernames,
 	})
-	fe.AddCmd(&ishell.Cmd{Name: "delete",
+	fe.AddCmd(&ishell.Cmd{
+		Name:      "delete",
 		Help:      "remove the account from keychain. Use index or account name as parameter. (aliases: del, rm, remove)",
 		Func:      fe.noAccountWrapper(fe.deleteAccount),
 		Aliases:   []string{"del", "rm", "remove"},
@@ -229,7 +258,8 @@ func New( //nolint:funlen
 	})
 
 	// System commands.
-	fe.AddCmd(&ishell.Cmd{Name: "restart",
+	fe.AddCmd(&ishell.Cmd{
+		Name: "restart",
 		Help: "restart the bridge.",
 		Func: fe.restart,
 	})

internal/frontend/cli/system.go

@@ -23,14 +23,12 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/ProtonMail/proton-bridge/internal/config/settings"
-	"github.com/ProtonMail/proton-bridge/pkg/ports"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/settings"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/ports"
 	"github.com/abiosoft/ishell"
 )
 
-var (
-	currentPort = "" //nolint:gochecknoglobals
-)
+var currentPort = "" //nolint:gochecknoglobals
 
 func (f *frontendCLI) restart(c *ishell.Context) {
 	if f.yesNoQuestion("Are you sure you want to restart the Bridge") {

internal/frontend/cli/updates.go

@@ -20,9 +20,9 @@ package cli
 import (
 	"strings"
 
-	"github.com/ProtonMail/proton-bridge/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/internal/config/settings"
-	"github.com/ProtonMail/proton-bridge/internal/updater"
+	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/settings"
+	"github.com/ProtonMail/proton-bridge/v2/internal/updater"
 	"github.com/abiosoft/ishell"
 )
 

internal/frontend/cli/utils.go

@@ -20,7 +20,7 @@ package cli
 import (
 	"strings"
 
-	pmapi "github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	pmapi "github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/fatih/color"
 )
 
@@ -28,9 +28,7 @@ const (
 	maxInputRepeat = 2
 )
 
-var (
-	bold = color.New(color.Bold).SprintFunc() //nolint:gochecknoglobals
-)
+var bold = color.New(color.Bold).SprintFunc() //nolint:gochecknoglobals
 
 func isNotEmpty(val string) bool {
 	return val != ""

internal/frontend/clientconfig/config.go

@@ -22,9 +22,9 @@ package clientconfig
 import (
 	"errors"
 
-	"github.com/ProtonMail/proton-bridge/internal/config/settings"
-	"github.com/ProtonMail/proton-bridge/internal/config/useragent"
-	"github.com/ProtonMail/proton-bridge/internal/frontend/types"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/settings"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/useragent"
+	"github.com/ProtonMail/proton-bridge/v2/internal/frontend/types"
 	"github.com/sirupsen/logrus"
 )
 

internal/frontend/clientconfig/config_applemail.go

@@ -29,10 +29,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/internal/config/useragent"
-	"github.com/ProtonMail/proton-bridge/internal/frontend/types"
-	"github.com/ProtonMail/proton-bridge/pkg/mobileconfig"
+	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/useragent"
+	"github.com/ProtonMail/proton-bridge/v2/internal/frontend/types"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/mobileconfig"
 )
 
 const (
@@ -107,7 +107,7 @@ func saveConfigTemporarily(mc *mobileconfig.Config) (fname string, err error) {
 
 	// Make sure the file is only readable for the current user.
 	fname = filepath.Clean(filepath.Join(dir, "protonmail.mobileconfig"))
-	f, err := os.OpenFile(fname, os.O_RDWR|os.O_CREATE, 0600)
+	f, err := os.OpenFile(fname, os.O_RDWR|os.O_CREATE, 0o600)
 	if err != nil {
 		return
 	}

internal/frontend/frontend.go

@@ -19,15 +19,15 @@
 package frontend
 
 import (
-	"github.com/ProtonMail/proton-bridge/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/internal/config/settings"
-	"github.com/ProtonMail/proton-bridge/internal/config/useragent"
-	"github.com/ProtonMail/proton-bridge/internal/frontend/cli"
-	"github.com/ProtonMail/proton-bridge/internal/frontend/qt"
-	"github.com/ProtonMail/proton-bridge/internal/frontend/types"
-	"github.com/ProtonMail/proton-bridge/internal/locations"
-	"github.com/ProtonMail/proton-bridge/internal/updater"
-	"github.com/ProtonMail/proton-bridge/pkg/listener"
+	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/settings"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/useragent"
+	"github.com/ProtonMail/proton-bridge/v2/internal/frontend/cli"
+	"github.com/ProtonMail/proton-bridge/v2/internal/frontend/qt"
+	"github.com/ProtonMail/proton-bridge/v2/internal/frontend/types"
+	"github.com/ProtonMail/proton-bridge/v2/internal/locations"
+	"github.com/ProtonMail/proton-bridge/v2/internal/updater"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/listener"
 )
 
 type Frontend interface {

internal/frontend/qml/Bridge_test.qml

@@ -836,7 +836,7 @@ Window {
     property url logsPath: StandardPaths.standardLocations(StandardPaths.HomeLocation)[0]
     property url licensePath: StandardPaths.standardLocations(StandardPaths.HomeLocation)[0]
     property url releaseNotesLink: Qt.resolvedUrl("https://protonmail.com/download/bridge/early_releases.html")
-    property url dependencyLicensesLink: Qt.resolvedUrl("https://github.com/ProtonMail/proton-bridge/blob/master/COPYING_NOTES.md#dependencies")
+    property url dependencyLicensesLink: Qt.resolvedUrl("https://github.com/ProtonMail/proton-bridge/v2/blob/master/COPYING_NOTES.md#dependencies")
     property url landingPageLink: Qt.resolvedUrl("https://protonmail.com/bridge")
 
     property string colorSchemeName: "light"

internal/frontend/qml/icons/img-welcome-dark.svg

@@ -8,7 +8,7 @@
    id="svg84"
    sodipodi:docname="img-welcome-dark.svg"
    inkscape:version="1.1.2 (0a00cf5339, 2022-02-04, custom)"
-   inkscape:export-filename="/home/dev/gopath/src/github.com/ProtonMail/proton-bridge/internal/frontend/qml/icons/img-welcome.png"
+   inkscape:export-filename="/home/dev/gopath/src/github.com/ProtonMail/proton-bridge/v2/internal/frontend/qml/icons/img-welcome.png"
    inkscape:export-xdpi="400"
    inkscape:export-ydpi="400"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"

internal/frontend/qml/icons/img-welcome.svg

@@ -8,7 +8,7 @@
    id="svg84"
    sodipodi:docname="img-welcome.svg"
    inkscape:version="1.1.2 (0a00cf5339, 2022-02-04, custom)"
-   inkscape:export-filename="/home/dev/gopath/src/github.com/ProtonMail/proton-bridge/internal/frontend/qml/icons/img-welcome.png"
+   inkscape:export-filename="/home/dev/gopath/src/github.com/ProtonMail/proton-bridge/v2/internal/frontend/qml/icons/img-welcome.png"
    inkscape:export-xdpi="400"
    inkscape:export-ydpi="400"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"

internal/frontend/qt/dockicon/dockicon_darwin.go

@@ -15,8 +15,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
 
-// +build darwin
-// +build build_qt
+//go:build darwin && build_qt
+// +build darwin,build_qt
 
 package dockicon
 
@@ -28,6 +28,7 @@ import "C"
 func SetDockIconVisibleState(visible bool) {
 	C.SetDockIconVisibleState(C.bool(visible))
 }
+
 func GetDockIconVisibleState() bool {
 	return bool(C.GetDockIconVisibleState())
 }

internal/frontend/qt/dockicon/dockicon_default.go

@@ -15,12 +15,13 @@
 // You should have received a copy of the GNU General Public License
 // along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
 
-// +build !darwin
-// +build build_qt
+//go:build !darwin && build_qt
+// +build !darwin,build_qt
 
 package dockicon
 
 func SetDockIconVisibleState(visible bool) {}
+
 func GetDockIconVisibleState() bool {
 	return true
 }

internal/frontend/qt/frontend.go

@@ -25,13 +25,13 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/ProtonMail/proton-bridge/internal/config/settings"
-	"github.com/ProtonMail/proton-bridge/internal/config/useragent"
-	"github.com/ProtonMail/proton-bridge/internal/frontend/types"
-	"github.com/ProtonMail/proton-bridge/internal/locations"
-	"github.com/ProtonMail/proton-bridge/internal/updater"
-	"github.com/ProtonMail/proton-bridge/pkg/listener"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/settings"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/useragent"
+	"github.com/ProtonMail/proton-bridge/v2/internal/frontend/types"
+	"github.com/ProtonMail/proton-bridge/v2/internal/locations"
+	"github.com/ProtonMail/proton-bridge/v2/internal/updater"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/listener"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/sirupsen/logrus"
 	"github.com/therecipe/qt/core"
 	"github.com/therecipe/qt/qml"

internal/frontend/qt/frontend_events.go

@@ -24,9 +24,9 @@ package qt
 import (
 	"strings"
 
-	"github.com/ProtonMail/proton-bridge/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/internal/events"
-	"github.com/ProtonMail/proton-bridge/pkg/keychain"
+	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/v2/internal/events"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/keychain"
 )
 
 func (f *FrontendQt) watchEvents() {

internal/frontend/qt/frontend_init.go

@@ -26,7 +26,7 @@ import (
 	"runtime"
 
 	"github.com/Masterminds/semver/v3"
-	qmlLog "github.com/ProtonMail/proton-bridge/internal/frontend/qt/log"
+	qmlLog "github.com/ProtonMail/proton-bridge/v2/internal/frontend/qt/log"
 	"github.com/therecipe/qt/core"
 	"github.com/therecipe/qt/qml"
 	"github.com/therecipe/qt/quickcontrols2"

internal/frontend/qt/frontend_nogui.go

@@ -24,12 +24,12 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/ProtonMail/proton-bridge/internal/config/settings"
-	"github.com/ProtonMail/proton-bridge/internal/config/useragent"
-	"github.com/ProtonMail/proton-bridge/internal/frontend/types"
-	"github.com/ProtonMail/proton-bridge/internal/locations"
-	"github.com/ProtonMail/proton-bridge/internal/updater"
-	"github.com/ProtonMail/proton-bridge/pkg/listener"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/settings"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/useragent"
+	"github.com/ProtonMail/proton-bridge/v2/internal/frontend/types"
+	"github.com/ProtonMail/proton-bridge/v2/internal/locations"
+	"github.com/ProtonMail/proton-bridge/v2/internal/updater"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/listener"
 	"github.com/sirupsen/logrus"
 )
 

internal/frontend/qt/frontend_settings.go

@@ -24,11 +24,11 @@ import (
 	"runtime"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/internal/config/settings"
-	"github.com/ProtonMail/proton-bridge/internal/frontend/clientconfig"
-	"github.com/ProtonMail/proton-bridge/internal/frontend/theme"
-	"github.com/ProtonMail/proton-bridge/pkg/keychain"
-	"github.com/ProtonMail/proton-bridge/pkg/ports"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/settings"
+	"github.com/ProtonMail/proton-bridge/v2/internal/frontend/clientconfig"
+	"github.com/ProtonMail/proton-bridge/v2/internal/frontend/theme"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/keychain"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/ports"
 	"github.com/therecipe/qt/core"
 )
 

internal/frontend/qt/frontend_updates.go

@@ -23,8 +23,8 @@ package qt
 import (
 	"sync"
 
-	"github.com/ProtonMail/proton-bridge/internal/config/settings"
-	"github.com/ProtonMail/proton-bridge/internal/updater"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/settings"
+	"github.com/ProtonMail/proton-bridge/v2/internal/updater"
 	"github.com/pkg/errors"
 )
 

internal/frontend/qt/frontend_users.go

@@ -25,9 +25,9 @@ import (
 	"encoding/base64"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/internal/events"
-	"github.com/ProtonMail/proton-bridge/internal/users"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/internal/events"
+	"github.com/ProtonMail/proton-bridge/v2/internal/users"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 )
 
 func (f *FrontendQt) login(username, password string) {

internal/frontend/qt/helpers.go

@@ -15,6 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
 
+//go:build build_qt
 // +build build_qt
 
 package qt

internal/frontend/qt/log/log.go

@@ -15,6 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
 
+//go:build build_qt
 // +build build_qt
 
 // Package log redirects QML logs to logrus

internal/frontend/qt/qml_backend.go

@@ -23,9 +23,9 @@ package qt
 import (
 	"runtime"
 
-	"github.com/ProtonMail/proton-bridge/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/internal/config/settings"
-	dockIcon "github.com/ProtonMail/proton-bridge/internal/frontend/qt/dockicon"
+	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/settings"
+	dockIcon "github.com/ProtonMail/proton-bridge/v2/internal/frontend/qt/dockicon"
 	"github.com/therecipe/qt/core"
 )
 

internal/frontend/qt/qml_users.go

@@ -23,8 +23,8 @@ package qt
 import (
 	"sync"
 
-	"github.com/ProtonMail/proton-bridge/internal/events"
-	"github.com/ProtonMail/proton-bridge/internal/frontend/types"
+	"github.com/ProtonMail/proton-bridge/v2/internal/events"
+	"github.com/ProtonMail/proton-bridge/v2/internal/frontend/types"
 	"github.com/therecipe/qt/core"
 )
 

internal/frontend/theme/detect_windows.go

@@ -32,7 +32,6 @@ func detectSystemTheme() Theme {
 		`SOFTWARE\Microsoft\Windows\CurrentVersion\Themes\Personalize`,
 		registry.QUERY_VALUE,
 	)
-
 	if err != nil {
 		log.WithError(err).Error("Not able to open register")
 		return Light

internal/frontend/types/types.go

@@ -19,9 +19,9 @@
 package types
 
 import (
-	"github.com/ProtonMail/proton-bridge/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/internal/updater"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/v2/internal/updater"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 )
 
 // PanicHandler is an interface of a type that can be used to gracefully handle panics which occur.

internal/imap/backend.go

@@ -36,11 +36,11 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/internal/config/settings"
-	"github.com/ProtonMail/proton-bridge/internal/events"
-	"github.com/ProtonMail/proton-bridge/internal/users"
-	"github.com/ProtonMail/proton-bridge/pkg/listener"
+	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/settings"
+	"github.com/ProtonMail/proton-bridge/v2/internal/events"
+	"github.com/ProtonMail/proton-bridge/v2/internal/users"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/listener"
 	"github.com/emersion/go-imap"
 	goIMAPBackend "github.com/emersion/go-imap/backend"
 )

internal/imap/bridge.go

@@ -18,9 +18,9 @@
 package imap
 
 import (
-	"github.com/ProtonMail/proton-bridge/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/internal/users"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/v2/internal/users"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 )
 
 type cacheProvider interface {

internal/imap/mailbox.go

@@ -21,8 +21,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/pkg/message"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/message"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/emersion/go-imap"
 	"github.com/sirupsen/logrus"
 )

internal/imap/mailbox_append.go

@@ -27,9 +27,9 @@ import (
 	"time"
 
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/ProtonMail/proton-bridge/internal/imap/uidplus"
-	"github.com/ProtonMail/proton-bridge/pkg/message"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/internal/imap/uidplus"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/message"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/emersion/go-imap"
 	"github.com/emersion/go-message/textproto"
 	"github.com/pkg/errors"
@@ -177,7 +177,7 @@ func (im *imapMailbox) labelExistingMessage(msg storeMessageProvider) error { //
 	// If the message is moved from any folder, the moment when expunge happens on source we will move message trash unless we move it to archive.
 	// If the message is already in Archive we should not call API at all.
 	// Otherwise the message is already in All mail, Return OK.
-	var storeMBox = im.storeMailbox
+	storeMBox := im.storeMailbox
 	if pmapi.AllMailLabel == storeMBox.LabelID() {
 		if msg.Message().HasLabelID(pmapi.ArchiveLabel) {
 			return uidplus.AppendResponse(storeMBox.UIDValidity(), storeMBox.GetUIDList([]string{msg.ID()}))
@@ -238,7 +238,7 @@ func (im *imapMailbox) importMessage(kr *crypto.KeyRing, hdr textproto.Header, b
 		return err
 	}
 
-	var targetMailbox = im.storeMailbox
+	targetMailbox := im.storeMailbox
 	if targetMailbox.LabelID() == pmapi.AllMailLabel {
 		// Importing mail in directly into All Mail is not allowed. Instead we redirect the import to Archive
 		// The mail will automatically appear in All mail. The appends response still reports that the mail was

internal/imap/mailbox_fetch.go

@@ -20,7 +20,7 @@ package imap
 import (
 	"bytes"
 
-	"github.com/ProtonMail/proton-bridge/pkg/message"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/message"
 	"github.com/emersion/go-imap"
 	"github.com/pkg/errors"
 )

internal/imap/mailbox_header.go

@@ -21,7 +21,7 @@ import (
 	"bytes"
 	"strings"
 
-	"github.com/ProtonMail/proton-bridge/pkg/message"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/message"
 	"github.com/emersion/go-imap"
 )
 

internal/imap/mailbox_messages.go

@@ -24,10 +24,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/internal/imap/uidplus"
-	"github.com/ProtonMail/proton-bridge/pkg/message"
-	"github.com/ProtonMail/proton-bridge/pkg/parallel"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/internal/imap/uidplus"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/message"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/parallel"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/emersion/go-imap"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"

internal/imap/mailbox_root.go

@@ -21,7 +21,7 @@ import (
 	"errors"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/internal/store"
+	"github.com/ProtonMail/proton-bridge/v2/internal/store"
 
 	imap "github.com/emersion/go-imap"
 )

internal/imap/server.go

@@ -26,13 +26,13 @@ import (
 	"time"
 
 	imapid "github.com/ProtonMail/go-imap-id"
-	"github.com/ProtonMail/proton-bridge/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/internal/config/useragent"
-	"github.com/ProtonMail/proton-bridge/internal/imap/id"
-	"github.com/ProtonMail/proton-bridge/internal/imap/idle"
-	"github.com/ProtonMail/proton-bridge/internal/imap/uidplus"
-	"github.com/ProtonMail/proton-bridge/internal/serverutil"
-	"github.com/ProtonMail/proton-bridge/pkg/listener"
+	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/useragent"
+	"github.com/ProtonMail/proton-bridge/v2/internal/imap/id"
+	"github.com/ProtonMail/proton-bridge/v2/internal/imap/idle"
+	"github.com/ProtonMail/proton-bridge/v2/internal/imap/uidplus"
+	"github.com/ProtonMail/proton-bridge/v2/internal/serverutil"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/listener"
 	"github.com/emersion/go-imap"
 	imapappendlimit "github.com/emersion/go-imap-appendlimit"
 	imapmove "github.com/emersion/go-imap-move"

internal/imap/store.go

@@ -23,10 +23,10 @@ import (
 	"net/textproto"
 
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/ProtonMail/proton-bridge/internal/imap/uidplus"
-	"github.com/ProtonMail/proton-bridge/internal/store"
-	pkgMsg "github.com/ProtonMail/proton-bridge/pkg/message"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/internal/imap/uidplus"
+	"github.com/ProtonMail/proton-bridge/v2/internal/store"
+	pkgMsg "github.com/ProtonMail/proton-bridge/v2/pkg/message"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 )
 
 type storeUserProvider interface {

internal/imap/updates.go

@@ -22,9 +22,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/internal/store"
-	"github.com/ProtonMail/proton-bridge/pkg/message"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/internal/store"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/message"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	imap "github.com/emersion/go-imap"
 	goIMAPBackend "github.com/emersion/go-imap/backend"
 	"github.com/sirupsen/logrus"

internal/imap/user.go

@@ -22,7 +22,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	imapquota "github.com/emersion/go-imap-quota"
 	goIMAPBackend "github.com/emersion/go-imap/backend"
 )

internal/locations/locations.go

@@ -24,7 +24,7 @@ import (
 	"path/filepath"
 	"runtime"
 
-	"github.com/ProtonMail/proton-bridge/pkg/files"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/files"
 	"github.com/sirupsen/logrus"
 )
 
@@ -107,13 +107,13 @@ func (l *Locations) getLicenseFilePath() string {
 
 // GetDependencyLicensesLink returns link to page listing dependencies.
 func (l *Locations) GetDependencyLicensesLink() string {
-	return "https://github.com/ProtonMail/proton-bridge/blob/master/COPYING_NOTES.md#dependencies"
+	return "https://github.com/ProtonMail/proton-bridge/v2/blob/master/COPYING_NOTES.md#dependencies"
 }
 
 // ProvideSettingsPath returns a location for user settings (e.g. ~/.config/<company>/<app>).
 // It creates it if it doesn't already exist.
 func (l *Locations) ProvideSettingsPath() (string, error) {
-	if err := os.MkdirAll(l.getSettingsPath(), 0700); err != nil {
+	if err := os.MkdirAll(l.getSettingsPath(), 0o700); err != nil {
 		return "", err
 	}
 
@@ -123,7 +123,7 @@ func (l *Locations) ProvideSettingsPath() (string, error) {
 // ProvideLogsPath returns a location for user logs (e.g. ~/.cache/<company>/<app>/logs).
 // It creates it if it doesn't already exist.
 func (l *Locations) ProvideLogsPath() (string, error) {
-	if err := os.MkdirAll(l.getLogsPath(), 0700); err != nil {
+	if err := os.MkdirAll(l.getLogsPath(), 0o700); err != nil {
 		return "", err
 	}
 
@@ -133,7 +133,7 @@ func (l *Locations) ProvideLogsPath() (string, error) {
 // ProvideCachePath returns a location for user cache dirs (e.g. ~/.config/<company>/<app>/cache).
 // It creates it if it doesn't already exist.
 func (l *Locations) ProvideCachePath() (string, error) {
-	if err := os.MkdirAll(l.getCachePath(), 0700); err != nil {
+	if err := os.MkdirAll(l.getCachePath(), 0o700); err != nil {
 		return "", err
 	}
 
@@ -148,7 +148,7 @@ func (l *Locations) GetOldCachePath() string {
 // ProvideUpdatesPath returns a location for update files (e.g. ~/.cache/<company>/<app>/updates).
 // It creates it if it doesn't already exist.
 func (l *Locations) ProvideUpdatesPath() (string, error) {
-	if err := os.MkdirAll(l.getUpdatesPath(), 0700); err != nil {
+	if err := os.MkdirAll(l.getUpdatesPath(), 0o700); err != nil {
 		return "", err
 	}
 

internal/locations/locations_test.go

@@ -161,7 +161,7 @@ func newTestLocations(t *testing.T) *Locations {
 
 func createFilesInDir(t *testing.T, dir string, files ...string) {
 	for _, target := range files {
-		require.NoError(t, os.MkdirAll(filepath.Dir(filepath.Join(dir, target)), 0700))
+		require.NoError(t, os.MkdirAll(filepath.Dir(filepath.Join(dir, target)), 0o700))
 
 		f, err := os.Create(filepath.Join(dir, target))
 		require.NoError(t, err)

internal/logging/crash.go

@@ -25,8 +25,8 @@ import (
 	"runtime/pprof"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/internal/constants"
-	"github.com/ProtonMail/proton-bridge/internal/crash"
+	"github.com/ProtonMail/proton-bridge/v2/internal/constants"
+	"github.com/ProtonMail/proton-bridge/v2/internal/crash"
 	"github.com/sirupsen/logrus"
 )
 
@@ -34,7 +34,7 @@ func DumpStackTrace(logsPath string) crash.RecoveryAction {
 	return func(r interface{}) error {
 		file := filepath.Join(logsPath, getStackTraceName(constants.Version, constants.Revision))
 
-		f, err := os.OpenFile(filepath.Clean(file), os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0600)
+		f, err := os.OpenFile(filepath.Clean(file), os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0o600)
 		if err != nil {
 			return err
 		}

internal/logging/logging.go

@@ -25,7 +25,7 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/internal/constants"
+	"github.com/ProtonMail/proton-bridge/v2/internal/constants"
 	"github.com/sirupsen/logrus"
 	"github.com/sirupsen/logrus/hooks/writer"
 )

internal/logging/logging_test.go

@@ -30,11 +30,11 @@ func TestClearLogs(t *testing.T) {
 	dir, err := ioutil.TempDir("", "clear-logs-test")
 	require.NoError(t, err)
 
-	require.NoError(t, ioutil.WriteFile(filepath.Join(dir, "other.log"), []byte("Hello"), 0755))
-	require.NoError(t, ioutil.WriteFile(filepath.Join(dir, "v1_10.log"), []byte("Hello"), 0755))
-	require.NoError(t, ioutil.WriteFile(filepath.Join(dir, "v1_11.log"), []byte("Hello"), 0755))
-	require.NoError(t, ioutil.WriteFile(filepath.Join(dir, "v2_12.log"), []byte("Hello"), 0755))
-	require.NoError(t, ioutil.WriteFile(filepath.Join(dir, "v2_13.log"), []byte("Hello"), 0755))
+	require.NoError(t, ioutil.WriteFile(filepath.Join(dir, "other.log"), []byte("Hello"), 0o755))
+	require.NoError(t, ioutil.WriteFile(filepath.Join(dir, "v1_10.log"), []byte("Hello"), 0o755))
+	require.NoError(t, ioutil.WriteFile(filepath.Join(dir, "v1_11.log"), []byte("Hello"), 0o755))
+	require.NoError(t, ioutil.WriteFile(filepath.Join(dir, "v2_12.log"), []byte("Hello"), 0o755))
+	require.NoError(t, ioutil.WriteFile(filepath.Join(dir, "v2_13.log"), []byte("Hello"), 0o755))
 
 	require.NoError(t, clearLogs(dir, 3, 0))
 	checkFileNames(t, dir, []string{

internal/sentry/reporter.go

@@ -25,8 +25,8 @@ import (
 	"runtime"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/internal/constants"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/internal/constants"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/getsentry/sentry-go"
 	"github.com/sirupsen/logrus"
 )

internal/sentry/reporter_test.go

@@ -35,30 +35,30 @@ func TestSkipDuringUnwind(t *testing.T) {
 	}()
 
 	wantSkippedFunctions := []string{
-		"github.com/ProtonMail/proton-bridge/internal/sentry.TestSkipDuringUnwind",
-		"github.com/ProtonMail/proton-bridge/internal/sentry.TestSkipDuringUnwind.func1",
+		"github.com/ProtonMail/proton-bridge/v2/internal/sentry.TestSkipDuringUnwind",
+		"github.com/ProtonMail/proton-bridge/v2/internal/sentry.TestSkipDuringUnwind.func1",
 	}
 	r.Equal(t, wantSkippedFunctions, skippedFunctions)
 }
 
 func TestFilterOutPanicHandlers(t *testing.T) {
 	skippedFunctions = []string{
-		"github.com/ProtonMail/proton-bridge/pkg/config.(*PanicHandler).HandlePanic",
-		"github.com/ProtonMail/proton-bridge/pkg/config.HandlePanic",
-		"github.com/ProtonMail/proton-bridge/internal/sentry.ReportSentryCrash",
-		"github.com/ProtonMail/proton-bridge/internal/sentry.ReportSentryCrash.func1",
+		"github.com/ProtonMail/proton-bridge/v2/pkg/config.(*PanicHandler).HandlePanic",
+		"github.com/ProtonMail/proton-bridge/v2/pkg/config.HandlePanic",
+		"github.com/ProtonMail/proton-bridge/v2/internal/sentry.ReportSentryCrash",
+		"github.com/ProtonMail/proton-bridge/v2/internal/sentry.ReportSentryCrash.func1",
 	}
 
 	frames := []sentry.Frame{
-		{Module: "github.com/ProtonMail/proton-bridge/internal/cmd", Function: "main"},
+		{Module: "github.com/ProtonMail/proton-bridge/v2/internal/cmd", Function: "main"},
 		{Module: "github.com/urfave/cli", Function: "(*App).Run"},
-		{Module: "github.com/ProtonMail/proton-bridge/internal/cmd", Function: "RegisterHandlePanic"},
+		{Module: "github.com/ProtonMail/proton-bridge/v2/internal/cmd", Function: "RegisterHandlePanic"},
 		{Module: "github.com/ProtonMail/pkg", Function: "HandlePanic"},
 		{Module: "main", Function: "run"},
-		{Module: "github.com/ProtonMail/proton-bridge/pkg/config", Function: "(*PanicHandler).HandlePanic"},
-		{Module: "github.com/ProtonMail/proton-bridge/pkg/config", Function: "HandlePanic"},
-		{Module: "github.com/ProtonMail/proton-bridge/internal/sentry", Function: "ReportSentryCrash"},
-		{Module: "github.com/ProtonMail/proton-bridge/internal/sentry", Function: "ReportSentryCrash.func1"},
+		{Module: "github.com/ProtonMail/proton-bridge/v2/pkg/config", Function: "(*PanicHandler).HandlePanic"},
+		{Module: "github.com/ProtonMail/proton-bridge/v2/pkg/config", Function: "HandlePanic"},
+		{Module: "github.com/ProtonMail/proton-bridge/v2/internal/sentry", Function: "ReportSentryCrash"},
+		{Module: "github.com/ProtonMail/proton-bridge/v2/internal/sentry", Function: "ReportSentryCrash.func1"},
 	}
 
 	gotFrames := filterOutPanicHandlers(frames)

internal/serverutil/controller.go

@@ -22,8 +22,8 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/ProtonMail/proton-bridge/internal/events"
-	"github.com/ProtonMail/proton-bridge/pkg/listener"
+	"github.com/ProtonMail/proton-bridge/v2/internal/events"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/listener"
 	"github.com/sirupsen/logrus"
 )
 

internal/serverutil/test/controller_test.go

@@ -22,9 +22,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/internal/events"
-	"github.com/ProtonMail/proton-bridge/internal/serverutil"
-	"github.com/ProtonMail/proton-bridge/pkg/listener"
+	"github.com/ProtonMail/proton-bridge/v2/internal/events"
+	"github.com/ProtonMail/proton-bridge/v2/internal/serverutil"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/listener"
 	"github.com/stretchr/testify/require"
 )
 

internal/serverutil/test/server.go

@@ -24,8 +24,8 @@ import (
 	"net"
 	"net/http"
 
-	"github.com/ProtonMail/proton-bridge/internal/serverutil"
-	"github.com/ProtonMail/proton-bridge/pkg/ports"
+	"github.com/ProtonMail/proton-bridge/v2/internal/serverutil"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/ports"
 )
 
 func newTestServer() *testServer {

internal/smtp/backend.go

@@ -21,11 +21,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/internal/config/settings"
-	"github.com/ProtonMail/proton-bridge/internal/users"
-	"github.com/ProtonMail/proton-bridge/pkg/confirmer"
-	"github.com/ProtonMail/proton-bridge/pkg/listener"
+	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/v2/internal/config/settings"
+	"github.com/ProtonMail/proton-bridge/v2/internal/users"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/confirmer"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/listener"
 	goSMTPBackend "github.com/emersion/go-smtp"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"

internal/smtp/bridge.go

@@ -18,9 +18,9 @@
 package smtp
 
 import (
-	"github.com/ProtonMail/proton-bridge/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/internal/users"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/v2/internal/users"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 )
 
 type bridger interface {

internal/smtp/dump_qa.go

@@ -15,6 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
 
+//go:build build_qa
 // +build build_qa
 
 package smtp
@@ -38,7 +39,7 @@ func dumpMessageData(b []byte, subject string) {
 
 	path := filepath.Join(home, "bridge-qa")
 
-	if err := os.MkdirAll(path, 0700); err != nil {
+	if err := os.MkdirAll(path, 0o700); err != nil {
 		logrus.WithError(err).Error("Failed to dump raw message data")
 		return
 	}
@@ -50,7 +51,7 @@ func dumpMessageData(b []byte, subject string) {
 	if err := ioutil.WriteFile(
 		filepath.Join(path, fmt.Sprintf("%v-%v.eml", subject, time.Now().Unix())),
 		b,
-		0600,
+		0o600,
 	); err != nil {
 		logrus.WithError(err).Error("Failed to dump raw message data")
 		return

internal/smtp/preferences.go

@@ -19,7 +19,7 @@ package smtp
 
 import (
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/pkg/errors"
 )
 

internal/smtp/preferences_test.go

@@ -21,7 +21,7 @@ import (
 	"testing"
 
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

internal/smtp/send_recorder.go

@@ -25,7 +25,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 )
 
 type messageGetter interface {

internal/smtp/send_recorder_test.go

@@ -25,7 +25,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/stretchr/testify/assert"
 )
 

internal/smtp/server.go

@@ -23,9 +23,9 @@ import (
 	"io"
 	"net"
 
-	"github.com/ProtonMail/proton-bridge/internal/bridge"
-	"github.com/ProtonMail/proton-bridge/internal/serverutil"
-	"github.com/ProtonMail/proton-bridge/pkg/listener"
+	"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
+	"github.com/ProtonMail/proton-bridge/v2/internal/serverutil"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/listener"
 	"github.com/emersion/go-sasl"
 	goSMTP "github.com/emersion/go-smtp"
 )

internal/smtp/smtp.go

@@ -20,6 +20,4 @@ package smtp
 
 import "github.com/sirupsen/logrus"
 
-var (
-	log = logrus.WithField("pkg", "smtp") //nolint:gochecknoglobals
-)
+var log = logrus.WithField("pkg", "smtp") //nolint:gochecknoglobals

internal/smtp/store.go

@@ -21,7 +21,7 @@ import (
 	"io"
 
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 )
 
 type storeUserProvider interface {

internal/smtp/user.go

@@ -32,11 +32,11 @@ import (
 	"time"
 
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/ProtonMail/proton-bridge/internal/events"
-	"github.com/ProtonMail/proton-bridge/pkg/listener"
-	pkgMsg "github.com/ProtonMail/proton-bridge/pkg/message"
-	"github.com/ProtonMail/proton-bridge/pkg/message/parser"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/internal/events"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/listener"
+	pkgMsg "github.com/ProtonMail/proton-bridge/v2/pkg/message"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/message/parser"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	goSMTPBackend "github.com/emersion/go-smtp"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"

internal/smtp/vcard_tools.go

@@ -23,7 +23,7 @@ import (
 	"strings"
 
 	"github.com/ProtonMail/go-vcard"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 )
 
 type ContactMetadata struct {

internal/store/address.go

@@ -18,7 +18,7 @@
 package store
 
 import (
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/sirupsen/logrus"
 	bolt "go.etcd.io/bbolt"
 )

internal/store/address_mailbox.go

@@ -20,7 +20,7 @@ package store
 import (
 	"fmt"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 )
 
 // ListMailboxes returns all mailboxes.

internal/store/address_message.go

@@ -18,7 +18,7 @@
 package store
 
 import (
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	bolt "go.etcd.io/bbolt"
 )
 

internal/store/cache.go

@@ -21,9 +21,9 @@ import (
 	"context"
 
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	"github.com/ProtonMail/proton-bridge/internal/store/cache"
-	"github.com/ProtonMail/proton-bridge/pkg/message"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/internal/store/cache"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/message"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	bolt "go.etcd.io/bbolt"
 )
 

internal/store/cache/disk.go

@@ -29,12 +29,14 @@ import (
 	"path/filepath"
 	"sync"
 
-	"github.com/ProtonMail/proton-bridge/pkg/semaphore"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/semaphore"
 	"github.com/ricochet2200/go-disk-usage/du"
 )
 
-var ErrMsgCorrupted = errors.New("ecrypted file was corrupted")
-var ErrLowSpace = errors.New("not enough free space left on device")
+var (
+	ErrMsgCorrupted = errors.New("ecrypted file was corrupted")
+	ErrLowSpace     = errors.New("not enough free space left on device")
+)
 
 // IsOnDiskCache will return true if Cache is type of onDiskCache.
 func IsOnDiskCache(c Cache) bool {
@@ -58,7 +60,7 @@ type onDiskCache struct {
 }
 
 func NewOnDiskCache(path string, cmp Compressor, opts Options) (Cache, error) {
-	if err := os.MkdirAll(path, 0700); err != nil {
+	if err := os.MkdirAll(path, 0o700); err != nil {
 		return nil, err
 	}
 
@@ -114,7 +116,7 @@ func (c *onDiskCache) Unlock(userID string, passphrase []byte) error {
 		return err
 	}
 
-	if err := os.MkdirAll(c.getUserPath(userID), 0700); err != nil {
+	if err := os.MkdirAll(c.getUserPath(userID), 0o700); err != nil {
 		return err
 	}
 
@@ -239,7 +241,7 @@ func (c *onDiskCache) writeFile(path string, b []byte) error {
 	defer c.update()
 
 	// NOTE(GODT-1158): What happens when this fails? Should be fixed eventually.
-	return ioutil.WriteFile(filepath.Clean(path), b, 0600)
+	return ioutil.WriteFile(filepath.Clean(path), b, 0o600)
 }
 
 func (c *onDiskCache) hasSpace(size int) bool {

internal/store/cache_test.go

@@ -20,7 +20,7 @@ package store
 import (
 	"testing"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
 )

internal/store/cache_watcher.go

@@ -21,7 +21,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/internal/store/cache"
+	"github.com/ProtonMail/proton-bridge/v2/internal/store/cache"
 )
 
 func (store *Store) StartWatcher() {

internal/store/cache_worker_test.go

@@ -20,7 +20,7 @@ package store
 import (
 	"testing"
 
-	storemocks "github.com/ProtonMail/proton-bridge/internal/store/mocks"
+	storemocks "github.com/ProtonMail/proton-bridge/v2/internal/store/mocks"
 	"github.com/golang/mock/gomock"
 	"github.com/pkg/errors"
 )

internal/store/change.go

@@ -18,7 +18,7 @@
 package store
 
 import (
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 )
 
 type ChangeNotifier interface {

internal/store/change_test.go

@@ -20,7 +20,7 @@ package store
 import (
 	"testing"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
 )

internal/store/event_loop.go

@@ -22,9 +22,9 @@ import (
 	"math/rand"
 	"time"
 
-	bridgeEvents "github.com/ProtonMail/proton-bridge/internal/events"
-	"github.com/ProtonMail/proton-bridge/pkg/listener"
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	bridgeEvents "github.com/ProtonMail/proton-bridge/v2/internal/events"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/listener"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )

internal/store/event_loop_test.go

@@ -23,7 +23,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
 )

internal/store/mailbox.go

@@ -23,7 +23,7 @@ import (
 	"strings"
 	"sync/atomic"
 
-	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/v2/pkg/pmapi"
 	"github.com/sirupsen/logrus"
 	bolt "go.etcd.io/bbolt"
 )