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
2025-03-04 08:39:11 +00:00 · 2019-04-29 08:59:04 -04:00 · 2019-04-29 08:59:04 -04:00 · 4d2a8087ed
commit 4d2a8087ed
parent b311005393
34 changed files with 34 additions and 34 deletions
--- 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

--- 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

--- 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?
--- 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) {
--- 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,
--- 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 {
--- 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 {
--- 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] = []
--- 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
--- 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
--- 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)
--- 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")
--- 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")
--- 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
--- 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 {
--- 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?
--- 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()
--- 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() {
--- 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 {
--- 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] = [:]
--- 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() {
--- 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 {
--- 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 {
--- 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 {
--- 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
--- 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
--- 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 {}
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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?
--- 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 {
--- 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) {