From 5c6cc3e5229676655e93264e24a146a26b980e45 Mon Sep 17 00:00:00 2001
From: "Dustin J. Mitchell" <dustin@v.igoro.us>
Date: Sun, 4 Aug 2024 12:51:11 -0400
Subject: [PATCH] Release 3.1.0 (#3574)

---
 CMakeLists.txt           |  2 +-
 ChangeLog                | 40 +++++++++++++++++++++++++++++++++++++---
 src/commands/CmdNews.cpp | 30 +++++++++++++++++++-----------
 3 files changed, 57 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c1187509..8a9d0e896 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ enable_testing()
 set (CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 project (task
-  VERSION 3.0.2
+  VERSION 3.1.0
   DESCRIPTION "Taskwarrior - a command-line TODO list manager"
   HOMEPAGE_URL https://taskwarrior.org/)
 
diff --git a/ChangeLog b/ChangeLog
index 6a8b78bb5..7b3e87c8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,47 @@
 ------ current release ---------------------------
 
+3.1.0 -
+
+ - Support for `task purge` has been restored, and new support added for automatically
+   expiring old tasks. (#3540, #3546, #3556)
+ - `task news` is now better behaved, and can be completely disabled.
+ - Multiple imports of the same UUID will now generate a warning. (#3560)
+ - The `sync.server.url` config replaces `sync.server.origin` and allows a URL
+   containing a path. (#3423)
+ - The new `bubblegum-256.theme` has improved legibility and contrast over
+   others. (#3505)
+ - Warnings regarding `.data` files are only show for reports. (#3473)
+ - Inherited urgency is correctly calculated to make parents more urgent than
+   children (#2941)
+ - Task completion commands no longer trigger hooks (#3133)
+
+Thanks to the following people for contributions to this release:
+
+ - Adrian Galilea
+ - Adrian Sadłocha
+ - Andonome
+ - Christian Clauss
+ - Dominik Rehák
+ - Dustin J. Mitchell
+ - Felix Schurk
+ - Hector Dearman
+ - Joseph Coffa
+ - koleesch
+ - Maarten Aertsen
+ - mattsmida
+ - Philipp Oberdiek
+ - Sebastian Carlos
+ - sleepy_nols
+ - Steve Dondley
+ - Will R S Hansen
+
+------ old releases ------------------------------
+
 3.0.2 -
 
 - Fix an accidentally-included debug print which polluted output of
   reports with the Taskwarrior version (#3389)
 
------- old releases ------------------------------
-
-
 3.0.1 -
 
 - Fix an error in creation of the 3.0.0 tarball which caused builds to fail (#3302)
diff --git a/src/commands/CmdNews.cpp b/src/commands/CmdNews.cpp
index cb1e8a3c0..7a3fbb7dc 100644
--- a/src/commands/CmdNews.cpp
+++ b/src/commands/CmdNews.cpp
@@ -470,25 +470,34 @@ void NewsItem::version3_0_0(std::vector<NewsItem>& items) {
 
 void NewsItem::version3_1_0(std::vector<NewsItem>& items) {
   Version version("3.1.0");
-  NewsItem sync{
+  NewsItem purge{
       version,
       /*title=*/"Purging Tasks, Manually or Automatically",
       /*bg_title=*/"",
       /*background=*/"",
       /*punchline=*/
-      "Support for `task purge` has been restored, and new support added for automatically "
-      "expiring\n"
-      "old tasks.\n\n"
+      "Support for `task purge` has been restored, and new support added for automatically\n"
+      "expiring old tasks.\n\n",
       /*update=*/
-      "The `task purge` command removes tasks entirely, in contrast to `task delete` which merely "
-      "sets\n"
-      "the task status to 'Deleted'. This functionality existed in versions 2.x but was "
-      "temporarily\n"
-      "removed in 3.0.\n\n"
+      "The `task purge` command removes tasks entirely, in contrast to `task delete` which merely\n"
+      "sets the task status to 'Deleted'. This functionality existed in versions 2.x but was\n"
+      "temporarily removed in 3.0.\n\n"
       "The new `purge.on-sync` configuration parameter controls automatic purging of old tasks.\n"
       "An old task is one with status 'Deleted' that has not been modified in 180 days. This\n"
       "functionality is optional and not enabled by default."};
-  items.push_back(sync);
+  items.push_back(purge);
+  NewsItem news{
+      version,
+      /*title=*/"Improved 'task news'",
+      /*bg_title=*/"",
+      /*background=*/"",
+      /*punchline=*/
+      "The news you are reading now is improved.\n\n",
+      /*update=*/
+      "The `task news` command now always shows all new information, not just 'major' news,\n"
+      "and will only show that news once. New installs will assume all news has been read.\n"
+      "Finally, news can be completely hidden by removing 'news' from the 'verbose' config."};
+  items.push_back(news);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -555,7 +564,6 @@ int CmdNews::execute(std::string& output) {
 
   // Set a mark in the config to remember which version's release notes were displayed
   if (news_version != current_version) {
-    std::cout << "UPDATING\n";
     CmdConfig::setConfigVariable("news.version", std::string(current_version), false);
 
     // Revert back to default signal handling after displaying the outro