From 30fc11920b780bbfc08cd4881eb081b8b33e67b6 Mon Sep 17 00:00:00 2001
From: Gerhard Olsson <gerhardol@users.noreply.github.com>
Date: Thu, 27 Jul 2023 21:46:06 +0200
Subject: [PATCH] Prepare for 2.6.0 (#1156)

---
 app/assets/changes.html                                 | 9 +++++++++
 build.gradle                                            | 6 +++---
 fastlane/metadata/android/en-US/changelogs/21000330.txt | 5 +++++
 3 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/21000330.txt
diff --git a/app/assets/changes.html b/app/assets/changes.html
index 62c3d59e5..77f597e35 100644
--- a/app/assets/changes.html
+++ b/app/assets/changes.html
@@ -5,6 +5,15 @@
 </head>
 <body>
 <h1>What's new</h1>
+<h2>v2.6.0</h2>
+<p>
+<ul>
+    <li>Prepare for Android 14</li>
+    <li>Library updates and internal cleanup</li>
+    <li>Update ANT+ library (finally with Android 13 fixes)</li>
+    <li>Translation updates</li>
+    <li>Set time from system clock correction</li>
+</ul>
 <h2>v2.5.2</h2>
 <p>
 <ul>
diff --git a/build.gradle b/build.gradle
index 07968560b..ca54ad059 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,9 +30,9 @@ project.ext {
     mockitoVersion = '3.11.2'
 
     //The Git tag for the release must be identical for F-Droid
-    versionName = '2.5.2.0'
-    versionCode = 327
-    latestBaseVersionCode = 15000000
+    versionName = '2.6.0.0'
+    versionCode = 330
+    latestBaseVersionCode = minSdk * 1000000
 
     // F-Droid builds only allow free software (wear dir deleted at builds)
     allowNonFree = !project.hasProperty('org.runnerup.free') && rootProject.file("wear").exists()
diff --git a/fastlane/metadata/android/en-US/changelogs/21000330.txt b/fastlane/metadata/android/en-US/changelogs/21000330.txt
new file mode 100644
index 000000000..1e7b58357
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/21000330.txt
@@ -0,0 +1,5 @@
+Prepare for Android 14<
+Library updates and internal cleanup
+Update ANT+ library (finally with Android 13 fixes)
+Translation updates
+Set time from system clock correction
\ No newline at end of file
