From a7e0fa26b7ba60ce996cf6e19c9b496750b1b1d4 Mon Sep 17 00:00:00 2001
From: Conny Duck <k.pozniak@gmx.at>
Date: Tue, 5 Dec 2023 20:19:35 +0100
Subject: [PATCH] Release 115 (24.0)

---
 CHANGELOG.md                                  | 24 +++++++++++++++++++
 app/build.gradle                              |  4 ++--
 .../metadata/android/en-US/changelogs/115.txt |  2 +-
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1328cd7f59..30a02a02ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,30 @@
 
 ### Significant bug fixes
 
+## v24.0
+
+### New features and other improvements
+
+- The number of tabs that can be configured is no longer limited. [PR#4058](https://github.com/tuskyapp/Tusky/pull/4058)
+- Blockquotes and code blocks in posts now look nicer [PR#4090](https://github.com/tuskyapp/Tusky/pull/4090)[PR#4091](https://github.com/tuskyapp/Tusky/pull/4091)
+- The old behavior of the notification tab (pre Tusky 22.0) has been restored. [PR#4015](https://github.com/tuskyapp/Tusky/pull/4015)
+- Role badges are now shown on profiles (Mastodon 4.2 feature). [PR#4029](https://github.com/tuskyapp/Tusky/pull/4029)
+- The video player has been upgraded to Google Jetpack Media3; video compatibility should be improved, and you can now adjust playback speed. [PR#3857](https://github.com/tuskyapp/Tusky/pull/3857)
+- New theme option to use the black theme when following the system design. [PR#3957](https://github.com/tuskyapp/Tusky/pull/3957)
+- Following the system design is now the default theme setting. [PR#3813](https://github.com/tuskyapp/Tusky/pull/3957)
+- A new view to see trending posts is available both in the menu and as custom tab. [PR#4007](https://github.com/tuskyapp/Tusky/pull/4007)
+- A new option to hide self boosts has been added. [PR#4101](https://github.com/tuskyapp/Tusky/pull/4101)
+- The `api/v2/instance` endpoint is now supported. [PR#4062](https://github.com/tuskyapp/Tusky/pull/4062)
+- New settings for lists:
+    - Hide from the home timeline [PR#3932](https://github.com/tuskyapp/Tusky/pull/3932)
+    - Decide which replies should be shown in the list [PR#4072](https://github.com/tuskyapp/Tusky/pull/4072)
+- The oldest supported Android version is now Android 7 Nougat [PR#4014](https://github.com/tuskyapp/Tusky/pull/4014)
+
+### Significant bug fixes
+
+- **Empty trends no longer causes Tusky to crash**, [PR#3853](https://github.com/tuskyapp/Tusky/pull/3853)
+
+
 ## v23.0
 
 ### New features and other improvements
diff --git a/app/build.gradle b/app/build.gradle
index 28943c846d..6a79474a62 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -29,8 +29,8 @@ android {
         namespace "com.keylesspalace.tusky"
         minSdk 24
         targetSdk 33
-        versionCode 114
-        versionName "24.0 beta 1"
+        versionCode 115
+        versionName "24.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
 
diff --git a/fastlane/metadata/android/en-US/changelogs/115.txt b/fastlane/metadata/android/en-US/changelogs/115.txt
index 753c50a796..82ab6233cc 100644
--- a/fastlane/metadata/android/en-US/changelogs/115.txt
+++ b/fastlane/metadata/android/en-US/changelogs/115.txt
@@ -1,6 +1,6 @@
 Tusky 24.0
 
-- Blockqoutes and code blocks in posts now look nicer.
+- Blockquotes and code blocks in posts now look nicer.
 - The old behavior of the notification tab has been restored.
 - Role badges are now shown on profiles.
 - The video player has been improved. You can now select the playback speed.