From db72e4ea8e282b034bc0e1435b2af47b8b643433 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Tue, 8 Sep 2020 19:50:25 -0700 Subject: [PATCH 1/3] Bump version and build number. --- xcconfig/common/NetNewsWire_mac_target_common.xcconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xcconfig/common/NetNewsWire_mac_target_common.xcconfig b/xcconfig/common/NetNewsWire_mac_target_common.xcconfig index 858cb8bc8..6209501ea 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 = 5.1a2 -CURRENT_PROJECT_VERSION = 3004 +MARKETING_VERSION = 5.1b1 +CURRENT_PROJECT_VERSION = 3005 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon From daebe8f46792748dbca6380140d5ad897e658a89 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Tue, 8 Sep 2020 20:09:32 -0700 Subject: [PATCH 2/3] Update credits; update copyrights. --- Frameworks/SyncDatabase/Info.plist | 2 +- Mac/Resources/Credits.rtf | 15 +++++++++------ Mac/Resources/Info.plist | 2 +- Mac/SafariExtension/Info.plist | 2 +- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Frameworks/SyncDatabase/Info.plist b/Frameworks/SyncDatabase/Info.plist index 76da86ac6..5550efc84 100644 --- a/Frameworks/SyncDatabase/Info.plist +++ b/Frameworks/SyncDatabase/Info.plist @@ -19,6 +19,6 @@ CFBundleVersion $(CURRENT_PROJECT_VERSION) NSHumanReadableCopyright - Copyright © 2019 Ranchero Software. All rights reserved. + Copyright © 2019-2020 Brent Simmons. All rights reserved. diff --git a/Mac/Resources/Credits.rtf b/Mac/Resources/Credits.rtf index d3d86734d..83b8c5565 100644 --- a/Mac/Resources/Credits.rtf +++ b/Mac/Resources/Credits.rtf @@ -1,4 +1,4 @@ -{\rtf1\ansi\ansicpg1252\cocoartf2511 +{\rtf1\ansi\ansicpg1252\cocoartf2513 \cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fnil\fcharset0 LucidaGrande-Bold;\f1\fnil\fcharset0 LucidaGrande;} {\colortbl;\red255\green255\blue255;\red0\green0\blue0;} {\*\expandedcolortbl;;\cssrgb\c0\c0\c0\cname textColor;} @@ -18,10 +18,13 @@ By Brent Simmons\ \f0\b \cf2 Credits: \f1\b0 \ \pard\pardeftab720\li360\sa60\partightenfactor0 -\cf2 App icon and most other icons: {\field{\*\fldinst{HYPERLINK "https://twitter.com/BradEllis"}}{\fldrslt Brad Ellis}}\ -Major code contributors: {\field{\*\fldinst{HYPERLINK "https://github.com/olofhellman"}}{\fldrslt Olof Hellman}}, {\field{\*\fldinst{HYPERLINK "https://github.com/vincode-io"}}{\fldrslt Maurice Parker}}, and {\field{\*\fldinst{HYPERLINK "https://github.com/danielpunkass"}}{\fldrslt Daniel Jalkut\ -}}Help book by {\field{\*\fldinst{HYPERLINK "https://nostodnayr.net/"}}{\fldrslt Ryan Dotson}}\ -Difficult infrastructure by {\field{\*\fldinst{HYPERLINK "https://rhonabwy.com/"}}{\fldrslt Joe Heck}}\ +\cf2 Lead developer: {\field{\*\fldinst{HYPERLINK "https://github.com/vincode-io"}}{\fldrslt Maurice Parker}}\ +App icon and most other icons: {\field{\*\fldinst{HYPERLINK "https://twitter.com/BradEllis"}}{\fldrslt Brad Ellis}}\ +Feedly syncing: {\field{\*\fldinst{HYPERLINK "https://twitter.com/kielgillard"}}{\fldrslt Kiel Gillard}}\ +Under-the-hood magic and CSS stylin\'92s: {\field{\*\fldinst{HYPERLINK "https://github.com/wevah"}}{\fldrslt Nate Weaver}}\ +Newsfoot (JS footnote displayer): {\field{\*\fldinst{HYPERLINK "https://github.com/brehaut/"}}{\fldrslt Andrew Brehaut}}\ +Help book: {\field{\*\fldinst{HYPERLINK "https://nostodnayr.net/"}}{\fldrslt Ryan Dotson}}\ +And featuring contributions from {\field{\*\fldinst{HYPERLINK "https://github.com/danielpunkass"}}{\fldrslt Daniel Jalkut}}, {\field{\*\fldinst{HYPERLINK "https://rhonabwy.com/"}}{\fldrslt Joe Heck}}, {\field{\*\fldinst{HYPERLINK "https://github.com/olofhellman"}}{\fldrslt Olof Hellman}}, {\field{\*\fldinst{HYPERLINK "https://blog.rizwan.dev/"}}{\fldrslt Rizwan Mohamed Ibrahim}}, {\field{\*\fldinst{HYPERLINK "https://stuartbreckenridge.com/"}}{\fldrslt Stuart Breckenridge}}, {\field{\*\fldinst{HYPERLINK "https://twitter.com/philviso"}}{\fldrslt Phil Viso}}, and {\field{\*\fldinst{HYPERLINK "https://github.com/Ranchero-Software/NetNewsWire/graphs/contributors"}}{\fldrslt many more}}!\ \ \pard\pardeftab720\sa60\partightenfactor0 @@ -44,5 +47,5 @@ Difficult infrastructure by {\field{\*\fldinst{HYPERLINK "https://rhonabwy.com/" \f0\b \cf2 Dedication:\ \pard\pardeftab720\li360\sa60\partightenfactor0 -\f1\b0 \cf2 NetNewsWire 5.0 is dedicated to Aaron Swartz, Derek Miller, and Alex King, who helped with earlier versions of NetNewsWire, who I miss.\ +\f1\b0 \cf2 NetNewsWire 5.1 is dedicated to everyone working to save democracy around the world.\ } \ No newline at end of file diff --git a/Mac/Resources/Info.plist b/Mac/Resources/Info.plist index 85ebc9ae8..2be12c7ff 100644 --- a/Mac/Resources/Info.plist +++ b/Mac/Resources/Info.plist @@ -52,7 +52,7 @@ NSAppleScriptEnabled NSHumanReadableCopyright - Copyright © 2002-2019 Brent Simmons. All rights reserved. + Copyright © 2002-2020 Brent Simmons. All rights reserved. NSMainStoryboardFile Main NSPrincipalClass diff --git a/Mac/SafariExtension/Info.plist b/Mac/SafariExtension/Info.plist index 5f4fa8c03..e38797986 100644 --- a/Mac/SafariExtension/Info.plist +++ b/Mac/SafariExtension/Info.plist @@ -57,7 +57,7 @@ NSHumanReadableCopyright - Copyright © 2019 Ranchero Software. All rights reserved. + Copyright © 2019-2020 Brent Simmons. All rights reserved. NSHumanReadableDescription This extension adds a Safari toolbar button for easily subscribing to the syndication feed for the current page. From c684a08f5be0b8999d3c4a3f71c40225c1f9d421 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Wed, 9 Sep 2020 22:50:02 -0700 Subject: [PATCH 3/3] Use correct URLs for Sparkle updates. --- Mac/Resources/Info.plist | 4 ++-- Multiplatform/macOS/Info.plist | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Mac/Resources/Info.plist b/Mac/Resources/Info.plist index 2be12c7ff..e998a537d 100644 --- a/Mac/Resources/Info.plist +++ b/Mac/Resources/Info.plist @@ -60,9 +60,9 @@ OSAScriptingDefinition NetNewsWire.sdef SUFeedURL - https://ranchero.com/downloads/netnewswire-5.1-beta.xml + https://ranchero.com/downloads/netnewswire-release.xml FeedURLForTestBuilds - https://ranchero.com/downloads/netnewswire-5.1-beta.xml + https://ranchero.com/downloads/netnewswire-beta.xml UserAgent NetNewsWire (RSS Reader; https://ranchero.com/netnewswire/) OrganizationIdentifier diff --git a/Multiplatform/macOS/Info.plist b/Multiplatform/macOS/Info.plist index ec33c4818..9aad2f0d9 100644 --- a/Multiplatform/macOS/Info.plist +++ b/Multiplatform/macOS/Info.plist @@ -50,8 +50,8 @@ SUFeedURL - https://ranchero.com/downloads/netnewswire-5.1-beta.xml + https://ranchero.com/downloads/netnewswire-release.xml FeedURLForTestBuilds - https://ranchero.com/downloads/netnewswire-5.1-beta.xml + https://ranchero.com/downloads/netnewswire-beta.xml