diff --git a/Mac/AppDelegate.swift b/Mac/AppDelegate.swift index a86c6c4a7..5306d0519 100644 --- a/Mac/AppDelegate.swift +++ b/Mac/AppDelegate.swift @@ -22,7 +22,7 @@ import Sparkle var appDelegate: AppDelegate! @NSApplicationMain -class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations, UNUserNotificationCenterDelegate, UnreadCountProvider, SPUStandardUserDriverDelegate, SPUUpdaterDelegate { +final class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations, UNUserNotificationCenterDelegate, UnreadCountProvider, SPUStandardUserDriverDelegate, SPUUpdaterDelegate { private struct WindowRestorationIdentifiers { static let mainWindow = "mainWindow" diff --git a/Mac/MainWindow/AddFeed/AddFeedController.swift b/Mac/MainWindow/AddFeed/AddFeedController.swift index 87f420f2d..6abca3011 100644 --- a/Mac/MainWindow/AddFeed/AddFeedController.swift +++ b/Mac/MainWindow/AddFeed/AddFeedController.swift @@ -22,7 +22,7 @@ import Parser // Else, // display error sheet. -class AddFeedController: AddFeedWindowControllerDelegate { +final class AddFeedController: AddFeedWindowControllerDelegate { private let hostWindow: NSWindow private var addFeedWindowController: AddFeedWindowController? diff --git a/Mac/MainWindow/AddFeed/FolderTreeMenu.swift b/Mac/MainWindow/AddFeed/FolderTreeMenu.swift index 7ab0153f8..9b7247766 100644 --- a/Mac/MainWindow/AddFeed/FolderTreeMenu.swift +++ b/Mac/MainWindow/AddFeed/FolderTreeMenu.swift @@ -11,7 +11,7 @@ import RSCore import RSTree import Account -class FolderTreeMenu { +final class FolderTreeMenu { static func createFolderPopupMenu(with rootNode: Node, restrictToSpecialAccounts: Bool = false) -> NSMenu { diff --git a/Mac/MainWindow/AddFolder/AddFolderWindowController.swift b/Mac/MainWindow/AddFolder/AddFolderWindowController.swift index 6d98a6a1e..94581f9ce 100644 --- a/Mac/MainWindow/AddFolder/AddFolderWindowController.swift +++ b/Mac/MainWindow/AddFolder/AddFolderWindowController.swift @@ -10,7 +10,7 @@ import AppKit import Articles import Account -class AddFolderWindowController: NSWindowController { +final class AddFolderWindowController: NSWindowController { @IBOutlet var folderNameTextField: NSTextField! @IBOutlet var accountPopupButton: NSPopUpButton! diff --git a/Mac/MainWindow/ArticleExtractorButton.swift b/Mac/MainWindow/ArticleExtractorButton.swift index b4da51581..28396f48f 100644 --- a/Mac/MainWindow/ArticleExtractorButton.swift +++ b/Mac/MainWindow/ArticleExtractorButton.swift @@ -15,7 +15,7 @@ enum ArticleExtractorButtonState { case off } -class ArticleExtractorButton: NSButton { +final class ArticleExtractorButton: NSButton { private var animatedLayer: CALayer? diff --git a/Mac/MainWindow/LegacyArticleExtractorButton.swift b/Mac/MainWindow/LegacyArticleExtractorButton.swift index e0ff64711..aa2bbdeba 100644 --- a/Mac/MainWindow/LegacyArticleExtractorButton.swift +++ b/Mac/MainWindow/LegacyArticleExtractorButton.swift @@ -8,7 +8,7 @@ import Foundation -class LegacyArticleExtractorButton: NSButton { +final class LegacyArticleExtractorButton: NSButton { var isError = false { didSet { diff --git a/Mac/MainWindow/MainWindowController.swift b/Mac/MainWindow/MainWindowController.swift index ceb4824d8..10324c6c1 100644 --- a/Mac/MainWindow/MainWindowController.swift +++ b/Mac/MainWindow/MainWindowController.swift @@ -16,7 +16,7 @@ enum TimelineSourceMode { case regular, search } -class MainWindowController: NSWindowController, NSUserInterfaceValidations { +final class MainWindowController: NSWindowController, NSUserInterfaceValidations { @IBOutlet weak var articleThemePopUpButton: NSPopUpButton? diff --git a/Mac/MainWindow/OPML/ExportOPMLWindowController.swift b/Mac/MainWindow/OPML/ExportOPMLWindowController.swift index 3fe900e5a..3ee4f6f3b 100644 --- a/Mac/MainWindow/OPML/ExportOPMLWindowController.swift +++ b/Mac/MainWindow/OPML/ExportOPMLWindowController.swift @@ -10,7 +10,7 @@ import AppKit import Account import UniformTypeIdentifiers -class ExportOPMLWindowController: NSWindowController { +final class ExportOPMLWindowController: NSWindowController { @IBOutlet weak var accountPopUpButton: NSPopUpButton! private weak var hostWindow: NSWindow? diff --git a/Mac/MainWindow/OPML/ImportOPMLWindowController.swift b/Mac/MainWindow/OPML/ImportOPMLWindowController.swift index 7cfd938cf..4a3fb8e0f 100644 --- a/Mac/MainWindow/OPML/ImportOPMLWindowController.swift +++ b/Mac/MainWindow/OPML/ImportOPMLWindowController.swift @@ -10,7 +10,7 @@ import AppKit import Account import UniformTypeIdentifiers -class ImportOPMLWindowController: NSWindowController { +final class ImportOPMLWindowController: NSWindowController { @IBOutlet weak var accountPopUpButton: NSPopUpButton! private weak var hostWindow: NSWindow? diff --git a/Mac/MainWindow/Sidebar/Cell/SidebarCell.swift b/Mac/MainWindow/Sidebar/Cell/SidebarCell.swift index b8f972ca1..0354dd7c6 100644 --- a/Mac/MainWindow/Sidebar/Cell/SidebarCell.swift +++ b/Mac/MainWindow/Sidebar/Cell/SidebarCell.swift @@ -11,7 +11,7 @@ import RSCore import Account import RSTree -class SidebarCell: NSTableCellView { +final class SidebarCell: NSTableCellView { var iconImage: IconImage? { didSet { diff --git a/Mac/MainWindow/Sidebar/SidebarOutlineView.swift b/Mac/MainWindow/Sidebar/SidebarOutlineView.swift index 55902492d..951efa868 100644 --- a/Mac/MainWindow/Sidebar/SidebarOutlineView.swift +++ b/Mac/MainWindow/Sidebar/SidebarOutlineView.swift @@ -10,7 +10,7 @@ import AppKit import RSCore import RSTree -class SidebarOutlineView: NSOutlineView { +final class SidebarOutlineView: NSOutlineView { @IBOutlet var keyboardDelegate: KeyboardDelegate! diff --git a/Mac/MainWindow/Sidebar/SidebarViewController.swift b/Mac/MainWindow/Sidebar/SidebarViewController.swift index 5a4c69e1d..14c985d7f 100644 --- a/Mac/MainWindow/Sidebar/SidebarViewController.swift +++ b/Mac/MainWindow/Sidebar/SidebarViewController.swift @@ -22,7 +22,7 @@ protocol SidebarDelegate: AnyObject { func sidebarInvalidatedRestorationState(_: SidebarViewController) } -@objc class SidebarViewController: NSViewController, NSOutlineViewDelegate, NSMenuDelegate, UndoableCommandRunner { +@objc final class SidebarViewController: NSViewController, NSOutlineViewDelegate, NSMenuDelegate, UndoableCommandRunner { @IBOutlet weak var outlineView: NSOutlineView! diff --git a/Mac/MainWindow/Sidebar/UnreadCountView.swift b/Mac/MainWindow/Sidebar/UnreadCountView.swift index 0918484d7..59298ed70 100644 --- a/Mac/MainWindow/Sidebar/UnreadCountView.swift +++ b/Mac/MainWindow/Sidebar/UnreadCountView.swift @@ -8,7 +8,7 @@ import AppKit -class UnreadCountView: NSView { +final class UnreadCountView: NSView { struct Appearance { static let padding = NSEdgeInsets(top: 1.0, left: 7.0, bottom: 1.0, right: 7.0) diff --git a/Mac/MainWindow/Timeline/Cell/TimelineTableCellView.swift b/Mac/MainWindow/Timeline/Cell/TimelineTableCellView.swift index 8ded0f5a7..b7ef6de19 100644 --- a/Mac/MainWindow/Timeline/Cell/TimelineTableCellView.swift +++ b/Mac/MainWindow/Timeline/Cell/TimelineTableCellView.swift @@ -9,7 +9,7 @@ import AppKit import RSCore -class TimelineTableCellView: NSTableCellView { +final class TimelineTableCellView: NSTableCellView { private let titleView = TimelineTableCellView.multiLineTextField() private let summaryView = TimelineTableCellView.multiLineTextField() diff --git a/Mac/MainWindow/Timeline/Cell/UnreadIndicatorView.swift b/Mac/MainWindow/Timeline/Cell/UnreadIndicatorView.swift index 40d9a62f6..c3a99ba56 100644 --- a/Mac/MainWindow/Timeline/Cell/UnreadIndicatorView.swift +++ b/Mac/MainWindow/Timeline/Cell/UnreadIndicatorView.swift @@ -8,7 +8,7 @@ import AppKit -class UnreadIndicatorView: NSView { +final class UnreadIndicatorView: NSView { static let unreadCircleDimension: CGFloat = 8.0 diff --git a/Mac/MainWindow/Timeline/TimelineTableRowView.swift b/Mac/MainWindow/Timeline/TimelineTableRowView.swift index 5714c2b5c..b08cd3b33 100644 --- a/Mac/MainWindow/Timeline/TimelineTableRowView.swift +++ b/Mac/MainWindow/Timeline/TimelineTableRowView.swift @@ -8,7 +8,7 @@ import AppKit -class TimelineTableRowView: NSTableRowView { +final class TimelineTableRowView: NSTableRowView { private var separator: NSView? diff --git a/Mac/MainWindow/Timeline/TimelineTableView.swift b/Mac/MainWindow/Timeline/TimelineTableView.swift index 45c193b68..1d4c0d7e4 100644 --- a/Mac/MainWindow/Timeline/TimelineTableView.swift +++ b/Mac/MainWindow/Timeline/TimelineTableView.swift @@ -9,7 +9,7 @@ import AppKit import RSCore -class TimelineTableView: NSTableView { +final class TimelineTableView: NSTableView { weak var keyboardDelegate: KeyboardDelegate? diff --git a/Mac/Preferences/Accounts/AccountCell.swift b/Mac/Preferences/Accounts/AccountCell.swift index 60bb8fcc4..6da8d4ca9 100644 --- a/Mac/Preferences/Accounts/AccountCell.swift +++ b/Mac/Preferences/Accounts/AccountCell.swift @@ -8,7 +8,7 @@ import AppKit -class AccountCell: NSTableCellView { +final class AccountCell: NSTableCellView { private var originalImage: NSImage? diff --git a/Mac/Preferences/Accounts/AccountsAddCloudKitWindowController.swift b/Mac/Preferences/Accounts/AccountsAddCloudKitWindowController.swift index b88f19ad1..8f4f7818e 100644 --- a/Mac/Preferences/Accounts/AccountsAddCloudKitWindowController.swift +++ b/Mac/Preferences/Accounts/AccountsAddCloudKitWindowController.swift @@ -17,7 +17,7 @@ enum AccountsAddCloudKitWindowControllerError: LocalizedError { } } -class AccountsAddCloudKitWindowController: NSWindowController { +final class AccountsAddCloudKitWindowController: NSWindowController { @IBOutlet weak var limitationsAndSolutionsTextField: NSTextField! diff --git a/Mac/Preferences/Accounts/AccountsAddLocalWindowController.swift b/Mac/Preferences/Accounts/AccountsAddLocalWindowController.swift index abe9d4288..e3343104c 100644 --- a/Mac/Preferences/Accounts/AccountsAddLocalWindowController.swift +++ b/Mac/Preferences/Accounts/AccountsAddLocalWindowController.swift @@ -9,7 +9,7 @@ import AppKit import Account -class AccountsAddLocalWindowController: NSWindowController { +final class AccountsAddLocalWindowController: NSWindowController { @IBOutlet private weak var nameTextField: NSTextField! @IBOutlet private weak var localAccountNameTextField: NSTextField! diff --git a/Mac/Preferences/Accounts/AccountsFeedbinWindowController.swift b/Mac/Preferences/Accounts/AccountsFeedbinWindowController.swift index a108b8eff..cf37ab5ec 100644 --- a/Mac/Preferences/Accounts/AccountsFeedbinWindowController.swift +++ b/Mac/Preferences/Accounts/AccountsFeedbinWindowController.swift @@ -11,7 +11,7 @@ import Account import RSWeb import Secrets -class AccountsFeedbinWindowController: NSWindowController { +final class AccountsFeedbinWindowController: NSWindowController { @IBOutlet weak var signInTextField: NSTextField! @IBOutlet weak var noAccountTextField: NSTextField! diff --git a/Mac/Preferences/Accounts/AccountsNewsBlurWindowController.swift b/Mac/Preferences/Accounts/AccountsNewsBlurWindowController.swift index 904a93b3e..83b5abab8 100644 --- a/Mac/Preferences/Accounts/AccountsNewsBlurWindowController.swift +++ b/Mac/Preferences/Accounts/AccountsNewsBlurWindowController.swift @@ -11,7 +11,7 @@ import Account import RSWeb import Secrets -class AccountsNewsBlurWindowController: NSWindowController { +final class AccountsNewsBlurWindowController: NSWindowController { @IBOutlet weak var signInTextField: NSTextField! @IBOutlet weak var noAccountTextField: NSTextField! diff --git a/Mac/Preferences/Accounts/AccountsReaderAPIWindowController.swift b/Mac/Preferences/Accounts/AccountsReaderAPIWindowController.swift index d4fcb88a8..4544088ce 100644 --- a/Mac/Preferences/Accounts/AccountsReaderAPIWindowController.swift +++ b/Mac/Preferences/Accounts/AccountsReaderAPIWindowController.swift @@ -11,7 +11,7 @@ import Account import RSWeb import Secrets -class AccountsReaderAPIWindowController: NSWindowController { +final class AccountsReaderAPIWindowController: NSWindowController { @IBOutlet weak var titleImageView: NSImageView! @IBOutlet weak var titleLabel: NSTextField! diff --git a/Mac/Preferences/PreferencesWindowController.swift b/Mac/Preferences/PreferencesWindowController.swift index 20cfabcaf..13ab9b068 100644 --- a/Mac/Preferences/PreferencesWindowController.swift +++ b/Mac/Preferences/PreferencesWindowController.swift @@ -27,7 +27,7 @@ private struct ToolbarItemIdentifier { static let Advanced = "Advanced" } -class PreferencesWindowController: NSWindowController, NSToolbarDelegate { +final class PreferencesWindowController: NSWindowController, NSToolbarDelegate { private let windowWidth = CGFloat(512.0) // Width is constant for all views; only the height changes private var viewControllers = [String: NSViewController]() diff --git a/Mac/SafariExtension/SafariExtensionHandler.swift b/Mac/SafariExtension/SafariExtensionHandler.swift index ffbd6f564..c9a6a9477 100644 --- a/Mac/SafariExtension/SafariExtensionHandler.swift +++ b/Mac/SafariExtension/SafariExtensionHandler.swift @@ -8,7 +8,7 @@ import SafariServices -class SafariExtensionHandler: SFSafariExtensionHandler { +final class SafariExtensionHandler: SFSafariExtensionHandler { // Safari App Extensions don't support any reasonable means of detecting whether a // specific Safari page was loaded with the benefit of the extension's injected @@ -20,7 +20,7 @@ class SafariExtensionHandler: SFSafariExtensionHandler { // I tried to use a NSMapTable from String to the closure directly, but Swift // complains that the object has to be a class type. typealias ValidationHandler = (Bool, String) -> Void - class ValidationWrapper { + final class ValidationWrapper { let validationHandler: ValidationHandler init(validationHandler: @escaping ValidationHandler) { diff --git a/Mac/SafariExtension/SafariExtensionViewController.swift b/Mac/SafariExtension/SafariExtensionViewController.swift index e3a0d715f..8da1fed4f 100644 --- a/Mac/SafariExtension/SafariExtensionViewController.swift +++ b/Mac/SafariExtension/SafariExtensionViewController.swift @@ -8,7 +8,7 @@ import SafariServices -class SafariExtensionViewController: SFSafariExtensionViewController { +final class SafariExtensionViewController: SFSafariExtensionViewController { // This would be the place to handle a popover that could, for example, list the possibly multiple feeds offered by a site. static let shared: SafariExtensionViewController = { diff --git a/Mac/Scriptability/Account+Scriptability.swift b/Mac/Scriptability/Account+Scriptability.swift index e424e2327..f0ec417df 100644 --- a/Mac/Scriptability/Account+Scriptability.swift +++ b/Mac/Scriptability/Account+Scriptability.swift @@ -12,7 +12,7 @@ import Articles import RSCore @objc(ScriptableAccount) -class ScriptableAccount: NSObject, UniqueIdScriptingObject, ScriptingObjectContainer { +final class ScriptableAccount: NSObject, UniqueIdScriptingObject, ScriptingObjectContainer { let account: Account init (_ account: Account) { diff --git a/Mac/Scriptability/AppDelegate+Scriptability.swift b/Mac/Scriptability/AppDelegate+Scriptability.swift index c7955b1c6..720701590 100644 --- a/Mac/Scriptability/AppDelegate+Scriptability.swift +++ b/Mac/Scriptability/AppDelegate+Scriptability.swift @@ -90,7 +90,7 @@ extension AppDelegate: AppDelegateAppleEvents { } } -class NetNewsWireCreateElementCommand: NSCreateCommand { +final class NetNewsWireCreateElementCommand: NSCreateCommand { override func performDefaultImplementation() -> Any? { let classDescription = self.createClassDescription if classDescription.className == "feed" { @@ -110,7 +110,7 @@ class NetNewsWireCreateElementCommand: NSCreateCommand { is ambiguity about whether specifiers are lists or single objects, the code switches based on which it is. */ -class NetNewsWireDeleteCommand: NSDeleteCommand { +final class NetNewsWireDeleteCommand: NSDeleteCommand { /* delete(objectToDelete:, from container:) @@ -165,7 +165,7 @@ class NetNewsWireDeleteCommand: NSDeleteCommand { } } -class NetNewsWireExistsCommand: NSExistsCommand { +final class NetNewsWireExistsCommand: NSExistsCommand { // cocoa default behavior doesn't work here, because of cases where we define an object's property // to be another object type. e.g., 'permalink of the current article' parses as diff --git a/Mac/Scriptability/Article+Scriptability.swift b/Mac/Scriptability/Article+Scriptability.swift index 2b7b9ddbd..db417a161 100644 --- a/Mac/Scriptability/Article+Scriptability.swift +++ b/Mac/Scriptability/Article+Scriptability.swift @@ -11,7 +11,7 @@ import Account import Articles @objc(ScriptableArticle) -class ScriptableArticle: NSObject, UniqueIdScriptingObject, ScriptingObjectContainer { +final class ScriptableArticle: NSObject, UniqueIdScriptingObject, ScriptingObjectContainer { let article: Article let container: ScriptingObjectContainer diff --git a/Mac/Scriptability/Author+Scriptability.swift b/Mac/Scriptability/Author+Scriptability.swift index 524cb6f80..0bab249db 100644 --- a/Mac/Scriptability/Author+Scriptability.swift +++ b/Mac/Scriptability/Author+Scriptability.swift @@ -11,7 +11,7 @@ import Account import Articles @objc(ScriptableAuthor) -class ScriptableAuthor: NSObject, UniqueIdScriptingObject { +final class ScriptableAuthor: NSObject, UniqueIdScriptingObject { let author: Author let container: ScriptingObjectContainer diff --git a/Mac/Scriptability/Folder+Scriptability.swift b/Mac/Scriptability/Folder+Scriptability.swift index 648631437..d7b2aef8f 100644 --- a/Mac/Scriptability/Folder+Scriptability.swift +++ b/Mac/Scriptability/Folder+Scriptability.swift @@ -12,7 +12,7 @@ import Articles import RSCore @objc(ScriptableFolder) -class ScriptableFolder: NSObject, UniqueIdScriptingObject, ScriptingObjectContainer { +final class ScriptableFolder: NSObject, UniqueIdScriptingObject, ScriptingObjectContainer { let folder: Folder let container: ScriptingObjectContainer diff --git a/Mac/Scriptability/WebFeed+Scriptability.swift b/Mac/Scriptability/WebFeed+Scriptability.swift index 7795f25cf..6dc10adbb 100644 --- a/Mac/Scriptability/WebFeed+Scriptability.swift +++ b/Mac/Scriptability/WebFeed+Scriptability.swift @@ -12,7 +12,7 @@ import Account import Articles @objc(ScriptableFeed) -class ScriptableFeed: NSObject, UniqueIdScriptingObject, ScriptingObjectContainer { +final class ScriptableFeed: NSObject, UniqueIdScriptingObject, ScriptingObjectContainer { let feed: Feed let container: ScriptingObjectContainer diff --git a/Mac/ShareExtension/ShareViewController.swift b/Mac/ShareExtension/ShareViewController.swift index 9301f78a3..00a402273 100644 --- a/Mac/ShareExtension/ShareViewController.swift +++ b/Mac/ShareExtension/ShareViewController.swift @@ -10,7 +10,7 @@ import Cocoa import os.log import UniformTypeIdentifiers -class ShareViewController: NSViewController { +final class ShareViewController: NSViewController { @IBOutlet weak var nameTextField: NSTextField! @IBOutlet weak var folderPopUpButton: NSPopUpButton! diff --git a/Modules/Account/Sources/Account/CloudKit/CloudKitAccountZoneDelegate.swift b/Modules/Account/Sources/Account/CloudKit/CloudKitAccountZoneDelegate.swift index ff7f1721c..78c134953 100644 --- a/Modules/Account/Sources/Account/CloudKit/CloudKitAccountZoneDelegate.swift +++ b/Modules/Account/Sources/Account/CloudKit/CloudKitAccountZoneDelegate.swift @@ -13,7 +13,7 @@ import CloudKit import RSCore import Articles -class CloudKitAcountZoneDelegate: CloudKitZoneDelegate { +final class CloudKitAcountZoneDelegate: CloudKitZoneDelegate { struct UnclaimedFeed { let url: URL diff --git a/Modules/Account/Sources/Account/CloudKit/CloudKitArticlesZoneDelegate.swift b/Modules/Account/Sources/Account/CloudKit/CloudKitArticlesZoneDelegate.swift index 1acd66b6f..10f854ee4 100644 --- a/Modules/Account/Sources/Account/CloudKit/CloudKitArticlesZoneDelegate.swift +++ b/Modules/Account/Sources/Account/CloudKit/CloudKitArticlesZoneDelegate.swift @@ -16,7 +16,7 @@ import SyncDatabase import Articles import ArticlesDatabase -class CloudKitArticlesZoneDelegate: CloudKitZoneDelegate { +final class CloudKitArticlesZoneDelegate: CloudKitZoneDelegate { private var log = OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "CloudKit") diff --git a/Modules/Account/Sources/Account/CloudKit/CloudKitReceiveStatusOperation.swift b/Modules/Account/Sources/Account/CloudKit/CloudKitReceiveStatusOperation.swift index bae85938f..4fbcc2d71 100644 --- a/Modules/Account/Sources/Account/CloudKit/CloudKitReceiveStatusOperation.swift +++ b/Modules/Account/Sources/Account/CloudKit/CloudKitReceiveStatusOperation.swift @@ -10,7 +10,7 @@ import Foundation import os.log import RSCore -class CloudKitReceiveStatusOperation: MainThreadOperation { +final class CloudKitReceiveStatusOperation: MainThreadOperation { private var log = OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "CloudKit") diff --git a/Modules/Account/Sources/Account/CloudKit/CloudKitRemoteNotificationOperation.swift b/Modules/Account/Sources/Account/CloudKit/CloudKitRemoteNotificationOperation.swift index fef3ed378..c5b6dcb01 100644 --- a/Modules/Account/Sources/Account/CloudKit/CloudKitRemoteNotificationOperation.swift +++ b/Modules/Account/Sources/Account/CloudKit/CloudKitRemoteNotificationOperation.swift @@ -11,7 +11,7 @@ import Foundation import os.log import RSCore -class CloudKitRemoteNotificationOperation: MainThreadOperation { +final class CloudKitRemoteNotificationOperation: MainThreadOperation { private var log = OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "CloudKit") diff --git a/Modules/Account/Sources/Account/CloudKit/CloudKitSendStatusOperation.swift b/Modules/Account/Sources/Account/CloudKit/CloudKitSendStatusOperation.swift index 83f2ed304..6e28bf339 100644 --- a/Modules/Account/Sources/Account/CloudKit/CloudKitSendStatusOperation.swift +++ b/Modules/Account/Sources/Account/CloudKit/CloudKitSendStatusOperation.swift @@ -13,7 +13,7 @@ import RSCore import RSWeb import SyncDatabase -class CloudKitSendStatusOperation: MainThreadOperation { +final class CloudKitSendStatusOperation: MainThreadOperation { private var log = OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "CloudKit") private let blockSize = 150 diff --git a/Modules/Account/Sources/Account/FeedFinder/FeedFinder.swift b/Modules/Account/Sources/Account/FeedFinder/FeedFinder.swift index 6e6bfdf04..b8049f671 100644 --- a/Modules/Account/Sources/Account/FeedFinder/FeedFinder.swift +++ b/Modules/Account/Sources/Account/FeedFinder/FeedFinder.swift @@ -11,7 +11,7 @@ import Parser import RSWeb import RSCore -class FeedFinder { +final class FeedFinder { static func find(url: URL, completion: @escaping (Result, Error>) -> Void) { Downloader.shared.download(url) { (data, response, error) in diff --git a/Modules/Account/Sources/Account/FeedFinder/HTMLFeedFinder.swift b/Modules/Account/Sources/Account/FeedFinder/HTMLFeedFinder.swift index 12fb2dc9d..fc4af1f65 100644 --- a/Modules/Account/Sources/Account/FeedFinder/HTMLFeedFinder.swift +++ b/Modules/Account/Sources/Account/FeedFinder/HTMLFeedFinder.swift @@ -11,7 +11,7 @@ import Parser private let feedURLWordsToMatch = ["feed", "xml", "rss", "atom", "json"] -class HTMLFeedFinder { +final class HTMLFeedFinder { var feedSpecifiers: Set { return Set(feedSpecifiersDictionary.values) diff --git a/Modules/Account/Sources/Account/Feedly/Operations/FeedlyAddExistingFeedOperation.swift b/Modules/Account/Sources/Account/Feedly/Operations/FeedlyAddExistingFeedOperation.swift index 9b172a0a9..21f16e7c9 100644 --- a/Modules/Account/Sources/Account/Feedly/Operations/FeedlyAddExistingFeedOperation.swift +++ b/Modules/Account/Sources/Account/Feedly/Operations/FeedlyAddExistingFeedOperation.swift @@ -12,7 +12,7 @@ import RSWeb import RSCore import Secrets -class FeedlyAddExistingFeedOperation: FeedlyOperation, FeedlyOperationDelegate, FeedlyCheckpointOperationDelegate { +final class FeedlyAddExistingFeedOperation: FeedlyOperation, FeedlyOperationDelegate, FeedlyCheckpointOperationDelegate { private let operationQueue = MainThreadOperationQueue() var addCompletionHandler: ((Result) -> Void)? diff --git a/Modules/Account/Sources/Account/Feedly/Operations/FeedlyAddNewFeedOperation.swift b/Modules/Account/Sources/Account/Feedly/Operations/FeedlyAddNewFeedOperation.swift index 0e718f7b0..3d9a6e1b6 100644 --- a/Modules/Account/Sources/Account/Feedly/Operations/FeedlyAddNewFeedOperation.swift +++ b/Modules/Account/Sources/Account/Feedly/Operations/FeedlyAddNewFeedOperation.swift @@ -13,7 +13,7 @@ import RSWeb import RSCore import Secrets -class FeedlyAddNewFeedOperation: FeedlyOperation, FeedlyOperationDelegate, FeedlySearchOperationDelegate, FeedlyCheckpointOperationDelegate { +final class FeedlyAddNewFeedOperation: FeedlyOperation, FeedlyOperationDelegate, FeedlySearchOperationDelegate, FeedlyCheckpointOperationDelegate { private let operationQueue = MainThreadOperationQueue() private let folder: Folder diff --git a/Modules/Account/Sources/Account/Feedly/Operations/FeedlyDownloadArticlesOperation.swift b/Modules/Account/Sources/Account/Feedly/Operations/FeedlyDownloadArticlesOperation.swift index fa12bb8b3..b8eee2008 100644 --- a/Modules/Account/Sources/Account/Feedly/Operations/FeedlyDownloadArticlesOperation.swift +++ b/Modules/Account/Sources/Account/Feedly/Operations/FeedlyDownloadArticlesOperation.swift @@ -11,7 +11,7 @@ import os.log import RSCore import RSWeb -class FeedlyDownloadArticlesOperation: FeedlyOperation { +final class FeedlyDownloadArticlesOperation: FeedlyOperation { private let account: Account private let log: OSLog diff --git a/Modules/Account/Sources/Account/Feedly/Operations/FeedlyGetUpdatedArticleIdsOperation.swift b/Modules/Account/Sources/Account/Feedly/Operations/FeedlyGetUpdatedArticleIdsOperation.swift index 25c089aa6..29dcee551 100644 --- a/Modules/Account/Sources/Account/Feedly/Operations/FeedlyGetUpdatedArticleIdsOperation.swift +++ b/Modules/Account/Sources/Account/Feedly/Operations/FeedlyGetUpdatedArticleIdsOperation.swift @@ -14,7 +14,7 @@ import Secrets /// /// Typically, it pages through the article ids of the global.all stream. /// When all the article ids are collected, it is the responsibility of another operation to download them when appropriate. -class FeedlyGetUpdatedArticleIdsOperation: FeedlyOperation, FeedlyEntryIdentifierProviding { +final class FeedlyGetUpdatedArticleIdsOperation: FeedlyOperation, FeedlyEntryIdentifierProviding { private let account: Account private let resource: FeedlyResourceId diff --git a/Modules/Account/Sources/Account/Feedly/Operations/FeedlyIngestStreamArticleIdsOperation.swift b/Modules/Account/Sources/Account/Feedly/Operations/FeedlyIngestStreamArticleIdsOperation.swift index 15763ce1b..3bb1c165e 100644 --- a/Modules/Account/Sources/Account/Feedly/Operations/FeedlyIngestStreamArticleIdsOperation.swift +++ b/Modules/Account/Sources/Account/Feedly/Operations/FeedlyIngestStreamArticleIdsOperation.swift @@ -15,7 +15,7 @@ import Secrets /// Typically, it pages through the article ids of the global.all stream. /// As the article ids are collected, a default read status is created for each. /// So this operation has side effects *for the entire account* it operates on. -class FeedlyIngestStreamArticleIdsOperation: FeedlyOperation { +final class FeedlyIngestStreamArticleIdsOperation: FeedlyOperation { private let account: Account private let resource: FeedlyResourceId diff --git a/Modules/Account/Sources/Account/Feedly/Operations/FeedlySearchOperation.swift b/Modules/Account/Sources/Account/Feedly/Operations/FeedlySearchOperation.swift index d372e8e60..8986613de 100644 --- a/Modules/Account/Sources/Account/Feedly/Operations/FeedlySearchOperation.swift +++ b/Modules/Account/Sources/Account/Feedly/Operations/FeedlySearchOperation.swift @@ -18,7 +18,7 @@ protocol FeedlySearchOperationDelegate: AnyObject { /// Find one and only one feed for a given query (usually, a URL). /// What happens when a feed is found for the URL is delegated to the `searchDelegate`. -class FeedlySearchOperation: FeedlyOperation { +final class FeedlySearchOperation: FeedlyOperation { let query: String let locale: Locale diff --git a/Modules/Account/Tests/AccountTests/AccountCredentialsTest.swift b/Modules/Account/Tests/AccountTests/AccountCredentialsTest.swift index 17a545ea3..665161613 100644 --- a/Modules/Account/Tests/AccountTests/AccountCredentialsTest.swift +++ b/Modules/Account/Tests/AccountTests/AccountCredentialsTest.swift @@ -11,7 +11,7 @@ import RSWeb @testable import Account import Secrets -class AccountCredentialsTest: XCTestCase { +final class AccountCredentialsTest: XCTestCase { private var account: Account! diff --git a/Modules/Account/Tests/AccountTests/Feedbin/AccountFeedbinFolderContentsSyncTest.swift b/Modules/Account/Tests/AccountTests/Feedbin/AccountFeedbinFolderContentsSyncTest.swift index cfadcd9db..6383d9059 100644 --- a/Modules/Account/Tests/AccountTests/Feedbin/AccountFeedbinFolderContentsSyncTest.swift +++ b/Modules/Account/Tests/AccountTests/Feedbin/AccountFeedbinFolderContentsSyncTest.swift @@ -9,7 +9,7 @@ import XCTest @testable import Account -class AccountFeedbinFolderContentsSyncTest: XCTestCase { +final class AccountFeedbinFolderContentsSyncTest: XCTestCase { override func setUp() { } diff --git a/Modules/Account/Tests/AccountTests/Feedbin/AccountFeedbinFolderSyncTest.swift b/Modules/Account/Tests/AccountTests/Feedbin/AccountFeedbinFolderSyncTest.swift index 4dbc74e0a..81430d42f 100644 --- a/Modules/Account/Tests/AccountTests/Feedbin/AccountFeedbinFolderSyncTest.swift +++ b/Modules/Account/Tests/AccountTests/Feedbin/AccountFeedbinFolderSyncTest.swift @@ -9,7 +9,7 @@ import XCTest @testable import Account -class AccountFeedbinFolderSyncTest: XCTestCase { +final class AccountFeedbinFolderSyncTest: XCTestCase { override func setUp() { } diff --git a/Modules/Account/Tests/AccountTests/Feedbin/AccountFeedbinSyncTest.swift b/Modules/Account/Tests/AccountTests/Feedbin/AccountFeedbinSyncTest.swift index 740b89778..89e388276 100644 --- a/Modules/Account/Tests/AccountTests/Feedbin/AccountFeedbinSyncTest.swift +++ b/Modules/Account/Tests/AccountTests/Feedbin/AccountFeedbinSyncTest.swift @@ -9,7 +9,7 @@ import XCTest @testable import Account -class AccountFeedbinSyncTest: XCTestCase { +final class AccountFeedbinSyncTest: XCTestCase { override func setUp() { } diff --git a/Modules/Account/Tests/AccountTests/Feedly/FeedlyCheckpointOperationTests.swift b/Modules/Account/Tests/AccountTests/Feedly/FeedlyCheckpointOperationTests.swift index 8976c3699..bbf1709fb 100644 --- a/Modules/Account/Tests/AccountTests/Feedly/FeedlyCheckpointOperationTests.swift +++ b/Modules/Account/Tests/AccountTests/Feedly/FeedlyCheckpointOperationTests.swift @@ -10,9 +10,9 @@ import XCTest @testable import Account import RSCore -class FeedlyCheckpointOperationTests: XCTestCase { +final class FeedlyCheckpointOperationTests: XCTestCase { - class TestDelegate: FeedlyCheckpointOperationDelegate { + final class TestDelegate: FeedlyCheckpointOperationDelegate { var didReachCheckpointExpectation: XCTestExpectation? diff --git a/Modules/Account/Tests/AccountTests/Feedly/FeedlyCollectionParserTests.swift b/Modules/Account/Tests/AccountTests/Feedly/FeedlyCollectionParserTests.swift index 0788adb34..ebc09951c 100644 --- a/Modules/Account/Tests/AccountTests/Feedly/FeedlyCollectionParserTests.swift +++ b/Modules/Account/Tests/AccountTests/Feedly/FeedlyCollectionParserTests.swift @@ -9,7 +9,7 @@ import XCTest @testable import Account -class FeedlyCollectionParserTests: XCTestCase { +final class FeedlyCollectionParserTests: XCTestCase { func testParsing() { let collection = FeedlyCollection(feeds: [], label: "Test Collection", id: "test/collection/1") diff --git a/Modules/Account/Tests/AccountTests/Feedly/FeedlyCreateFeedsForCollectionFoldersOperationTests.swift b/Modules/Account/Tests/AccountTests/Feedly/FeedlyCreateFeedsForCollectionFoldersOperationTests.swift index 6bce0e457..32658bfb7 100644 --- a/Modules/Account/Tests/AccountTests/Feedly/FeedlyCreateFeedsForCollectionFoldersOperationTests.swift +++ b/Modules/Account/Tests/AccountTests/Feedly/FeedlyCreateFeedsForCollectionFoldersOperationTests.swift @@ -10,7 +10,7 @@ import XCTest @testable import Account import RSCore -class FeedlyCreateFeedsForCollectionFoldersOperationTests: XCTestCase { +final class FeedlyCreateFeedsForCollectionFoldersOperationTests: XCTestCase { private var account: Account! private let support = FeedlyTestSupport() @@ -27,7 +27,7 @@ class FeedlyCreateFeedsForCollectionFoldersOperationTests: XCTestCase { super.tearDown() } - class FeedsAndFoldersProvider: FeedlyFeedsAndFoldersProviding { + final class FeedsAndFoldersProvider: FeedlyFeedsAndFoldersProviding { var feedsAndFolders = [([FeedlyFeed], Folder)]() } diff --git a/Modules/Account/Tests/AccountTests/Feedly/FeedlyEntryParserTests.swift b/Modules/Account/Tests/AccountTests/Feedly/FeedlyEntryParserTests.swift index 0ed5156ba..bbdf4fc23 100644 --- a/Modules/Account/Tests/AccountTests/Feedly/FeedlyEntryParserTests.swift +++ b/Modules/Account/Tests/AccountTests/Feedly/FeedlyEntryParserTests.swift @@ -9,7 +9,7 @@ import XCTest @testable import Account -class FeedlyEntryParserTests: XCTestCase { +final class FeedlyEntryParserTests: XCTestCase { func testParsing() { let content = FeedlyEntry.Content(content: "Test Content", direction: .leftToRight) diff --git a/Modules/Account/Tests/AccountTests/Feedly/FeedlyFeedParserTests.swift b/Modules/Account/Tests/AccountTests/Feedly/FeedlyFeedParserTests.swift index f41058cbb..5cea337ad 100644 --- a/Modules/Account/Tests/AccountTests/Feedly/FeedlyFeedParserTests.swift +++ b/Modules/Account/Tests/AccountTests/Feedly/FeedlyFeedParserTests.swift @@ -9,7 +9,7 @@ import XCTest @testable import Account -class FeedlyFeedParserTests: XCTestCase { +final class FeedlyFeedParserTests: XCTestCase { func testParsing() { let name = "Test Feed" diff --git a/Modules/Account/Tests/AccountTests/Feedly/FeedlyGetCollectionsOperationTests.swift b/Modules/Account/Tests/AccountTests/Feedly/FeedlyGetCollectionsOperationTests.swift index 978807b68..bc7058e9b 100644 --- a/Modules/Account/Tests/AccountTests/Feedly/FeedlyGetCollectionsOperationTests.swift +++ b/Modules/Account/Tests/AccountTests/Feedly/FeedlyGetCollectionsOperationTests.swift @@ -11,7 +11,7 @@ import XCTest import os.log import RSCore -class FeedlyGetCollectionsOperationTests: XCTestCase { +final class FeedlyGetCollectionsOperationTests: XCTestCase { func testGetCollections() { let support = FeedlyTestSupport() @@ -58,7 +58,7 @@ class FeedlyGetCollectionsOperationTests: XCTestCase { func testGetCollectionsError() { - class TestDelegate: FeedlyOperationDelegate { + final class TestDelegate: FeedlyOperationDelegate { var errorExpectation: XCTestExpectation? var error: Error? diff --git a/Modules/Account/Tests/AccountTests/Feedly/FeedlyGetStreamContentsOperationTests.swift b/Modules/Account/Tests/AccountTests/Feedly/FeedlyGetStreamContentsOperationTests.swift index d79012bee..7538f32b3 100644 --- a/Modules/Account/Tests/AccountTests/Feedly/FeedlyGetStreamContentsOperationTests.swift +++ b/Modules/Account/Tests/AccountTests/Feedly/FeedlyGetStreamContentsOperationTests.swift @@ -10,7 +10,7 @@ import XCTest @testable import Account import RSCore -class FeedlyGetStreamContentsOperationTests: XCTestCase { +final class FeedlyGetStreamContentsOperationTests: XCTestCase { private var account: Account! private let support = FeedlyTestSupport() diff --git a/Modules/Account/Tests/AccountTests/Feedly/FeedlyGetStreamIdsOperationTests.swift b/Modules/Account/Tests/AccountTests/Feedly/FeedlyGetStreamIdsOperationTests.swift index ef2502e9e..5983733c6 100644 --- a/Modules/Account/Tests/AccountTests/Feedly/FeedlyGetStreamIdsOperationTests.swift +++ b/Modules/Account/Tests/AccountTests/Feedly/FeedlyGetStreamIdsOperationTests.swift @@ -10,7 +10,7 @@ import XCTest @testable import Account import RSCore -class FeedlyGetStreamIdsOperationTests: XCTestCase { +final class FeedlyGetStreamIdsOperationTests: XCTestCase { private var account: Account! private let support = FeedlyTestSupport() diff --git a/Modules/Account/Tests/AccountTests/Feedly/FeedlyLogoutOperationTests.swift b/Modules/Account/Tests/AccountTests/Feedly/FeedlyLogoutOperationTests.swift index b3917d405..8da6d648f 100644 --- a/Modules/Account/Tests/AccountTests/Feedly/FeedlyLogoutOperationTests.swift +++ b/Modules/Account/Tests/AccountTests/Feedly/FeedlyLogoutOperationTests.swift @@ -11,7 +11,7 @@ import XCTest import RSCore import Secrets -class FeedlyLogoutOperationTests: XCTestCase { +final class FeedlyLogoutOperationTests: XCTestCase { private var account: Account! private let support = FeedlyTestSupport() @@ -36,7 +36,7 @@ class FeedlyLogoutOperationTests: XCTestCase { return (accessToken, refreshToken) } - class TestFeedlyLogoutService: FeedlyLogoutService { + final class TestFeedlyLogoutService: FeedlyLogoutService { var mockResult: Result? var logoutExpectation: XCTestExpectation? @@ -123,7 +123,7 @@ class FeedlyLogoutOperationTests: XCTestCase { } } - class TestLogoutDelegate: FeedlyOperationDelegate { + final class TestLogoutDelegate: FeedlyOperationDelegate { var error: Error? var didFailExpectation: XCTestExpectation? diff --git a/Modules/Account/Tests/AccountTests/Feedly/FeedlyMirrorCollectionsAsFoldersOperationTests.swift b/Modules/Account/Tests/AccountTests/Feedly/FeedlyMirrorCollectionsAsFoldersOperationTests.swift index 200a1265e..76f094b0f 100644 --- a/Modules/Account/Tests/AccountTests/Feedly/FeedlyMirrorCollectionsAsFoldersOperationTests.swift +++ b/Modules/Account/Tests/AccountTests/Feedly/FeedlyMirrorCollectionsAsFoldersOperationTests.swift @@ -10,7 +10,7 @@ import XCTest @testable import Account import RSCore -class FeedlyMirrorCollectionsAsFoldersOperationTests: XCTestCase { +final class FeedlyMirrorCollectionsAsFoldersOperationTests: XCTestCase { private var account: Account! private let support = FeedlyTestSupport() @@ -27,7 +27,7 @@ class FeedlyMirrorCollectionsAsFoldersOperationTests: XCTestCase { super.tearDown() } - class CollectionsProvider: FeedlyCollectionProviding { + final class CollectionsProvider: FeedlyCollectionProviding { var collections = [ FeedlyCollection(feeds: [], label: "One", id: "collections/1"), FeedlyCollection(feeds: [], label: "Two", id: "collections/2") @@ -105,7 +105,7 @@ class FeedlyMirrorCollectionsAsFoldersOperationTests: XCTestCase { XCTAssertTrue(removeFolders.feedsAndFolders.isEmpty) } - class CollectionsAndFeedsProvider: FeedlyCollectionProviding { + final class CollectionsAndFeedsProvider: FeedlyCollectionProviding { var feedsForCollectionOne = [ FeedlyFeed(id: "feed/1", title: "Feed One", updated: nil, website: nil), FeedlyFeed(id: "feed/2", title: "Feed Two", updated: nil, website: nil) diff --git a/Modules/Account/Tests/AccountTests/Feedly/FeedlyOperationTests.swift b/Modules/Account/Tests/AccountTests/Feedly/FeedlyOperationTests.swift index 2e1c6a840..8069949a0 100644 --- a/Modules/Account/Tests/AccountTests/Feedly/FeedlyOperationTests.swift +++ b/Modules/Account/Tests/AccountTests/Feedly/FeedlyOperationTests.swift @@ -11,7 +11,7 @@ import XCTest import RSWeb import RSCore -class FeedlyOperationTests: XCTestCase { +final class FeedlyOperationTests: XCTestCase { enum TestOperationError: Error, Equatable { case mockError diff --git a/Modules/Account/Tests/AccountTests/Feedly/FeedlyOrganiseParsedItemsByFeedOperationTests.swift b/Modules/Account/Tests/AccountTests/Feedly/FeedlyOrganiseParsedItemsByFeedOperationTests.swift index c4a7147cf..1361150ae 100644 --- a/Modules/Account/Tests/AccountTests/Feedly/FeedlyOrganiseParsedItemsByFeedOperationTests.swift +++ b/Modules/Account/Tests/AccountTests/Feedly/FeedlyOrganiseParsedItemsByFeedOperationTests.swift @@ -11,7 +11,7 @@ import XCTest import Parser import RSCore -class FeedlyOrganiseParsedItemsByFeedOperationTests: XCTestCase { +final class FeedlyOrganiseParsedItemsByFeedOperationTests: XCTestCase { private var account: Account! private let support = FeedlyTestSupport() diff --git a/Modules/Account/Tests/AccountTests/Feedly/FeedlyRefreshAccessTokenOperationTests.swift b/Modules/Account/Tests/AccountTests/Feedly/FeedlyRefreshAccessTokenOperationTests.swift index 9a06335ec..97fea5812 100644 --- a/Modules/Account/Tests/AccountTests/Feedly/FeedlyRefreshAccessTokenOperationTests.swift +++ b/Modules/Account/Tests/AccountTests/Feedly/FeedlyRefreshAccessTokenOperationTests.swift @@ -12,7 +12,7 @@ import RSWeb import RSCore import Secrets -class FeedlyRefreshAccessTokenOperationTests: XCTestCase { +final class FeedlyRefreshAccessTokenOperationTests: XCTestCase { private var account: Account! private let support = FeedlyTestSupport() @@ -29,7 +29,7 @@ class FeedlyRefreshAccessTokenOperationTests: XCTestCase { super.tearDown() } - class TestRefreshTokenService: OAuthAccessTokenRefreshing { + final class TestRefreshTokenService: OAuthAccessTokenRefreshing { var mockResult: Result? var refreshAccessTokenExpectation: XCTestExpectation? var parameterTester: ((String, OAuthAuthorizationClient) -> Void)? @@ -71,7 +71,7 @@ class FeedlyRefreshAccessTokenOperationTests: XCTestCase { XCTAssertTrue(refresh.isCanceled) } - class TestRefreshTokenDelegate: FeedlyOperationDelegate { + final class TestRefreshTokenDelegate: FeedlyOperationDelegate { var error: Error? var didFailExpectation: XCTestExpectation? diff --git a/Modules/Account/Tests/AccountTests/Feedly/FeedlyResourceIdTests.swift b/Modules/Account/Tests/AccountTests/Feedly/FeedlyResourceIdTests.swift index 77213fc47..7761af0cb 100644 --- a/Modules/Account/Tests/AccountTests/Feedly/FeedlyResourceIdTests.swift +++ b/Modules/Account/Tests/AccountTests/Feedly/FeedlyResourceIdTests.swift @@ -9,7 +9,7 @@ import XCTest @testable import Account -class FeedlyResourceIdTests: XCTestCase { +final class FeedlyResourceIdTests: XCTestCase { func testFeedResourceId() { let expectedUrl = "http://ranchero.com/blog/atom.xml" diff --git a/Modules/Account/Tests/AccountTests/Feedly/FeedlySendArticleStatusesOperationTests.swift b/Modules/Account/Tests/AccountTests/Feedly/FeedlySendArticleStatusesOperationTests.swift index 81e37144a..bc20b19af 100644 --- a/Modules/Account/Tests/AccountTests/Feedly/FeedlySendArticleStatusesOperationTests.swift +++ b/Modules/Account/Tests/AccountTests/Feedly/FeedlySendArticleStatusesOperationTests.swift @@ -12,7 +12,7 @@ import SyncDatabase import Articles import RSCore -class FeedlySendArticleStatusesOperationTests: XCTestCase { +final class FeedlySendArticleStatusesOperationTests: XCTestCase { private var account: Account! private let support = FeedlyTestSupport() diff --git a/Modules/Account/Tests/AccountTests/Feedly/FeedlySyncAllMockResponseProvider.swift b/Modules/Account/Tests/AccountTests/Feedly/FeedlySyncAllMockResponseProvider.swift index 2fb0f6c43..2c7eb73a8 100644 --- a/Modules/Account/Tests/AccountTests/Feedly/FeedlySyncAllMockResponseProvider.swift +++ b/Modules/Account/Tests/AccountTests/Feedly/FeedlySyncAllMockResponseProvider.swift @@ -8,7 +8,7 @@ import Foundation -class FeedlyMockResponseProvider: TestTransportMockResponseProviding { +final class FeedlyMockResponseProvider: TestTransportMockResponseProviding { let subdirectory: String diff --git a/Modules/Account/Tests/AccountTests/Feedly/FeedlySyncStreamContentsOperationTests.swift b/Modules/Account/Tests/AccountTests/Feedly/FeedlySyncStreamContentsOperationTests.swift index c14e8d409..2727c135d 100644 --- a/Modules/Account/Tests/AccountTests/Feedly/FeedlySyncStreamContentsOperationTests.swift +++ b/Modules/Account/Tests/AccountTests/Feedly/FeedlySyncStreamContentsOperationTests.swift @@ -10,7 +10,7 @@ import XCTest @testable import Account import RSCore -class FeedlySyncStreamContentsOperationTests: XCTestCase { +final class FeedlySyncStreamContentsOperationTests: XCTestCase { private var account: Account! private let support = FeedlyTestSupport() diff --git a/Modules/Account/Tests/AccountTests/Feedly/FeedlyTestSupport.swift b/Modules/Account/Tests/AccountTests/Feedly/FeedlyTestSupport.swift index bbaff0d40..01f9700e9 100644 --- a/Modules/Account/Tests/AccountTests/Feedly/FeedlyTestSupport.swift +++ b/Modules/Account/Tests/AccountTests/Feedly/FeedlyTestSupport.swift @@ -13,7 +13,7 @@ import Secrets import os.log import SyncDatabase -class FeedlyTestSupport { +final class FeedlyTestSupport { var log = OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "FeedlyTests") var accessToken = Credentials(type: .oauthAccessToken, username: "Test", secret: "t3st-access-tok3n") var refreshToken = Credentials(type: .oauthRefreshToken, username: "Test", secret: "t3st-refresh-tok3n") @@ -54,7 +54,7 @@ class FeedlyTestSupport { return TestDatabaseContainer() } - class TestDatabaseContainer { + final class TestDatabaseContainer { private let path: String private(set) var database: SyncDatabase! diff --git a/Modules/Account/Tests/AccountTests/Feedly/FeedlyTextSanitizationTests.swift b/Modules/Account/Tests/AccountTests/Feedly/FeedlyTextSanitizationTests.swift index 95042706b..d5b79a941 100644 --- a/Modules/Account/Tests/AccountTests/Feedly/FeedlyTextSanitizationTests.swift +++ b/Modules/Account/Tests/AccountTests/Feedly/FeedlyTextSanitizationTests.swift @@ -9,7 +9,7 @@ import XCTest @testable import Account -class FeedlyTextSanitizationTests: XCTestCase { +final class FeedlyTextSanitizationTests: XCTestCase { func testRTLSanitization() { diff --git a/Modules/Account/Tests/AccountTests/Feedly/TestMarkArticlesService.swift b/Modules/Account/Tests/AccountTests/Feedly/TestMarkArticlesService.swift index 6d71d1a9d..043ff144c 100644 --- a/Modules/Account/Tests/AccountTests/Feedly/TestMarkArticlesService.swift +++ b/Modules/Account/Tests/AccountTests/Feedly/TestMarkArticlesService.swift @@ -9,7 +9,7 @@ import XCTest @testable import Account -class TestMarkArticlesService: FeedlyMarkArticlesService { +final class TestMarkArticlesService: FeedlyMarkArticlesService { var didMarkExpectation: XCTestExpectation? var parameterTester: ((Set, FeedlyMarkAction) -> Void)? diff --git a/Modules/Account/Tests/AccountTests/TestAccountManager.swift b/Modules/Account/Tests/AccountTests/TestAccountManager.swift index af45ea69c..495cf728a 100644 --- a/Modules/Account/Tests/AccountTests/TestAccountManager.swift +++ b/Modules/Account/Tests/AccountTests/TestAccountManager.swift @@ -11,7 +11,7 @@ import RSWeb @testable import Account -class TestAccountManager { +final class TestAccountManager { static let shared = TestAccountManager() diff --git a/Modules/RSCore/Sources/RSCore/AppKit/RSAppMovementMonitor.swift b/Modules/RSCore/Sources/RSCore/AppKit/RSAppMovementMonitor.swift index ac90259b6..171c62418 100644 --- a/Modules/RSCore/Sources/RSCore/AppKit/RSAppMovementMonitor.swift +++ b/Modules/RSCore/Sources/RSCore/AppKit/RSAppMovementMonitor.swift @@ -9,7 +9,7 @@ #if os(macOS) import Cocoa -public class RSAppMovementMonitor: NSObject { +public final class RSAppMovementMonitor: NSObject { // If provided, the handler will be consulted when the app is moved. // Return true to indicate that the default handler should be invoked. diff --git a/Modules/RSCore/Sources/RSCore/AppKit/RSDarkModeAdaptingToolbarButton.swift b/Modules/RSCore/Sources/RSCore/AppKit/RSDarkModeAdaptingToolbarButton.swift index 458b9e741..021b2a1ba 100644 --- a/Modules/RSCore/Sources/RSCore/AppKit/RSDarkModeAdaptingToolbarButton.swift +++ b/Modules/RSCore/Sources/RSCore/AppKit/RSDarkModeAdaptingToolbarButton.swift @@ -8,7 +8,7 @@ #if os(macOS) import AppKit -class RSDarkModeAdaptingToolbarButton: NSButton { +final class RSDarkModeAdaptingToolbarButton: NSButton { // Clients probably should not bother using this class unless they want // to force the template in dark mode, but if you are using this in a more // general context where you want to control and/or override it on a diff --git a/Modules/RSCore/Sources/RSCore/AppKit/RSToolbarItem.swift b/Modules/RSCore/Sources/RSCore/AppKit/RSToolbarItem.swift index d2c764ef9..8996bca1f 100755 --- a/Modules/RSCore/Sources/RSCore/AppKit/RSToolbarItem.swift +++ b/Modules/RSCore/Sources/RSCore/AppKit/RSToolbarItem.swift @@ -8,7 +8,7 @@ #if os(macOS) import AppKit -public class RSToolbarItem: NSToolbarItem { +public final class RSToolbarItem: NSToolbarItem { override public func validate() { diff --git a/Modules/RSCore/Tests/RSCoreTests/MacroProcessorTests.swift b/Modules/RSCore/Tests/RSCoreTests/MacroProcessorTests.swift index 4da760261..34512bada 100644 --- a/Modules/RSCore/Tests/RSCoreTests/MacroProcessorTests.swift +++ b/Modules/RSCore/Tests/RSCoreTests/MacroProcessorTests.swift @@ -9,7 +9,7 @@ import XCTest @testable import RSCore -class MacroProcessorTests: XCTestCase { +final class MacroProcessorTests: XCTestCase { let substitutions = ["one": "1", "two": "2"] func testMacroProcessor() { diff --git a/Modules/RSCore/Tests/RSCoreTests/MainThreadOperationTests.swift b/Modules/RSCore/Tests/RSCoreTests/MainThreadOperationTests.swift index 0f3cf6f08..b2ac493d7 100644 --- a/Modules/RSCore/Tests/RSCoreTests/MainThreadOperationTests.swift +++ b/Modules/RSCore/Tests/RSCoreTests/MainThreadOperationTests.swift @@ -9,7 +9,7 @@ import XCTest @testable import RSCore -class MainThreadOperationTests: XCTestCase { +final class MainThreadOperationTests: XCTestCase { func testSingleOperation() { let queue = MainThreadOperationQueue() diff --git a/Modules/RSCore/Tests/RSCoreTests/String+RSCoreTests.swift b/Modules/RSCore/Tests/RSCoreTests/String+RSCoreTests.swift index 98656ffcb..766927742 100644 --- a/Modules/RSCore/Tests/RSCoreTests/String+RSCoreTests.swift +++ b/Modules/RSCore/Tests/RSCoreTests/String+RSCoreTests.swift @@ -8,7 +8,7 @@ import XCTest -class StringRSCore: XCTestCase { +final class StringRSCore: XCTestCase { func testCollapsingWhitespace() { diff --git a/Modules/RSWeb/Sources/RSWeb/Reachability.swift b/Modules/RSWeb/Sources/RSWeb/Reachability.swift index b3c59dc19..1b3e102d5 100644 --- a/Modules/RSWeb/Sources/RSWeb/Reachability.swift +++ b/Modules/RSWeb/Sources/RSWeb/Reachability.swift @@ -33,7 +33,7 @@ public enum ReachabilityError: Error { case unableToGetFlags(Int32) } -public class Reachability { +public final class Reachability { /// Returns true if the internet is reachable. /// diff --git a/Modules/RSWeb/Tests/RSWebTests/DictionaryTests.swift b/Modules/RSWeb/Tests/RSWebTests/DictionaryTests.swift index db759dc28..f2b92f508 100644 --- a/Modules/RSWeb/Tests/RSWebTests/DictionaryTests.swift +++ b/Modules/RSWeb/Tests/RSWebTests/DictionaryTests.swift @@ -8,7 +8,7 @@ import XCTest -class DictionaryTests: XCTestCase { +final class DictionaryTests: XCTestCase { func testSimpleQueryString() { diff --git a/Modules/RSWeb/Tests/RSWebTests/RSWebTests.swift b/Modules/RSWeb/Tests/RSWebTests/RSWebTests.swift index 96722281d..c3edef24c 100755 --- a/Modules/RSWeb/Tests/RSWebTests/RSWebTests.swift +++ b/Modules/RSWeb/Tests/RSWebTests/RSWebTests.swift @@ -9,7 +9,7 @@ import XCTest @testable import RSWeb -class RSWebTests: XCTestCase { +final class RSWebTests: XCTestCase { func testExample() { // This is an example of a functional test case. diff --git a/Modules/RSWeb/Tests/RSWebTests/StringTests.swift b/Modules/RSWeb/Tests/RSWebTests/StringTests.swift index 23dc2f4d3..17668eb57 100644 --- a/Modules/RSWeb/Tests/RSWebTests/StringTests.swift +++ b/Modules/RSWeb/Tests/RSWebTests/StringTests.swift @@ -8,7 +8,7 @@ import XCTest -class StringTests: XCTestCase { +final class StringTests: XCTestCase { func testHTMLEscaping() { diff --git a/Shared/Activity/ActivityManager.swift b/Shared/Activity/ActivityManager.swift index 4ff43c4b3..decf41f97 100644 --- a/Shared/Activity/ActivityManager.swift +++ b/Shared/Activity/ActivityManager.swift @@ -15,7 +15,7 @@ import Articles import Intents import UniformTypeIdentifiers -class ActivityManager { +final class ActivityManager { private var nextUnreadActivity: NSUserActivity? private var selectingActivity: NSUserActivity? diff --git a/Shared/ArticleExtractor/ArticleExtractor.swift b/Shared/ArticleExtractor/ArticleExtractor.swift index a5b2e88e0..bac96e0f0 100644 --- a/Shared/ArticleExtractor/ArticleExtractor.swift +++ b/Shared/ArticleExtractor/ArticleExtractor.swift @@ -23,7 +23,7 @@ protocol ArticleExtractorDelegate: AnyObject { func articleExtractionDidComplete(extractedArticle: ExtractedArticle) } -class ArticleExtractor { +final class ArticleExtractor { private var dataTask: URLSessionDataTask? diff --git a/Shared/Extensions/RSImage-Extensions.swift b/Shared/Extensions/RSImage-Extensions.swift index 05d879831..0bfdef1f6 100644 --- a/Shared/Extensions/RSImage-Extensions.swift +++ b/Shared/Extensions/RSImage-Extensions.swift @@ -38,7 +38,7 @@ extension RSImage { // MARK: - IconScalerQueue -private class IconScalerQueue { +private final class IconScalerQueue { static let shared = IconScalerQueue() diff --git a/Shared/Favicons/ColorHash.swift b/Shared/Favicons/ColorHash.swift index 4cf9633e1..4ff2596cf 100644 --- a/Shared/Favicons/ColorHash.swift +++ b/Shared/Favicons/ColorHash.swift @@ -16,7 +16,7 @@ import WatchKit import AppKit #endif -public class ColorHash { +public final class ColorHash { public static let defaultSaturation = [CGFloat(0.35), CGFloat(0.5), CGFloat(0.65)] public static let defaultBrightness = [CGFloat(0.5), CGFloat(0.65), CGFloat(0.80)] diff --git a/Shared/IconImageCache.swift b/Shared/IconImageCache.swift index 0083c48c6..69623e8d3 100644 --- a/Shared/IconImageCache.swift +++ b/Shared/IconImageCache.swift @@ -10,7 +10,7 @@ import Foundation import Account import Articles -class IconImageCache { +final class IconImageCache { static var shared = IconImageCache() diff --git a/Shared/Timer/ArticleStatusSyncTimer.swift b/Shared/Timer/ArticleStatusSyncTimer.swift index 2a246f5dc..3802a9972 100644 --- a/Shared/Timer/ArticleStatusSyncTimer.swift +++ b/Shared/Timer/ArticleStatusSyncTimer.swift @@ -9,7 +9,7 @@ import Foundation import Account -class ArticleStatusSyncTimer { +final class ArticleStatusSyncTimer { private static let intervalSeconds = Double(120) diff --git a/Tests/NetNewsWire-iOSTests/NetNewsWire-iOSTests.swift b/Tests/NetNewsWire-iOSTests/NetNewsWire-iOSTests.swift index 9a81906e1..44b41e0cb 100644 --- a/Tests/NetNewsWire-iOSTests/NetNewsWire-iOSTests.swift +++ b/Tests/NetNewsWire-iOSTests/NetNewsWire-iOSTests.swift @@ -8,7 +8,7 @@ import XCTest -class NetNewsWire-iOSTests: XCTestCase { +final class NetNewsWire-iOSTests: XCTestCase { func testExample() { // This is an example of a functional test case. diff --git a/Tests/NetNewsWireTests/ArticleSorterTests.swift b/Tests/NetNewsWireTests/ArticleSorterTests.swift index 938b46ebc..9bcd12b76 100644 --- a/Tests/NetNewsWireTests/ArticleSorterTests.swift +++ b/Tests/NetNewsWireTests/ArticleSorterTests.swift @@ -12,7 +12,7 @@ import XCTest @testable import NetNewsWire -class ArticleSorterTests: XCTestCase { +final class ArticleSorterTests: XCTestCase { // MARK: sortByDate ascending tests diff --git a/Tests/NetNewsWireTests/ScriptingTests/AppleScriptXCTestCase.swift b/Tests/NetNewsWireTests/ScriptingTests/AppleScriptXCTestCase.swift index 4c0622ee2..56faef63a 100644 --- a/Tests/NetNewsWireTests/ScriptingTests/AppleScriptXCTestCase.swift +++ b/Tests/NetNewsWireTests/ScriptingTests/AppleScriptXCTestCase.swift @@ -8,7 +8,7 @@ import XCTest -class AppleScriptXCTestCase: XCTestCase { +final class AppleScriptXCTestCase: XCTestCase { /* @function doIndividualScript diff --git a/Tests/NetNewsWireTests/ScriptingTests/ScriptingTests.swift b/Tests/NetNewsWireTests/ScriptingTests/ScriptingTests.swift index 6a2d7571d..c1aab3bea 100644 --- a/Tests/NetNewsWireTests/ScriptingTests/ScriptingTests.swift +++ b/Tests/NetNewsWireTests/ScriptingTests/ScriptingTests.swift @@ -8,7 +8,7 @@ import XCTest -class ScriptingTests: AppleScriptXCTestCase { +final class ScriptingTests: AppleScriptXCTestCase { /* @function testGenericScript diff --git a/Tests/NetNewsWireTests/SharingTests.swift b/Tests/NetNewsWireTests/SharingTests.swift index e30df8c8f..672ed1422 100644 --- a/Tests/NetNewsWireTests/SharingTests.swift +++ b/Tests/NetNewsWireTests/SharingTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import NetNewsWire -class SharingTests: XCTestCase { +final class SharingTests: XCTestCase { func testSharingSubject() { let sharingServiceDelegate = SharingServiceDelegate(nil) diff --git a/iOS/Account/CloudKitAccountViewController.swift b/iOS/Account/CloudKitAccountViewController.swift index 9b560fb94..b1262d503 100644 --- a/iOS/Account/CloudKitAccountViewController.swift +++ b/iOS/Account/CloudKitAccountViewController.swift @@ -18,7 +18,7 @@ enum CloudKitAccountViewControllerError: LocalizedError { } } -class CloudKitAccountViewController: UITableViewController { +final class CloudKitAccountViewController: UITableViewController { weak var delegate: AddAccountDismissDelegate? @IBOutlet weak var footerLabel: UILabel! diff --git a/iOS/Account/FeedbinAccountViewController.swift b/iOS/Account/FeedbinAccountViewController.swift index 28a3942bc..44b7c837f 100644 --- a/iOS/Account/FeedbinAccountViewController.swift +++ b/iOS/Account/FeedbinAccountViewController.swift @@ -12,7 +12,7 @@ import Secrets import RSWeb import SafariServices -class FeedbinAccountViewController: UITableViewController { +final class FeedbinAccountViewController: UITableViewController { @IBOutlet weak var activityIndicator: UIActivityIndicatorView! @IBOutlet weak var cancelBarButtonItem: UIBarButtonItem! diff --git a/iOS/Account/LocalAccountViewController.swift b/iOS/Account/LocalAccountViewController.swift index 46b8e018d..698d2701a 100644 --- a/iOS/Account/LocalAccountViewController.swift +++ b/iOS/Account/LocalAccountViewController.swift @@ -9,7 +9,7 @@ import UIKit import Account -class LocalAccountViewController: UITableViewController { +final class LocalAccountViewController: UITableViewController { @IBOutlet weak var nameTextField: UITextField! @IBOutlet weak var footerLabel: UILabel! diff --git a/iOS/Account/NewsBlurAccountViewController.swift b/iOS/Account/NewsBlurAccountViewController.swift index 803197eec..3f9a638f8 100644 --- a/iOS/Account/NewsBlurAccountViewController.swift +++ b/iOS/Account/NewsBlurAccountViewController.swift @@ -12,7 +12,7 @@ import Secrets import RSWeb import SafariServices -class NewsBlurAccountViewController: UITableViewController { +final class NewsBlurAccountViewController: UITableViewController { @IBOutlet weak var activityIndicator: UIActivityIndicatorView! @IBOutlet weak var cancelBarButtonItem: UIBarButtonItem! diff --git a/iOS/Account/ReaderAPIAccountViewController.swift b/iOS/Account/ReaderAPIAccountViewController.swift index 2bc9ab7b9..de016db65 100644 --- a/iOS/Account/ReaderAPIAccountViewController.swift +++ b/iOS/Account/ReaderAPIAccountViewController.swift @@ -12,7 +12,7 @@ import Secrets import RSWeb import SafariServices -class ReaderAPIAccountViewController: UITableViewController { +final class ReaderAPIAccountViewController: UITableViewController { @IBOutlet weak var activityIndicator: UIActivityIndicatorView! @IBOutlet weak var cancelBarButtonItem: UIBarButtonItem! diff --git a/iOS/Add/AddComboTableViewCell.swift b/iOS/Add/AddComboTableViewCell.swift index e5e710eae..0551babfd 100644 --- a/iOS/Add/AddComboTableViewCell.swift +++ b/iOS/Add/AddComboTableViewCell.swift @@ -8,7 +8,7 @@ import UIKit -class AddComboTableViewCell: VibrantTableViewCell { +final class AddComboTableViewCell: VibrantTableViewCell { @IBOutlet weak var icon: UIImageView! @IBOutlet weak var label: UILabel! diff --git a/iOS/Add/AddFeedFolderViewController.swift b/iOS/Add/AddFeedFolderViewController.swift index 991b928fd..931083a8f 100644 --- a/iOS/Add/AddFeedFolderViewController.swift +++ b/iOS/Add/AddFeedFolderViewController.swift @@ -14,7 +14,7 @@ protocol AddFeedFolderViewControllerDelegate: AnyObject { func didSelect(container: Container) } -class AddFeedFolderViewController: UITableViewController { +final class AddFeedFolderViewController: UITableViewController { weak var delegate: AddFeedFolderViewControllerDelegate? var initialContainer: Container? diff --git a/iOS/Add/AddFeedSelectFolderTableViewCell.swift b/iOS/Add/AddFeedSelectFolderTableViewCell.swift index ea91f7405..00dc050c6 100644 --- a/iOS/Add/AddFeedSelectFolderTableViewCell.swift +++ b/iOS/Add/AddFeedSelectFolderTableViewCell.swift @@ -8,7 +8,7 @@ import UIKit -class AddFeedSelectFolderTableViewCell: VibrantTableViewCell { +final class AddFeedSelectFolderTableViewCell: VibrantTableViewCell { @IBOutlet weak var folderLabel: UILabel! @IBOutlet weak var detailLabel: UILabel! diff --git a/iOS/Add/AddFeedViewController.swift b/iOS/Add/AddFeedViewController.swift index c4cc28b41..4573a05b9 100644 --- a/iOS/Add/AddFeedViewController.swift +++ b/iOS/Add/AddFeedViewController.swift @@ -12,7 +12,7 @@ import RSCore import RSTree import Parser -class AddFeedViewController: UITableViewController { +final class AddFeedViewController: UITableViewController { @IBOutlet weak var activityIndicator: UIActivityIndicatorView! @IBOutlet weak var addButton: UIBarButtonItem! diff --git a/iOS/Add/AddFolderViewController.swift b/iOS/Add/AddFolderViewController.swift index 23bcc9aed..fcfcba5d9 100644 --- a/iOS/Add/AddFolderViewController.swift +++ b/iOS/Add/AddFolderViewController.swift @@ -10,7 +10,7 @@ import UIKit import Account import RSCore -class AddFolderViewController: UITableViewController { +final class AddFolderViewController: UITableViewController { @IBOutlet private weak var addButton: UIBarButtonItem! @IBOutlet private weak var nameTextField: UITextField! diff --git a/iOS/Add/SelectComboTableViewCell.swift b/iOS/Add/SelectComboTableViewCell.swift index ab69c72fd..5402c5dc6 100644 --- a/iOS/Add/SelectComboTableViewCell.swift +++ b/iOS/Add/SelectComboTableViewCell.swift @@ -8,7 +8,7 @@ import UIKit -class SelectComboTableViewCell: VibrantTableViewCell { +final class SelectComboTableViewCell: VibrantTableViewCell { @IBOutlet weak var icon: UIImageView! @IBOutlet weak var label: UILabel! diff --git a/iOS/AppDelegate.swift b/iOS/AppDelegate.swift index 5f0115b52..78d77b587 100644 --- a/iOS/AppDelegate.swift +++ b/iOS/AppDelegate.swift @@ -18,7 +18,7 @@ import WidgetKit var appDelegate: AppDelegate! @UIApplicationMain -class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterDelegate, UnreadCountProvider { +final class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterDelegate, UnreadCountProvider { private var bgTaskDispatchQueue = DispatchQueue.init(label: "BGTaskScheduler") diff --git a/iOS/Article/ArticleExtractorButton.swift b/iOS/Article/ArticleExtractorButton.swift index cd2f26afd..830eda31c 100644 --- a/iOS/Article/ArticleExtractorButton.swift +++ b/iOS/Article/ArticleExtractorButton.swift @@ -15,7 +15,7 @@ enum ArticleExtractorButtonState { case off } -class ArticleExtractorButton: UIButton { +final class ArticleExtractorButton: UIButton { private var animatedLayer: CALayer? diff --git a/iOS/Article/ArticleViewController.swift b/iOS/Article/ArticleViewController.swift index 7bb1730b0..7404814d2 100644 --- a/iOS/Article/ArticleViewController.swift +++ b/iOS/Article/ArticleViewController.swift @@ -12,7 +12,7 @@ import Account import Articles import SafariServices -class ArticleViewController: UIViewController { +final class ArticleViewController: UIViewController { struct State { let extractedArticle: ExtractedArticle? diff --git a/iOS/Article/FindInArticleActivity.swift b/iOS/Article/FindInArticleActivity.swift index 0a41cdec7..6c9e7668f 100644 --- a/iOS/Article/FindInArticleActivity.swift +++ b/iOS/Article/FindInArticleActivity.swift @@ -8,7 +8,7 @@ import UIKit -class FindInArticleActivity: UIActivity { +final class FindInArticleActivity: UIActivity { override var activityTitle: String? { NSLocalizedString("Find in Article", comment: "Find in Article") } diff --git a/iOS/Article/ImageTransition.swift b/iOS/Article/ImageTransition.swift index 9575aecbf..4905be749 100644 --- a/iOS/Article/ImageTransition.swift +++ b/iOS/Article/ImageTransition.swift @@ -8,7 +8,7 @@ import UIKit -class ImageTransition: NSObject, UIViewControllerAnimatedTransitioning { +final class ImageTransition: NSObject, UIViewControllerAnimatedTransitioning { private weak var webViewController: WebViewController? private let duration = 0.4 diff --git a/iOS/Article/OpenInSafariActivity.swift b/iOS/Article/OpenInSafariActivity.swift index b8cb20a31..3f9fc3307 100644 --- a/iOS/Article/OpenInSafariActivity.swift +++ b/iOS/Article/OpenInSafariActivity.swift @@ -8,7 +8,7 @@ import UIKit -class OpenInBrowserActivity: UIActivity { +final class OpenInBrowserActivity: UIActivity { private var activityItems: [Any]? diff --git a/iOS/Article/WrapperScriptMessageHandler.swift b/iOS/Article/WrapperScriptMessageHandler.swift index 0baa51ca4..7cd0afc62 100644 --- a/iOS/Article/WrapperScriptMessageHandler.swift +++ b/iOS/Article/WrapperScriptMessageHandler.swift @@ -9,7 +9,7 @@ import Foundation import WebKit -class WrapperScriptMessageHandler: NSObject, WKScriptMessageHandler { +final class WrapperScriptMessageHandler: NSObject, WKScriptMessageHandler { // We need to wrap a message handler to prevent a circlular reference private weak var handler: WKScriptMessageHandler? diff --git a/iOS/ArticleActivityItemSource.swift b/iOS/ArticleActivityItemSource.swift index 290e99aca..5fd2a5240 100644 --- a/iOS/ArticleActivityItemSource.swift +++ b/iOS/ArticleActivityItemSource.swift @@ -8,7 +8,7 @@ import UIKit -class ArticleActivityItemSource: NSObject, UIActivityItemSource { +final class ArticleActivityItemSource: NSObject, UIActivityItemSource { private let url: URL private let subject: String? diff --git a/iOS/Inspector/AccountInspectorViewController.swift b/iOS/Inspector/AccountInspectorViewController.swift index d64c88f95..f27a99fdd 100644 --- a/iOS/Inspector/AccountInspectorViewController.swift +++ b/iOS/Inspector/AccountInspectorViewController.swift @@ -10,7 +10,7 @@ import UIKit import SafariServices import Account -class AccountInspectorViewController: UITableViewController { +final class AccountInspectorViewController: UITableViewController { static let preferredContentSizeForFormSheetDisplay = CGSize(width: 460.0, height: 400.0) diff --git a/iOS/Inspector/FeedInspectorViewController.swift b/iOS/Inspector/FeedInspectorViewController.swift index 2e09b8973..b9591259c 100644 --- a/iOS/Inspector/FeedInspectorViewController.swift +++ b/iOS/Inspector/FeedInspectorViewController.swift @@ -11,7 +11,7 @@ import Account import SafariServices import UserNotifications -class FeedInspectorViewController: UITableViewController { +final class FeedInspectorViewController: UITableViewController { static let preferredContentSizeForFormSheetDisplay = CGSize(width: 460.0, height: 500.0) diff --git a/iOS/Inspector/InspectorIconHeaderView.swift b/iOS/Inspector/InspectorIconHeaderView.swift index b7870bcd6..fcb7d6d14 100644 --- a/iOS/Inspector/InspectorIconHeaderView.swift +++ b/iOS/Inspector/InspectorIconHeaderView.swift @@ -8,7 +8,7 @@ import UIKit -class InspectorIconHeaderView: UITableViewHeaderFooterView { +final class InspectorIconHeaderView: UITableViewHeaderFooterView { var iconView = IconView() diff --git a/iOS/IntentsExtension/IntentHandler.swift b/iOS/IntentsExtension/IntentHandler.swift index 612a9fdbf..5e5e20ebc 100644 --- a/iOS/IntentsExtension/IntentHandler.swift +++ b/iOS/IntentsExtension/IntentHandler.swift @@ -8,7 +8,7 @@ import Intents -class IntentHandler: INExtension { +final class IntentHandler: INExtension { override func handler(for intent: INIntent) -> Any { switch intent { diff --git a/iOS/KeyboardManager.swift b/iOS/KeyboardManager.swift index a9c5c65e2..858af6bef 100644 --- a/iOS/KeyboardManager.swift +++ b/iOS/KeyboardManager.swift @@ -15,7 +15,7 @@ enum KeyboardType: String { case detail = "DetailKeyboardShortcuts" } -class KeyboardManager { +final class KeyboardManager { private(set) var _keyCommands: [UIKeyCommand] var keyCommands: [UIKeyCommand] { diff --git a/iOS/MainFeed/Cell/MainFeedRowIdentifier.swift b/iOS/MainFeed/Cell/MainFeedRowIdentifier.swift index b20857e78..53a1643b3 100644 --- a/iOS/MainFeed/Cell/MainFeedRowIdentifier.swift +++ b/iOS/MainFeed/Cell/MainFeedRowIdentifier.swift @@ -8,7 +8,7 @@ import Foundation -class MainFeedRowIdentifier: NSObject, NSCopying { +final class MainFeedRowIdentifier: NSObject, NSCopying { var indexPath: IndexPath diff --git a/iOS/MainFeed/Cell/MainFeedTableViewCell.swift b/iOS/MainFeed/Cell/MainFeedTableViewCell.swift index e8f8f6620..bfa22a54d 100644 --- a/iOS/MainFeed/Cell/MainFeedTableViewCell.swift +++ b/iOS/MainFeed/Cell/MainFeedTableViewCell.swift @@ -15,7 +15,7 @@ protocol MainFeedTableViewCellDelegate: AnyObject { func mainFeedTableViewCellDisclosureDidToggle(_ sender: MainFeedTableViewCell, expanding: Bool) } -class MainFeedTableViewCell: VibrantTableViewCell { +final class MainFeedTableViewCell: VibrantTableViewCell { weak var delegate: MainFeedTableViewCellDelegate? diff --git a/iOS/MainFeed/Cell/MainFeedTableViewSectionHeader.swift b/iOS/MainFeed/Cell/MainFeedTableViewSectionHeader.swift index 69fc5da0d..c5cd9a73c 100644 --- a/iOS/MainFeed/Cell/MainFeedTableViewSectionHeader.swift +++ b/iOS/MainFeed/Cell/MainFeedTableViewSectionHeader.swift @@ -12,7 +12,7 @@ protocol MainFeedTableViewSectionHeaderDelegate: AnyObject { func mainFeedTableViewSectionHeaderDisclosureDidToggle(_ sender: MainFeedTableViewSectionHeader) } -class MainFeedTableViewSectionHeader: UITableViewHeaderFooterView { +final class MainFeedTableViewSectionHeader: UITableViewHeaderFooterView { weak var delegate: MainFeedTableViewSectionHeaderDelegate? diff --git a/iOS/MainFeed/MainFeedViewController.swift b/iOS/MainFeed/MainFeedViewController.swift index 7e473ae52..c55b23968 100644 --- a/iOS/MainFeed/MainFeedViewController.swift +++ b/iOS/MainFeed/MainFeedViewController.swift @@ -15,7 +15,7 @@ import RSWeb import SafariServices import WebKit -class MainFeedViewController: UITableViewController, UndoableCommandRunner { +final class MainFeedViewController: UITableViewController, UndoableCommandRunner { @IBOutlet weak var filterButton: UIBarButtonItem! private var refreshProgressView: RefreshProgressView? @@ -126,11 +126,11 @@ class MainFeedViewController: UITableViewController, UndoableCommandRunner { } var node: Node? - if let coordinator = unreadCountProvider as? SceneCoordinator, let feed = coordinator.timelineFeed { - node = coordinator.rootNode.descendantNodeRepresentingObject(feed as AnyObject) - } else { +// if let coordinator = unreadCountProvider as? SceneCoordinator, let feed = coordinator.timelineFeed { +// node = coordinator.rootNode.descendantNodeRepresentingObject(feed as AnyObject) +// } else { node = coordinator.rootNode.descendantNodeRepresentingObject(unreadCountProvider as AnyObject) - } +// } guard let unreadCountNode = node, let indexPath = coordinator.indexPathFor(unreadCountNode) else { return } if let cell = tableView.cellForRow(at: indexPath) as? MainFeedTableViewCell { diff --git a/iOS/MainFeed/RefreshProgressView.swift b/iOS/MainFeed/RefreshProgressView.swift index 3045c8168..9bb79b50e 100644 --- a/iOS/MainFeed/RefreshProgressView.swift +++ b/iOS/MainFeed/RefreshProgressView.swift @@ -9,7 +9,7 @@ import UIKit import Account -class RefreshProgressView: UIView { +final class RefreshProgressView: UIView { @IBOutlet weak var progressView: UIProgressView! @IBOutlet weak var label: UILabel! diff --git a/iOS/MainTimeline/Cell/MainTimelineTableViewCell.swift b/iOS/MainTimeline/Cell/MainTimelineTableViewCell.swift index cebad12b5..542bde9ab 100644 --- a/iOS/MainTimeline/Cell/MainTimelineTableViewCell.swift +++ b/iOS/MainTimeline/Cell/MainTimelineTableViewCell.swift @@ -9,7 +9,7 @@ import UIKit import RSCore -class MainTimelineTableViewCell: VibrantTableViewCell { +final class MainTimelineTableViewCell: VibrantTableViewCell { private let titleView = MainTimelineTableViewCell.multiLineUILabel() private let summaryView = MainTimelineTableViewCell.multiLineUILabel() diff --git a/iOS/MainTimeline/Cell/MainUnreadIndicatorView.swift b/iOS/MainTimeline/Cell/MainUnreadIndicatorView.swift index 311ac196d..520a362cf 100644 --- a/iOS/MainTimeline/Cell/MainUnreadIndicatorView.swift +++ b/iOS/MainTimeline/Cell/MainUnreadIndicatorView.swift @@ -8,7 +8,7 @@ import UIKit -class MainUnreadIndicatorView: UIView { +final class MainUnreadIndicatorView: UIView { override func layoutSubviews() { super.layoutSubviews() diff --git a/iOS/MainTimeline/MainTimelineDataSource.swift b/iOS/MainTimeline/MainTimelineDataSource.swift index 0c622842e..44c7edbba 100644 --- a/iOS/MainTimeline/MainTimelineDataSource.swift +++ b/iOS/MainTimeline/MainTimelineDataSource.swift @@ -8,7 +8,7 @@ import UIKit -class MainTimelineDataSource: UITableViewDiffableDataSource where SectionIdentifierType: Hashable, ItemIdentifierType: Hashable { +final class MainTimelineDataSource: UITableViewDiffableDataSource where SectionIdentifierType: Hashable, ItemIdentifierType: Hashable { override func tableView(_ tableView: UITableView, canEditRowAt indexPath: IndexPath) -> Bool { return true diff --git a/iOS/MainTimeline/MainTimelineTitleView.swift b/iOS/MainTimeline/MainTimelineTitleView.swift index abaac5fe0..71d9ed852 100644 --- a/iOS/MainTimeline/MainTimelineTitleView.swift +++ b/iOS/MainTimeline/MainTimelineTitleView.swift @@ -8,7 +8,7 @@ import UIKit -class MainTimelineTitleView: UIView { +final class MainTimelineTitleView: UIView { @IBOutlet weak var iconView: IconView! @IBOutlet weak var label: UILabel! diff --git a/iOS/MainTimeline/MainTimelineUnreadCountView.swift b/iOS/MainTimeline/MainTimelineUnreadCountView.swift index 6a8d1dca1..657577b0f 100644 --- a/iOS/MainTimeline/MainTimelineUnreadCountView.swift +++ b/iOS/MainTimeline/MainTimelineUnreadCountView.swift @@ -8,7 +8,7 @@ import UIKit -class MainTimelineUnreadCountView: MainFeedUnreadCountView { +final class MainTimelineUnreadCountView: MainFeedUnreadCountView { override var padding: UIEdgeInsets { return UIEdgeInsets(top: 2.0, left: 9.0, bottom: 2.0, right: 9.0) diff --git a/iOS/MainTimeline/TimelineViewController.swift b/iOS/MainTimeline/TimelineViewController.swift index cc0d35bac..8faf69be6 100644 --- a/iOS/MainTimeline/TimelineViewController.swift +++ b/iOS/MainTimeline/TimelineViewController.swift @@ -13,7 +13,7 @@ import Account import Articles import WebKit -class TimelineViewController: UITableViewController, UndoableCommandRunner { +final class TimelineViewController: UITableViewController, UndoableCommandRunner { private var numberOfTextLines = 0 private var iconSize = IconSize.medium diff --git a/iOS/RootSplitViewController.swift b/iOS/RootSplitViewController.swift index 253969c90..9bba707a9 100644 --- a/iOS/RootSplitViewController.swift +++ b/iOS/RootSplitViewController.swift @@ -9,7 +9,7 @@ import UIKit import Account -class RootSplitViewController: UISplitViewController { +final class RootSplitViewController: UISplitViewController { var coordinator: SceneCoordinator! diff --git a/iOS/SceneCoordinator.swift b/iOS/SceneCoordinator.swift index 86e994d09..4535796fe 100644 --- a/iOS/SceneCoordinator.swift +++ b/iOS/SceneCoordinator.swift @@ -39,7 +39,7 @@ struct FeedNode: Hashable { } } -class SceneCoordinator: NSObject, UndoableCommandRunner { +final class SceneCoordinator: NSObject, UndoableCommandRunner { var undoableCommands = [UndoableCommand]() var undoManager: UndoManager? { diff --git a/iOS/SceneDelegate.swift b/iOS/SceneDelegate.swift index decfffd1b..1bc9ceedc 100644 --- a/iOS/SceneDelegate.swift +++ b/iOS/SceneDelegate.swift @@ -10,7 +10,7 @@ import UIKit import UserNotifications import Account -class SceneDelegate: UIResponder, UIWindowSceneDelegate { +final class SceneDelegate: UIResponder, UIWindowSceneDelegate { var window: UIWindow? var coordinator: SceneCoordinator! diff --git a/iOS/Settings/AboutViewController.swift b/iOS/Settings/AboutViewController.swift index c43afbfcd..44486580e 100644 --- a/iOS/Settings/AboutViewController.swift +++ b/iOS/Settings/AboutViewController.swift @@ -8,7 +8,7 @@ import UIKit -class AboutViewController: UITableViewController { +final class AboutViewController: UITableViewController { @IBOutlet weak var aboutTextView: UITextView! @IBOutlet weak var creditsTextView: UITextView! diff --git a/iOS/Settings/AddAccountViewController.swift b/iOS/Settings/AddAccountViewController.swift index 3b0473291..5126822d0 100644 --- a/iOS/Settings/AddAccountViewController.swift +++ b/iOS/Settings/AddAccountViewController.swift @@ -15,7 +15,7 @@ protocol AddAccountDismissDelegate: UIViewController { func dismiss() } -class AddAccountViewController: UITableViewController, AddAccountDismissDelegate { +final class AddAccountViewController: UITableViewController, AddAccountDismissDelegate { private enum AddAccountSections: Int, CaseIterable { case local = 0 diff --git a/iOS/Settings/ArticleThemesTableViewController.swift b/iOS/Settings/ArticleThemesTableViewController.swift index 74fe144b6..bc990e951 100644 --- a/iOS/Settings/ArticleThemesTableViewController.swift +++ b/iOS/Settings/ArticleThemesTableViewController.swift @@ -14,7 +14,7 @@ extension UTType { static var netNewsWireTheme: UTType { UTType(importedAs: "com.ranchero.netnewswire.theme") } } -class ArticleThemesTableViewController: UITableViewController { +final class ArticleThemesTableViewController: UITableViewController { override func viewDidLoad() { let importBarButtonItem = UIBarButtonItem(barButtonSystemItem: .add, target: self, action: #selector(importTheme(_:))) diff --git a/iOS/Settings/ColorPaletteTableViewController.swift b/iOS/Settings/ColorPaletteTableViewController.swift index d64671c6f..dfd2f5da7 100644 --- a/iOS/Settings/ColorPaletteTableViewController.swift +++ b/iOS/Settings/ColorPaletteTableViewController.swift @@ -8,7 +8,7 @@ import UIKit -class ColorPaletteTableViewController: UITableViewController { +final class ColorPaletteTableViewController: UITableViewController { // MARK: - Table view data source diff --git a/iOS/Settings/SettingsComboTableViewCell.swift b/iOS/Settings/SettingsComboTableViewCell.swift index 230aa5f3e..df99d19ef 100644 --- a/iOS/Settings/SettingsComboTableViewCell.swift +++ b/iOS/Settings/SettingsComboTableViewCell.swift @@ -8,7 +8,7 @@ import UIKit -class SettingsComboTableViewCell: VibrantTableViewCell { +final class SettingsComboTableViewCell: VibrantTableViewCell { @IBOutlet weak var comboImage: UIImageView! @IBOutlet weak var comboNameLabel: UILabel! diff --git a/iOS/Settings/SettingsViewController.swift b/iOS/Settings/SettingsViewController.swift index 973c2f5c6..dcdf8e6ca 100644 --- a/iOS/Settings/SettingsViewController.swift +++ b/iOS/Settings/SettingsViewController.swift @@ -14,7 +14,7 @@ import SwiftUI import UniformTypeIdentifiers // swiftlint:disable:next type_body_length -class SettingsViewController: UITableViewController { +final class SettingsViewController: UITableViewController { private weak var opmlAccount: Account? diff --git a/iOS/Settings/TimelineCustomizerViewController.swift b/iOS/Settings/TimelineCustomizerViewController.swift index ea2ff895e..34b848acb 100644 --- a/iOS/Settings/TimelineCustomizerViewController.swift +++ b/iOS/Settings/TimelineCustomizerViewController.swift @@ -8,7 +8,7 @@ import UIKit -class TimelineCustomizerViewController: UIViewController { +final class TimelineCustomizerViewController: UIViewController { @IBOutlet weak var iconSizeSliderContainerView: UIView! @IBOutlet weak var iconSizeSlider: TickMarkSlider! diff --git a/iOS/Settings/TimelinePreviewTableViewController.swift b/iOS/Settings/TimelinePreviewTableViewController.swift index ae38d5423..af66a6b1e 100644 --- a/iOS/Settings/TimelinePreviewTableViewController.swift +++ b/iOS/Settings/TimelinePreviewTableViewController.swift @@ -9,7 +9,7 @@ import UIKit import Articles -class TimelinePreviewTableViewController: UIViewController, UITableViewDelegate, UITableViewDataSource { +final class TimelinePreviewTableViewController: UIViewController, UITableViewDelegate, UITableViewDataSource { @IBOutlet weak var tableView: UITableView! diff --git a/iOS/ShareExtension/ShareFolderPickerCell.swift b/iOS/ShareExtension/ShareFolderPickerCell.swift index a8566646c..dea7d8484 100644 --- a/iOS/ShareExtension/ShareFolderPickerCell.swift +++ b/iOS/ShareExtension/ShareFolderPickerCell.swift @@ -8,7 +8,7 @@ import UIKit -class ShareFolderPickerCell: UITableViewCell { +final class ShareFolderPickerCell: UITableViewCell { @IBOutlet weak var icon: UIImageView! @IBOutlet weak var label: UILabel! diff --git a/iOS/ShareExtension/ShareFolderPickerController.swift b/iOS/ShareExtension/ShareFolderPickerController.swift index 85f18ef81..a25b836d9 100644 --- a/iOS/ShareExtension/ShareFolderPickerController.swift +++ b/iOS/ShareExtension/ShareFolderPickerController.swift @@ -14,7 +14,7 @@ protocol ShareFolderPickerControllerDelegate: AnyObject { func shareFolderPickerDidSelect(_ container: ExtensionContainer) } -class ShareFolderPickerController: UITableViewController { +final class ShareFolderPickerController: UITableViewController { var containers: [ExtensionContainer]? var selectedContainerID: ContainerIdentifier? diff --git a/iOS/ShareExtension/ShareViewController.swift b/iOS/ShareExtension/ShareViewController.swift index 425c3748e..80e4c3b57 100644 --- a/iOS/ShareExtension/ShareViewController.swift +++ b/iOS/ShareExtension/ShareViewController.swift @@ -14,7 +14,7 @@ import RSCore import RSTree import UniformTypeIdentifiers -class ShareViewController: SLComposeServiceViewController, ShareFolderPickerControllerDelegate { +final class ShareViewController: SLComposeServiceViewController, ShareFolderPickerControllerDelegate { private var url: URL? private var extensionContainers: ExtensionContainers? diff --git a/iOS/TitleActivityItemSource.swift b/iOS/TitleActivityItemSource.swift index a0e233112..369d8b255 100644 --- a/iOS/TitleActivityItemSource.swift +++ b/iOS/TitleActivityItemSource.swift @@ -8,7 +8,7 @@ import UIKit -class TitleActivityItemSource: NSObject, UIActivityItemSource { +final class TitleActivityItemSource: NSObject, UIActivityItemSource { private let title: String? diff --git a/iOS/UIKit Extensions/CroppingPreviewParameters.swift b/iOS/UIKit Extensions/CroppingPreviewParameters.swift index 582e7a5af..6e42b2c18 100644 --- a/iOS/UIKit Extensions/CroppingPreviewParameters.swift +++ b/iOS/UIKit Extensions/CroppingPreviewParameters.swift @@ -8,7 +8,7 @@ import UIKit -class CroppingPreviewParameters: UIPreviewParameters { +final class CroppingPreviewParameters: UIPreviewParameters { override init() { super.init() diff --git a/iOS/UIKit Extensions/ImageHeaderView.swift b/iOS/UIKit Extensions/ImageHeaderView.swift index d4cc316a3..3efca8420 100644 --- a/iOS/UIKit Extensions/ImageHeaderView.swift +++ b/iOS/UIKit Extensions/ImageHeaderView.swift @@ -8,7 +8,7 @@ import UIKit -class ImageHeaderView: UITableViewHeaderFooterView { +final class ImageHeaderView: UITableViewHeaderFooterView { static let rowHeight = CGFloat(integerLiteral: 88) diff --git a/iOS/UIKit Extensions/InteractiveLabel.swift b/iOS/UIKit Extensions/InteractiveLabel.swift index 6b04dbe62..efe615834 100644 --- a/iOS/UIKit Extensions/InteractiveLabel.swift +++ b/iOS/UIKit Extensions/InteractiveLabel.swift @@ -9,7 +9,7 @@ import UIKit @IBDesignable -class InteractiveLabel: UILabel, UIEditMenuInteractionDelegate { +final class InteractiveLabel: UILabel, UIEditMenuInteractionDelegate { override init(frame: CGRect) { super.init(frame: frame) diff --git a/iOS/UIKit Extensions/InteractiveNavigationController.swift b/iOS/UIKit Extensions/InteractiveNavigationController.swift index b42c32a1c..a4e7e6bf7 100644 --- a/iOS/UIKit Extensions/InteractiveNavigationController.swift +++ b/iOS/UIKit Extensions/InteractiveNavigationController.swift @@ -8,7 +8,7 @@ import UIKit -class InteractiveNavigationController: UINavigationController { +final class InteractiveNavigationController: UINavigationController { private let poppableDelegate = PoppableGestureRecognizerDelegate() diff --git a/iOS/UIKit Extensions/ModalNavigationController.swift b/iOS/UIKit Extensions/ModalNavigationController.swift index 9d9205095..edaf85b42 100644 --- a/iOS/UIKit Extensions/ModalNavigationController.swift +++ b/iOS/UIKit Extensions/ModalNavigationController.swift @@ -8,7 +8,7 @@ import UIKit -class ModalNavigationController: UINavigationController { +final class ModalNavigationController: UINavigationController { override func viewDidLayoutSubviews() { super.viewDidLayoutSubviews() diff --git a/iOS/UIKit Extensions/NonIntrinsicButton.swift b/iOS/UIKit Extensions/NonIntrinsicButton.swift index 715f85c7f..932d6da19 100644 --- a/iOS/UIKit Extensions/NonIntrinsicButton.swift +++ b/iOS/UIKit Extensions/NonIntrinsicButton.swift @@ -10,7 +10,7 @@ import Foundation import UIKit -class NonIntrinsicButton: UIButton { +final class NonIntrinsicButton: UIButton { // Prevent autolayout from messing around with our frame settings override var intrinsicContentSize: CGSize { diff --git a/iOS/UIKit Extensions/NonIntrinsicImageView.swift b/iOS/UIKit Extensions/NonIntrinsicImageView.swift index 2403e1729..d711ff9fd 100644 --- a/iOS/UIKit Extensions/NonIntrinsicImageView.swift +++ b/iOS/UIKit Extensions/NonIntrinsicImageView.swift @@ -8,7 +8,7 @@ import UIKit -class NonIntrinsicImageView: UIImageView { +final class NonIntrinsicImageView: UIImageView { // Prevent autolayout from messing around with our frame settings override var intrinsicContentSize: CGSize { diff --git a/iOS/UIKit Extensions/NonIntrinsicLabel.swift b/iOS/UIKit Extensions/NonIntrinsicLabel.swift index 60dced0d3..532ffe101 100644 --- a/iOS/UIKit Extensions/NonIntrinsicLabel.swift +++ b/iOS/UIKit Extensions/NonIntrinsicLabel.swift @@ -8,7 +8,7 @@ import UIKit -class NonIntrinsicLabel: UILabel { +final class NonIntrinsicLabel: UILabel { // Prevent autolayout from messing around with our frame settings override var intrinsicContentSize: CGSize { diff --git a/iOS/UIKit Extensions/RoundedProgressView.swift b/iOS/UIKit Extensions/RoundedProgressView.swift index 5f892dcbf..a538d763d 100644 --- a/iOS/UIKit Extensions/RoundedProgressView.swift +++ b/iOS/UIKit Extensions/RoundedProgressView.swift @@ -8,7 +8,7 @@ import UIKit -class RoundedProgressView: UIProgressView { +final class RoundedProgressView: UIProgressView { override func layoutSubviews() { super.layoutSubviews() diff --git a/iOS/UIKit Extensions/TickMarkSlider.swift b/iOS/UIKit Extensions/TickMarkSlider.swift index a96d480c4..1ce32d5d9 100644 --- a/iOS/UIKit Extensions/TickMarkSlider.swift +++ b/iOS/UIKit Extensions/TickMarkSlider.swift @@ -8,7 +8,7 @@ import UIKit -class TickMarkSlider: UISlider { +final class TickMarkSlider: UISlider { private var enableFeedback = false private let feedbackGenerator = UISelectionFeedbackGenerator() diff --git a/iOS/UIKit Extensions/VibrantButton.swift b/iOS/UIKit Extensions/VibrantButton.swift index f871a50da..91f105e94 100644 --- a/iOS/UIKit Extensions/VibrantButton.swift +++ b/iOS/UIKit Extensions/VibrantButton.swift @@ -8,7 +8,7 @@ import UIKit -class VibrantButton: UIButton { +final class VibrantButton: UIButton { @IBInspectable var backgroundHighlightColor: UIColor = AppAssets.secondaryAccentColor diff --git a/iOS/UIKit Extensions/VibrantLabel.swift b/iOS/UIKit Extensions/VibrantLabel.swift index 20c2cd357..49363ed1b 100644 --- a/iOS/UIKit Extensions/VibrantLabel.swift +++ b/iOS/UIKit Extensions/VibrantLabel.swift @@ -8,7 +8,7 @@ import UIKit -class VibrantLabel: UILabel { +final class VibrantLabel: UILabel { override init(frame: CGRect) { super.init(frame: frame) diff --git a/iOS/UIKit Extensions/VibrantTableViewCell.swift b/iOS/UIKit Extensions/VibrantTableViewCell.swift index cde421a36..d4f057baf 100644 --- a/iOS/UIKit Extensions/VibrantTableViewCell.swift +++ b/iOS/UIKit Extensions/VibrantTableViewCell.swift @@ -70,7 +70,7 @@ class VibrantTableViewCell: UITableViewCell { } -class VibrantBasicTableViewCell: VibrantTableViewCell { +final class VibrantBasicTableViewCell: VibrantTableViewCell { @IBOutlet private var label: UILabel! @IBOutlet private var detail: UILabel!