From 351cd29050c68fd386cc92ba7a64e78ccc8bbe80 Mon Sep 17 00:00:00 2001
From: Jakub <jakub@cuth.sk>
Date: Thu, 13 Oct 2022 16:50:45 +0200
Subject: [PATCH] Other: Bridge Osney 2.4.2

---
 Changelog.md  | 6 +++++-
 Makefile      | 2 +-
 test/Makefile | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 51dd88ca..2d3f04d5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,7 +3,7 @@
 Changelog [format](http://keepachangelog.com/en/1.0.0/)
 
 
-## [Bridge 2.4.1] Osney
+## [Bridge 2.4.2] Osney
 
 ## Changed
 * Other: implemented tokens in bridge-gui-tester.
@@ -21,6 +21,7 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/)
 * Other: gRPC TLS server is generated for every session.
 * GODT-1917: gRPC service should use random port.
 * GODT-1924: gRPC identity validation with tokens.
+* GODT-1344: Notifications for ApiCertError and NoActiveKeyForRecipient.
 
 ## Fixed
 * GUI issues:
@@ -30,9 +31,12 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/)
     * GODT-1851: Port field error label now wraps.
     * GODT-1566: GUI shows error notifications for IMAP/SMTP port errors on startup.
     * GODT-1926: Clear port error messages when cancelling the dialog.
+    * Other: Fixed cocoa related warnings in bridge-gui on macOS.
+
 * Build issues:
     * GODT-1675: Add resrource file to both launcher and bridge-go.
     * Other: Add WlShellIntegration lib for rpm package.
+    * GODT-1935: Fix resource file generation for both Launcher and Bridge.
 * GODT-1931: Fixed bridge crash when checking for update while offline.
 
 ## [Bridge 2.4.0] Osney
diff --git a/Makefile b/Makefile
index a8af52a8..ebe33363 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
 .PHONY: build build-gui build-nogui build-launcher versioner hasher
 
 # Keep version hardcoded so app build works also without Git repository.
-BRIDGE_APP_VERSION?=2.4.1+git
+BRIDGE_APP_VERSION?=2.4.2+git
 APP_VERSION:=${BRIDGE_APP_VERSION}
 APP_FULL_NAME:=Proton Mail Bridge
 APP_VENDOR:=Proton AG
diff --git a/test/Makefile b/test/Makefile
index de74dd33..943f1607 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,7 +1,7 @@
 .PHONY: check-go check-godog install-godog test test-bridge test-live test-live-bridge test-stage test-debug test-live-debug bench
 
 export GO111MODULE=on
-export BRIDGE_VERSION:=2.4.1+integrationtests
+export BRIDGE_VERSION:=2.4.2+integrationtests
 export VERBOSITY?=fatal
 export TEST_DATA=testdata