From 0ba9a06b92eccba973d9a5b962550a862cdbe73e Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Mon, 13 Mar 2023 21:44:32 -0700 Subject: [PATCH] Update Twitter notice to not specify any dates. Bump version and build. --- Mac/AppDelegate.swift | 2 +- Technotes/ReleaseNotes-Mac.markdown | 8 ++++++++ xcconfig/common/NetNewsWire_mac_target_common.xcconfig | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Mac/AppDelegate.swift b/Mac/AppDelegate.swift index b3740902e..d94bb544b 100644 --- a/Mac/AppDelegate.swift +++ b/Mac/AppDelegate.swift @@ -974,7 +974,7 @@ internal extension AppDelegate { let alert = NSAlert() alert.alertStyle = .warning alert.messageText = NSLocalizedString("Twitter Integration Removed", comment: "Twitter Integration Removed") - alert.informativeText = NSLocalizedString("On February 1, 2023, Twitter announced the end of free access to the Twitter API, effective later in February.\n\nSince Twitter does not provide RSS feeds, we’ve had to use the Twitter API. Without free access to that API, we can’t read feeds from Twitter.\n\nWe’ve left your Twitter feeds intact. If you have any starred items from those feeds, they will remain as long as you don’t delete those feeds.\n\nYou can still read whatever you have already downloaded. However, those feeds will no longer update.", comment: "Twitter deprecation informative text.") + alert.informativeText = NSLocalizedString("Twitter has ended free access to the parts of the Twitter API that we need.\n\nSince Twitter does not provide RSS feeds, we’ve had to use the Twitter API. Without free access to that API, we can’t read feeds from Twitter.\n\nWe’ve left your Twitter feeds intact. If you have any starred items from those feeds, they will remain as long as you don’t delete those feeds.\n\nYou can still read whatever you have already downloaded. However, those feeds will no longer update.", comment: "Twitter deprecation informative text.") alert.addButton(withTitle: NSLocalizedString("OK", comment: "OK")) alert.buttons[0].keyEquivalent = "\r" alert.runModal() diff --git a/Technotes/ReleaseNotes-Mac.markdown b/Technotes/ReleaseNotes-Mac.markdown index 30b310de4..a02693092 100644 --- a/Technotes/ReleaseNotes-Mac.markdown +++ b/Technotes/ReleaseNotes-Mac.markdown @@ -1,5 +1,13 @@ # Mac Release Notes +## 6.1.1 build 6112 13 Mar 2023 + +Revised Twitter removal warning to not mention any specific month. We’re holding this release until Twitter shuts down free access to its API. + +## 6.1.1 build 6111 9 Feb 2023 + +Same as 6.1.1b4 but with updated build and version number. + ### 6.1.1b4 build 6110 9 Feb 2023 Update the Twitter removal warning to say “later in February” instead of “February 9,” since Twitter postponed the removal date to the 13th and might postpone it further. diff --git a/xcconfig/common/NetNewsWire_mac_target_common.xcconfig b/xcconfig/common/NetNewsWire_mac_target_common.xcconfig index ebdacccb9..73248e143 100644 --- a/xcconfig/common/NetNewsWire_mac_target_common.xcconfig +++ b/xcconfig/common/NetNewsWire_mac_target_common.xcconfig @@ -1,6 +1,6 @@ // High Level Settings common to both the Mac application and any extensions we bundle with it -MARKETING_VERSION = 6.1.1b4 -CURRENT_PROJECT_VERSION = 6110 +MARKETING_VERSION = 6.1.1 +CURRENT_PROJECT_VERSION = 6112 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;