Other: Add v2 to module name

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.