From 60f13c32a407198ab3f8960e046ef8a43120500b Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Fri, 6 Sep 2019 20:00:06 -0700 Subject: [PATCH 1/4] Update to latest RSParser. --- submodules/RSParser | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/RSParser b/submodules/RSParser index 76f4c468c..9e86cf613 160000 --- a/submodules/RSParser +++ b/submodules/RSParser @@ -1 +1 @@ -Subproject commit 76f4c468cee1e46544897d44c40e87e2bd05d729 +Subproject commit 9e86cf613b40b6a3389b6248be9427d90debbf9f From 5b15285e8ec3a7f87f0ee5500ed9ee5ec6c74947 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Sat, 7 Sep 2019 18:27:48 -0700 Subject: [PATCH 2/4] =?UTF-8?q?Make=20sure=20that=20article.preferredLink?= =?UTF-8?q?=20doesn=E2=80=99t=20return=20an=20empty=20string.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Shared/Data/ArticleUtilities.swift | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Shared/Data/ArticleUtilities.swift b/Shared/Data/ArticleUtilities.swift index be7bc3df8..12df236ec 100644 --- a/Shared/Data/ArticleUtilities.swift +++ b/Shared/Data/ArticleUtilities.swift @@ -46,7 +46,13 @@ extension Article { } var preferredLink: String? { - return url ?? externalURL + if let url = url, !url.isEmpty { + return url + } + if let externalURL = externalURL, !externalURL.isEmpty { + return externalURL + } + return nil } var body: String? { From c05e55af4168f5db09bdd931586be81bd806a799 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Sat, 7 Sep 2019 18:31:07 -0700 Subject: [PATCH 3/4] Update to latest RSCore. --- submodules/RSCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/RSCore b/submodules/RSCore index 290b79dcd..3e0dbb1c0 160000 --- a/submodules/RSCore +++ b/submodules/RSCore @@ -1 +1 @@ -Subproject commit 290b79dcd6156210dedddeb767164436ef9481e0 +Subproject commit 3e0dbb1c0a88697e7be510da0226fe1e3e7ef195 From 53370ff0d30b87bf6e436416b8f1e48b1d56a1e6 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Sat, 7 Sep 2019 20:45:10 -0700 Subject: [PATCH 4/4] Bump version to 5.0.1d2. --- xcconfig/NetNewsWire_target.xcconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xcconfig/NetNewsWire_target.xcconfig b/xcconfig/NetNewsWire_target.xcconfig index 0e9e1a2e2..397010614 100644 --- a/xcconfig/NetNewsWire_target.xcconfig +++ b/xcconfig/NetNewsWire_target.xcconfig @@ -29,8 +29,8 @@ PROVISIONING_PROFILE_SPECIFIER = #include? "../../SharedXcodeSettings/DeveloperSettings.xcconfig" // High Level Settings common to both the Mac application and any extensions we bundle with it -MARKETING_VERSION = 5.0.1d1 -CURRENT_PROJECT_VERSION = 2611 +MARKETING_VERSION = 5.0.1d2 +CURRENT_PROJECT_VERSION = 2612 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES COMBINE_HIDPI_IMAGES = YES