From 33e73a2b47d1f0534d6b146b14f0c2a7006ab184 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 24 Feb 2021 12:18:14 +0100
Subject: [PATCH] bump version code for release

---
 build.gradle                                         | 6 ++----
 fastlane/metadata/android/en-US/changelogs/42000.txt | 4 ++++
 2 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/42000.txt

diff --git a/build.gradle b/build.gradle
index 96a796623..af488dbbd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -91,8 +91,8 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 408
-        versionName "2.9.7-beta"
+        versionCode 42000
+        versionName "2.9.7"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId
@@ -276,8 +276,6 @@ android {
             def baseAbiVersionCode = project.ext.abiCodes.get(output.getFilter(OutputFile.ABI))
             if (baseAbiVersionCode != null) {
                 output.versionCodeOverride = (100 * variant.versionCode) + baseAbiVersionCode
-            } else {
-                output.versionCodeOverride = (100 * variant.versionCode)
             }
         }
 
diff --git a/fastlane/metadata/android/en-US/changelogs/42000.txt b/fastlane/metadata/android/en-US/changelogs/42000.txt
new file mode 100644
index 000000000..1ecfe204d
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/42000.txt
@@ -0,0 +1,4 @@
+* Ability to select incoming call ringtone
+* Fix OpenPGP key id discovery for OpenKeychain 5.6+
+* Properly verify punycode TLS certificates
+* Improve stability of RTP session establishment (calling)