From 767f76892f9adaa5a8c54784944ca6360c063d45 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Thu, 17 Jun 2021 14:32:00 -0500 Subject: [PATCH 1/3] Fix the OAuthSwift package since the 2.2 version has trouble looking up credentials. --- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- Secrets/Package.swift | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NetNewsWire.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/NetNewsWire.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index d1b0d534c..b58a85312 100644 --- a/NetNewsWire.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/NetNewsWire.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -42,8 +42,8 @@ "repositoryURL": "https://github.com/OAuthSwift/OAuthSwift.git", "state": { "branch": null, - "revision": "d85964b96dbce94df961f28b996187c835089903", - "version": "2.2.0" + "revision": "fde77955e6983fbfaabd491709d52b8a82fda4d0", + "version": "2.1.2" } }, { diff --git a/Secrets/Package.swift b/Secrets/Package.swift index 2e30c6a8a..fdd6bc08a 100644 --- a/Secrets/Package.swift +++ b/Secrets/Package.swift @@ -11,7 +11,7 @@ let package = Package( targets: ["Secrets"]), ], dependencies: [ - .package(url: "https://github.com/OAuthSwift/OAuthSwift.git", .upToNextMajor(from: "2.1.2")), + .package(url: "https://github.com/OAuthSwift/OAuthSwift.git", .exact("2.1.2")), ], targets: [ .target( From 8be9bf6861f90ce439a1b0b8b0b1aeda92dcb8eb Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Sun, 20 Jun 2021 16:03:54 -0700 Subject: [PATCH 2/3] Update Help book URL. --- iOS/Settings/SettingsViewController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iOS/Settings/SettingsViewController.swift b/iOS/Settings/SettingsViewController.swift index 62ad0dda3..7cfc36d15 100644 --- a/iOS/Settings/SettingsViewController.swift +++ b/iOS/Settings/SettingsViewController.swift @@ -226,7 +226,7 @@ class SettingsViewController: UITableViewController { case 7: switch indexPath.row { case 0: - openURL("https://netnewswire.com/help/ios/5.0/en/") + openURL("https://netnewswire.com/help/ios/6.0/en/") tableView.selectRow(at: nil, animated: true, scrollPosition: .none) case 1: openURL("https://netnewswire.com/") From c18dbaa250bbc2d356d62c247f36815e38664bf3 Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Sun, 20 Jun 2021 16:04:37 -0700 Subject: [PATCH 3/3] Update build number. --- xcconfig/common/NetNewsWire_ios_target_common.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xcconfig/common/NetNewsWire_ios_target_common.xcconfig b/xcconfig/common/NetNewsWire_ios_target_common.xcconfig index bd062ed50..ef5675d42 100644 --- a/xcconfig/common/NetNewsWire_ios_target_common.xcconfig +++ b/xcconfig/common/NetNewsWire_ios_target_common.xcconfig @@ -1,7 +1,7 @@ // High Level Settings common to both the iOS application and any extensions we bundle with it MARKETING_VERSION = 6.0 -CURRENT_PROJECT_VERSION = 604 +CURRENT_PROJECT_VERSION = 606 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon