From 65eb583dff1cc8fe37b1deada9be3da158a3f92a Mon Sep 17 00:00:00 2001
From: Oleg Koretsky <oko@concordium.com>
Date: Fri, 2 Aug 2024 12:16:50 +0300
Subject: [PATCH] Merge release 1.7.0 (#346)

This is the release branch merge.
The packages are built from the "1.7.0" tag.
---
 CHANGELOG.md     | 21 +++++++++++++++++++--
 app/build.gradle |  4 ++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index acd2cc83..0c09f4dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,24 +5,34 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.7.0] - 2024-07-31
+
+### Added
+
+- Deprecation notice. This wallet is going away soon,
+  move your account to the new CryptoX wallet to continue using Concordium.
+
 ## [1.6.0] - 2024-06-26
 
 ### Fixed
+
 - Sending WalletConnect transaction with 0 energy if its payload is too large
 
 ### Removed
+
 - Shielding – you can still enable and see your shielded balance and history,
-but to unshield the funds CryptoX Concordium wallet must be used
+  but to unshield the funds CryptoX Concordium wallet must be used
 
 ## [1.5.1] - 2024-03-18
 
 ### Fixed
+
 - Inability to update the validator's rewards restake preference if their stake is below
 - Inability to add CIS-2 tokens with corrupted metadata or missing balance
 - Writing incorrect `environment` value to the key export file
 - Inability to edit validator pool commission rates in locales with comma decimal separator
 - Inability to search for CIS-2 token by ID on contracts with lots of tokens
-- When managing CIS-2 tokens, removing all of them when only unselecting the visible ones 
+- When managing CIS-2 tokens, removing all of them when only unselecting the visible ones
 
 ## [1.5.0]
 
@@ -120,10 +130,17 @@ but to unshield the funds CryptoX Concordium wallet must be used
 - Last release without changelog.
 
 [Unreleased]: https://github.com/Concordium/concordium-reference-wallet-android/compare/1.6.0...HEAD
+
 [1.6.0]: https://github.com/Concordium/concordium-reference-wallet-android/compare/1.5.1...1.6.0
+
 [1.5.1]: https://github.com/Concordium/concordium-reference-wallet-android/compare/1.5.0...1.5.1
+
 [1.5.0]: https://github.com/Concordium/concordium-reference-wallet-android/compare/1.3.0...1.5.0
+
 [1.3.0]: https://github.com/Concordium/concordium-reference-wallet-android/compare/1.2.1...1.3.0
+
 [1.2.1]: https://github.com/Concordium/concordium-reference-wallet-android/compare/1.2.0...1.2.1
+
 [1.2.0]: https://github.com/Concordium/concordium-reference-wallet-android/compare/1.1.8...1.2.0
+
 [1.1.8]: https://github.com/Concordium/concordium-reference-wallet-android/tree/1.1.8
diff --git a/app/build.gradle b/app/build.gradle
index 165c6443..8a9bbfcc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -41,10 +41,10 @@ tasks.withType(Test) {
 }
 
 def versionBuildNumberMajor = 1
-def versionBuildNumberMinor = 6
+def versionBuildNumberMinor = 7
 def versionBuildNumberPatch = 0
 def versionBuildNumberMeta = ""
-def versionBuildNumberSequential = 75
+def versionBuildNumberSequential = 78
 
 task printVersionName {
     doLast {