From 4d2a8087ed50c54e748fb5ab63a5c36082988cf7 Mon Sep 17 00:00:00 2001 From: Daniel Barber Date: Mon, 29 Apr 2019 08:59:04 -0400 Subject: [PATCH] Import AppKit rather than Cocoa Importing Cocoa pulls in CoreData, which we're not using. https://github.com/brentsimmons/NetNewsWire/blob/master/Technotes/CodingGuidelines.md --- Persephone/AppDelegate.swift | 2 +- Persephone/Controllers/AlbumViewController.swift | 2 +- Persephone/Controllers/AlbumViewItem.swift | 2 +- Persephone/Controllers/MainSplitViewController.swift | 2 +- Persephone/Controllers/QueueViewController.swift | 2 +- Persephone/Controllers/WindowController.swift | 2 +- Persephone/DataSources/AlbumDataSource.swift | 2 +- Persephone/DataSources/QueueDataSource.swift | 2 +- Persephone/Extensions/CGColor.swift | 2 +- Persephone/Extensions/NSEvent.swift | 2 +- Persephone/Extensions/NSFont.swift | 2 +- Persephone/Extensions/NSImage.swift | 2 +- Persephone/Extensions/NSUserInterfaceItemIdentifier.swift | 2 +- Persephone/Layouts/AlbumViewLayout.swift | 2 +- Persephone/Models/Album.swift | 2 +- Persephone/Models/TrackTimer.swift | 2 +- Persephone/Operations/CoverArtQueue.swift | 2 +- .../Preferences/Controllers/CoverArtPrefsController.swift | 2 +- .../Preferences/Controllers/GeneralPrefsViewController.swift | 2 +- .../Preferences/Controllers/PreferencesViewController.swift | 2 +- .../Preferences/Controllers/PreferencesWindowController.swift | 2 +- Persephone/Services/CoverArtService.swift | 2 +- Persephone/Services/Extensions/CoverArtService+Caching.swift | 2 +- Persephone/Services/Extensions/CoverArtService+Filesystem.swift | 2 +- Persephone/Services/Extensions/CoverArtService+Remote.swift | 2 +- Persephone/Services/SongNotifierService.swift | 2 +- Persephone/State/Actions/AlbumListActions.swift | 2 +- Persephone/State/Actions/PlayerActions.swift | 2 +- Persephone/State/PlayerState.swift | 2 +- Persephone/State/Reducers/PlayerReducer.swift | 2 +- Persephone/State/Reducers/QueueReducer.swift | 2 +- Persephone/Views/AlbumItemView.swift | 2 +- Persephone/Views/CurrentCoverArtView.swift | 2 +- Persephone/Views/MainWindow.swift | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) diff --git a/Persephone/AppDelegate.swift b/Persephone/AppDelegate.swift index dd88682..d929792 100644 --- a/Persephone/AppDelegate.swift +++ b/Persephone/AppDelegate.swift @@ -6,7 +6,7 @@ // Copyright © 2018 Dan Barber. All rights reserved. // -import Cocoa +import AppKit import ReSwift import MediaKeyTap diff --git a/Persephone/Controllers/AlbumViewController.swift b/Persephone/Controllers/AlbumViewController.swift index a5c73f9..5c96de0 100644 --- a/Persephone/Controllers/AlbumViewController.swift +++ b/Persephone/Controllers/AlbumViewController.swift @@ -6,7 +6,7 @@ // Copyright © 2019 Dan Barber. All rights reserved. // -import Cocoa +import AppKit import ReSwift import Differ diff --git a/Persephone/Controllers/AlbumViewItem.swift b/Persephone/Controllers/AlbumViewItem.swift index a6ac9ce..2e8e667 100644 --- a/Persephone/Controllers/AlbumViewItem.swift +++ b/Persephone/Controllers/AlbumViewItem.swift @@ -6,7 +6,7 @@ // Copyright © 2019 Dan Barber. All rights reserved. // -import Cocoa +import AppKit class AlbumViewItem: NSCollectionViewItem { var observer: NSKeyValueObservation? diff --git a/Persephone/Controllers/MainSplitViewController.swift b/Persephone/Controllers/MainSplitViewController.swift index 5d78ffa..4f2aac5 100644 --- a/Persephone/Controllers/MainSplitViewController.swift +++ b/Persephone/Controllers/MainSplitViewController.swift @@ -6,7 +6,7 @@ // Copyright © 2019 Dan Barber. All rights reserved. // -import Cocoa +import AppKit class MainSplitViewController: NSSplitViewController { override func keyDown(with event: NSEvent) { diff --git a/Persephone/Controllers/QueueViewController.swift b/Persephone/Controllers/QueueViewController.swift index 75484ae..dbaef73 100644 --- a/Persephone/Controllers/QueueViewController.swift +++ b/Persephone/Controllers/QueueViewController.swift @@ -6,7 +6,7 @@ // Copyright © 2019 Dan Barber. All rights reserved. // -import Cocoa +import AppKit import ReSwift class QueueViewController: NSViewController, diff --git a/Persephone/Controllers/WindowController.swift b/Persephone/Controllers/WindowController.swift index a7234c3..2c14f6d 100644 --- a/Persephone/Controllers/WindowController.swift +++ b/Persephone/Controllers/WindowController.swift @@ -6,7 +6,7 @@ // Copyright © 2019 Dan Barber. All rights reserved. // -import Cocoa +import AppKit import ReSwift class WindowController: NSWindowController { diff --git a/Persephone/DataSources/AlbumDataSource.swift b/Persephone/DataSources/AlbumDataSource.swift index 6702c54..d0aa6d3 100644 --- a/Persephone/DataSources/AlbumDataSource.swift +++ b/Persephone/DataSources/AlbumDataSource.swift @@ -6,7 +6,7 @@ // Copyright © 2019 Dan Barber. All rights reserved. // -import Cocoa +import AppKit import PromiseKit class AlbumDataSource: NSObject, NSCollectionViewDataSource { diff --git a/Persephone/DataSources/QueueDataSource.swift b/Persephone/DataSources/QueueDataSource.swift index 57b3c66..de5b0f1 100644 --- a/Persephone/DataSources/QueueDataSource.swift +++ b/Persephone/DataSources/QueueDataSource.swift @@ -6,7 +6,7 @@ // Copyright © 2019 Dan Barber. All rights reserved. // -import Cocoa +import AppKit class QueueDataSource: NSObject, NSOutlineViewDataSource { var queue: [QueueItem] = [] diff --git a/Persephone/Extensions/CGColor.swift b/Persephone/Extensions/CGColor.swift index b6281e6..3e508c5 100644 --- a/Persephone/Extensions/CGColor.swift +++ b/Persephone/Extensions/CGColor.swift @@ -6,7 +6,7 @@ // Copyright © 2019 Dan Barber. All rights reserved. // -import Cocoa +import AppKit extension CGColor { static let albumBorderColorLight = NSColor.black.withAlphaComponent(0.15).cgColor diff --git a/Persephone/Extensions/NSEvent.swift b/Persephone/Extensions/NSEvent.swift index 5298e76..642cda5 100644 --- a/Persephone/Extensions/NSEvent.swift +++ b/Persephone/Extensions/NSEvent.swift @@ -6,7 +6,7 @@ // Copyright © 2019 Dan Barber. All rights reserved. // -import Cocoa +import AppKit extension NSEvent { static let keyCodeSpace: UInt16 = 49 diff --git a/Persephone/Extensions/NSFont.swift b/Persephone/Extensions/NSFont.swift index d3e1415..4eee550 100644 --- a/Persephone/Extensions/NSFont.swift +++ b/Persephone/Extensions/NSFont.swift @@ -6,7 +6,7 @@ // Copyright © 2019 Dan Barber. All rights reserved. // -import Cocoa +import AppKit extension NSFont { static let systemFontRegular = systemFont(ofSize: 13, weight: .regular) diff --git a/Persephone/Extensions/NSImage.swift b/Persephone/Extensions/NSImage.swift index f0c786f..a0eafea 100644 --- a/Persephone/Extensions/NSImage.swift +++ b/Persephone/Extensions/NSImage.swift @@ -6,7 +6,7 @@ // Copyright © 2019 Dan Barber. All rights reserved. // -import Cocoa +import AppKit extension NSImage { static let playIcon = NSImage(named: "playButton") diff --git a/Persephone/Extensions/NSUserInterfaceItemIdentifier.swift b/Persephone/Extensions/NSUserInterfaceItemIdentifier.swift index cbc958e..44a2bdf 100644 --- a/Persephone/Extensions/NSUserInterfaceItemIdentifier.swift +++ b/Persephone/Extensions/NSUserInterfaceItemIdentifier.swift @@ -6,7 +6,7 @@ // Copyright © 2019 Dan Barber. All rights reserved. // -import Cocoa +import AppKit extension NSUserInterfaceItemIdentifier { static let queueSongTitleColumn = NSUserInterfaceItemIdentifier("songTitleColumn") diff --git a/Persephone/Layouts/AlbumViewLayout.swift b/Persephone/Layouts/AlbumViewLayout.swift index 2bf5bf1..774bb19 100644 --- a/Persephone/Layouts/AlbumViewLayout.swift +++ b/Persephone/Layouts/AlbumViewLayout.swift @@ -6,7 +6,7 @@ // Copyright © 2019 Dan Barber. All rights reserved. // -import Cocoa +import AppKit class AlbumViewLayout: NSCollectionViewFlowLayout { let maxItemWidth: CGFloat = 180 diff --git a/Persephone/Models/Album.swift b/Persephone/Models/Album.swift index 7e40e81..34ef975 100644 --- a/Persephone/Models/Album.swift +++ b/Persephone/Models/Album.swift @@ -6,7 +6,7 @@ // Copyright © 2019 Dan Barber. All rights reserved. // -import Cocoa +import AppKit import CryptoSwift struct Album { diff --git a/Persephone/Models/TrackTimer.swift b/Persephone/Models/TrackTimer.swift index 6c06022..ccbd93d 100644 --- a/Persephone/Models/TrackTimer.swift +++ b/Persephone/Models/TrackTimer.swift @@ -6,7 +6,7 @@ // Copyright © 2019 Dan Barber. All rights reserved. // -import Cocoa +import AppKit class TrackTimer: NSObject { var timer: Timer? diff --git a/Persephone/Operations/CoverArtQueue.swift b/Persephone/Operations/CoverArtQueue.swift index cc5cece..81ab3d5 100644 --- a/Persephone/Operations/CoverArtQueue.swift +++ b/Persephone/Operations/CoverArtQueue.swift @@ -6,7 +6,7 @@ // Copyright © 2019 Dan Barber. All rights reserved. // -import Cocoa +import AppKit class CoverArtQueue { static let shared = CoverArtQueue() diff --git a/Persephone/Preferences/Controllers/CoverArtPrefsController.swift b/Persephone/Preferences/Controllers/CoverArtPrefsController.swift index 4beda58..24bbe41 100644 --- a/Persephone/Preferences/Controllers/CoverArtPrefsController.swift +++ b/Persephone/Preferences/Controllers/CoverArtPrefsController.swift @@ -6,7 +6,7 @@ // Copyright © 2019 Dan Barber. All rights reserved. // -import Cocoa +import AppKit class CoverArtPrefsController: NSViewController { override func viewDidLoad() { diff --git a/Persephone/Preferences/Controllers/GeneralPrefsViewController.swift b/Persephone/Preferences/Controllers/GeneralPrefsViewController.swift index d6d93c4..0662736 100644 --- a/Persephone/Preferences/Controllers/GeneralPrefsViewController.swift +++ b/Persephone/Preferences/Controllers/GeneralPrefsViewController.swift @@ -6,7 +6,7 @@ // Copyright © 2019 Dan Barber. All rights reserved. // -import Cocoa +import AppKit import ReSwift class GeneralPrefsViewController: NSViewController { diff --git a/Persephone/Preferences/Controllers/PreferencesViewController.swift b/Persephone/Preferences/Controllers/PreferencesViewController.swift index fcddb11..babd311 100644 --- a/Persephone/Preferences/Controllers/PreferencesViewController.swift +++ b/Persephone/Preferences/Controllers/PreferencesViewController.swift @@ -6,7 +6,7 @@ // Copyright © 2019 Dan Barber. All rights reserved. // -import Cocoa +import AppKit class PreferencesViewController: NSTabViewController { private lazy var tabViewSizes: [String : NSSize] = [:] diff --git a/Persephone/Preferences/Controllers/PreferencesWindowController.swift b/Persephone/Preferences/Controllers/PreferencesWindowController.swift index e41a599..4c0b7ea 100644 --- a/Persephone/Preferences/Controllers/PreferencesWindowController.swift +++ b/Persephone/Preferences/Controllers/PreferencesWindowController.swift @@ -6,7 +6,7 @@ // Copyright © 2019 Dan Barber. All rights reserved. // -import Cocoa +import AppKit class PreferencesWindowController: NSWindowController, NSWindowDelegate { override func windowDidLoad() { diff --git a/Persephone/Services/CoverArtService.swift b/Persephone/Services/CoverArtService.swift index cc865c9..5782c7d 100644 --- a/Persephone/Services/CoverArtService.swift +++ b/Persephone/Services/CoverArtService.swift @@ -6,7 +6,7 @@ // Copyright © 2019 Dan Barber. All rights reserved. // -import Cocoa +import AppKit import PromiseKit class CoverArtService { diff --git a/Persephone/Services/Extensions/CoverArtService+Caching.swift b/Persephone/Services/Extensions/CoverArtService+Caching.swift index 29a754e..9ae8350 100644 --- a/Persephone/Services/Extensions/CoverArtService+Caching.swift +++ b/Persephone/Services/Extensions/CoverArtService+Caching.swift @@ -6,7 +6,7 @@ // Copyright © 2019 Dan Barber. All rights reserved. // -import Cocoa +import AppKit import PromiseKit extension CoverArtService { diff --git a/Persephone/Services/Extensions/CoverArtService+Filesystem.swift b/Persephone/Services/Extensions/CoverArtService+Filesystem.swift index bb94ad1..1a061fb 100644 --- a/Persephone/Services/Extensions/CoverArtService+Filesystem.swift +++ b/Persephone/Services/Extensions/CoverArtService+Filesystem.swift @@ -6,7 +6,7 @@ // Copyright © 2019 Dan Barber. All rights reserved. // -import Cocoa +import AppKit import PromiseKit extension CoverArtService { diff --git a/Persephone/Services/Extensions/CoverArtService+Remote.swift b/Persephone/Services/Extensions/CoverArtService+Remote.swift index 88f2fbc..44ddcef 100644 --- a/Persephone/Services/Extensions/CoverArtService+Remote.swift +++ b/Persephone/Services/Extensions/CoverArtService+Remote.swift @@ -6,7 +6,7 @@ // Copyright © 2019 Dan Barber. All rights reserved. // -import Cocoa +import AppKit import SwiftyJSON import PromiseKit import PMKFoundation diff --git a/Persephone/Services/SongNotifierService.swift b/Persephone/Services/SongNotifierService.swift index aadabe3..27ae567 100644 --- a/Persephone/Services/SongNotifierService.swift +++ b/Persephone/Services/SongNotifierService.swift @@ -6,7 +6,7 @@ // Copyright © 2019 Dan Barber. All rights reserved. // -import Cocoa +import AppKit struct SongNotifierService { let song: Song diff --git a/Persephone/State/Actions/AlbumListActions.swift b/Persephone/State/Actions/AlbumListActions.swift index 61218ef..bab922c 100644 --- a/Persephone/State/Actions/AlbumListActions.swift +++ b/Persephone/State/Actions/AlbumListActions.swift @@ -6,7 +6,7 @@ // Copyright © 2019 Dan Barber. All rights reserved. // -import Cocoa +import AppKit import ReSwift struct ResetAlbumListCoverArtAction: Action {} diff --git a/Persephone/State/Actions/PlayerActions.swift b/Persephone/State/Actions/PlayerActions.swift index cc988fe..ec640a7 100644 --- a/Persephone/State/Actions/PlayerActions.swift +++ b/Persephone/State/Actions/PlayerActions.swift @@ -6,7 +6,7 @@ // Copyright © 2019 Dan Barber. All rights reserved. // -import Cocoa +import AppKit import ReSwift struct UpdateCurrentCoverArtAction: Action { diff --git a/Persephone/State/PlayerState.swift b/Persephone/State/PlayerState.swift index 6c7397f..0e56a7a 100644 --- a/Persephone/State/PlayerState.swift +++ b/Persephone/State/PlayerState.swift @@ -6,7 +6,7 @@ // Copyright © 2019 Dan Barber. All rights reserved. // -import Cocoa +import AppKit import ReSwift struct PlayerState: StateType { diff --git a/Persephone/State/Reducers/PlayerReducer.swift b/Persephone/State/Reducers/PlayerReducer.swift index 3072fa1..14ef026 100644 --- a/Persephone/State/Reducers/PlayerReducer.swift +++ b/Persephone/State/Reducers/PlayerReducer.swift @@ -6,7 +6,7 @@ // Copyright © 2019 Dan Barber. All rights reserved. // -import Cocoa +import AppKit import ReSwift func playerReducer(action: Action, state: PlayerState?) -> PlayerState { diff --git a/Persephone/State/Reducers/QueueReducer.swift b/Persephone/State/Reducers/QueueReducer.swift index ceed68e..d0281c1 100644 --- a/Persephone/State/Reducers/QueueReducer.swift +++ b/Persephone/State/Reducers/QueueReducer.swift @@ -6,7 +6,7 @@ // Copyright © 2019 Dan Barber. All rights reserved. // -import Cocoa +import AppKit import ReSwift func queueReducer(action: Action, state: QueueState?) -> QueueState { diff --git a/Persephone/Views/AlbumItemView.swift b/Persephone/Views/AlbumItemView.swift index ef26fed..0d74816 100644 --- a/Persephone/Views/AlbumItemView.swift +++ b/Persephone/Views/AlbumItemView.swift @@ -6,7 +6,7 @@ // Copyright © 2019 Dan Barber. All rights reserved. // -import Cocoa +import AppKit class AlbumItemView: NSView { var trackingArea: NSTrackingArea? diff --git a/Persephone/Views/CurrentCoverArtView.swift b/Persephone/Views/CurrentCoverArtView.swift index 8fab09c..dc51e27 100644 --- a/Persephone/Views/CurrentCoverArtView.swift +++ b/Persephone/Views/CurrentCoverArtView.swift @@ -6,7 +6,7 @@ // Copyright © 2019 Dan Barber. All rights reserved. // -import Cocoa +import AppKit import ReSwift class CurrentCoverArtView: NSImageView { diff --git a/Persephone/Views/MainWindow.swift b/Persephone/Views/MainWindow.swift index b7220e3..397e01d 100644 --- a/Persephone/Views/MainWindow.swift +++ b/Persephone/Views/MainWindow.swift @@ -6,7 +6,7 @@ // Copyright © 2019 Dan Barber. All rights reserved. // -import Cocoa +import AppKit class MainWindow: NSWindow { override func keyDown(with event: NSEvent) {