Partial flush of Swift 4.2 + Mojave support. Some things still don't fully work (toolbar!)

Author: Aditya Vaidyam

Hangouts/Conversation.swift

@@ -445,15 +445,18 @@ public class ConversationList: ParrotServiceExtension.ConversationList {
     fileprivate unowned let client: Client
     internal var convDict = [String: IConversation]() /* TODO: Should be fileprivate! */
     public var syncTimestamp: Date? = nil
+    private var tokens: [Any] = []
 
     public init(client: Client) {
         self.client = client
         self._sync()
-        hangoutsCenter.addObserver(self, selector: #selector(ConversationList.clientDidUpdateState(_:)),
-                                   name: Client.didUpdateStateNotification, object: client)
-        
-        NotificationCenter.default.addObserver(self, selector: #selector(self.personDidUpdate(_:)),
-                                               name: Notification.Person.DidUpdate, object: nil)
+        let a = hangoutsCenter.addObserver(forName: Client.didUpdateStateNotification, object: client, queue: nil) { [weak self] in
+            self?.clientDidUpdateState($0)
+        }
+        let b = NotificationCenter.default.addObserver(forName: Notification.Person.DidUpdate, object: nil, queue: nil) { [weak self] in
+            self?.personDidUpdate($0)
+        }
+        self.tokens = [a, b]
     }
 
     deinit {
@@ -569,15 +572,15 @@ public class ConversationList: ParrotServiceExtension.ConversationList {
 extension ConversationList {
 
     // If a person changed, any conversations with that person also have changed.
-    @objc func personDidUpdate(_ note: Notification) {
+    public func personDidUpdate(_ note: Notification) {
         guard let user = note.object as? User else { return }
         for conv in (self.convDict.values.filter { $0.users.contains(user) }) {
             NotificationCenter.default.post(name: Notification.Conversation.DidUpdate, object: conv)
         }
     }
 
     // Receive a ClientStateUpdate and fan out to Conversations
-    @objc public func clientDidUpdateState(_ note: Notification) {
+    public func clientDidUpdateState(_ note: Notification) {
         guard let update = (note.userInfo)?[Client.didUpdateStateKey] as? ClientStateUpdate else {
             log.error("Encountered an error! \(note)"); return
         }

Hangouts/User.swift

@@ -159,6 +159,7 @@ public class UserList: Directory {
     public var blocked: [String: Person] {
         return [:]
     }
+    private var tokens: [Any] = []
 
     // Initialize the list of Users.
     public init(client: Client, users: [User] = []) {
@@ -172,12 +173,10 @@ public class UserList: Directory {
         self.users[me.id] = me
         self.me = me
 
-        hangoutsCenter.addObserver(self, selector: #selector(UserList._updatedState(_:)),
-                                   name: Client.didUpdateStateNotification, object: client)
-    }
-    
-    deinit {
-        hangoutsCenter.removeObserver(self)
+        let a = hangoutsCenter.addObserver(forName: Client.didUpdateStateNotification, object: client, queue: nil) { [weak self] in
+            self?._updatedState($0)
+        }
+        self.tokens = [a]
     }
 
     public subscript(_ identifier: String) -> Person {
@@ -277,7 +276,7 @@ public class UserList: Directory {
     }
 
     /// Note: all notification objects are expected to be deltas.
-    @objc internal func _updatedState(_ notification: Notification) {
+    @objc dynamic internal func _updatedState(_ notification: Notification) {
         guard   let userInfo = notification.userInfo,
             let update = userInfo[Client.didUpdateStateKey] as? ClientStateUpdate
             else { return }

HangoutsCore/ProtobufRuntime.swift

@@ -81,18 +81,6 @@ public func random64(_ upper_bound: UInt64) -> UInt64 {
     return rnd % upper_bound
 }
 
-extension Optional: Hashable where Wrapped: Hashable {
-    public var hashValue: Int {
-        return self?.hashValue ?? 0
-    }
-}
-
-extension Array: Hashable where Element: Hashable {
-    public var hashValue: Int {
-        return self.reduce(5381) { ($0 << 5) &+ $0 &+ $1.hashValue }
-    }
-}
-
 extension Dictionary where Key: Hashable, Value: Hashable {
     public var hashValue: Int {
         return self.reduce(5381) { ($0 << 5) &+ $0 &+ $1.key.hashValue &+ $1.value.hashValue }

Mocha/Analytics.swift

@@ -68,12 +68,14 @@ public struct AppProperties {
 public struct GoogleAnalytics {
     private init() {}
 
+    ///
     public struct Screen: RawRepresentable, Equatable, Hashable {
         public let rawValue: String
         public init(rawValue: String) { self.rawValue = rawValue }
         public init(_ rawValue: String) { self.rawValue = rawValue }
     }
 
+    ///
     public struct Category: RawRepresentable, Equatable, Hashable {
         public let rawValue: String
         public init(rawValue: String) { self.rawValue = rawValue }

Mocha/Subscription.swift

@@ -40,7 +40,7 @@ public class Subscription {
     }
 
     /// The worker function bridged into Objective-C.
-    @objc private func _runHandler(_ note: Notification) {
+    @objc dynamic private func _runHandler(_ note: Notification) {
         (self.queue ?? .main).async {
             self.handler(note)
         }

Mocha/SwiftSupport.swift

@@ -20,6 +20,12 @@ public extension Collection {
     }
 }
 
+extension RawRepresentable where RawValue: Hashable {
+    public var hashValue: Int {
+        return rawValue.hashValue
+    }
+}
+
 // All default Swift types:
 //  - Boolean
 //  - BinaryInteger
@@ -59,16 +65,3 @@ public extension Strideable where Self.Stride: SignedInteger {
         return max(self, range.lowerBound)
     }
 }
-
-public struct RawWrapper<Type, Original: Hashable>: RawRepresentable, Hashable, Equatable {
-    public let rawValue: Original
-    public init(rawValue: Original) {
-        self.rawValue = rawValue
-    }
-}
-
-extension RawRepresentable where RawValue: Hashable {
-    public var hashValue: Int {
-        return rawValue.hashValue
-    }
-}

MochaUI/Animation.swift

@@ -30,7 +30,7 @@ public struct Animation {
         fileprivate init(_ handler: @escaping () -> ()) {
             self.handler = handler
         }
-        @objc public func animationDidStop(_ anim: CAAnimation, finished flag: Bool) {
+        @objc dynamic public func animationDidStop(_ anim: CAAnimation, finished flag: Bool) {
             self.handler()
         }
     }

MochaUI/AppKit+Extensions.swift

@@ -262,28 +262,38 @@ public extension NSSound {
     }
 }
 
-/// Register for AppleEvents that follow our URL scheme as a compatibility
-/// layer for macOS 10.13 methods.
-///
-/// Note: this only applies to CFBundleURLTypes, and not CFBundleDocumentTypes
-/// on compatibility platforms. -application:openFiles: and -application:openFile:
-/// will still be invoked for documents.
-///
-/// A "typealias" for the traditional NSApplication delegation.
-open class NSApplicationController: NSObject, NSApplicationDelegate {
+/// A concrete controller type for the management of `NSApplication`.
+open class NSApplicationController: NSResponder, NSApplicationDelegate {
     public override init() {
         super.init()
-        if floor(NSAppKitVersion.current.rawValue) <= NSAppKitVersion.macOS10_12.rawValue {
-            let ae = NSAppleEventManager.shared()
-            ae.setEventHandler(self, andSelector: #selector(self.handleURL(event:withReply:)),
-                               forEventClass: UInt32(kInternetEventClass),
-                               andEventID: UInt32(kAEGetURL)
-            )
-        }
+        self._init()
+    }
+    public required init?(coder: NSCoder) {
+        super.init(coder: coder)
+        self._init()
     }
-    @objc private func handleURL(event: NSAppleEventDescriptor, withReply reply: NSAppleEventDescriptor) {
+    
+    /// Perform one-time URL event registration if not on macOS 13+
+    ///
+    /// Note: this only applies to CFBundleURLTypes, and not CFBundleDocumentTypes
+    /// on compatibility platforms. -application:openFiles: and -application:openFile:
+    /// will still be invoked for documents.
+    private func _init() {
+        guard floor(NSAppKitVersion.current.rawValue) > NSAppKitVersion.macOS10_12.rawValue else { return }
+        let ae = NSAppleEventManager.shared()
+        ae.setEventHandler(self,
+                           andSelector: #selector(self.handleURL(event:withReply:)),
+                           forEventClass: UInt32(kInternetEventClass),
+                           andEventID: UInt32(kAEGetURL)
+        )
+    }
+    
+    /// Wrap the pre-macOS 13 handler and trampoline into the post-macOS 13 one.
+    @objc dynamic private func handleURL(event: NSAppleEventDescriptor, withReply reply: NSAppleEventDescriptor) {
         guard   let urlString = event.paramDescriptor(forKeyword: keyDirectObject)?.stringValue,
-            let url = URL(string: urlString) else { return }
+                let url = URL(string: urlString)
+        else { return }
+        
         let sel = Selector(("application:" + "openURLs:")) // since DNE on < macOS 13
         if self.responds(to: sel) {
             self.perform(sel, with: NSApp, with: [url])

MochaUI/BlockTrampoline.swift

@@ -79,7 +79,7 @@ public extension NSMenuItem {
         self.action = action
     }
 
-    @objc fileprivate func performAction(_ sender: Any!) {
+    @objc dynamic fileprivate func performAction(_ sender: Any!) {
         self.action()
     }
 

MochaUI/ExtendedTextView.swift

@@ -14,8 +14,8 @@ public class ExtendedTextView: NSTextView {
 
 	// Apparently this property has been private on macOS since 10.7.
 	@IBInspectable
-	@objc public var placeholderString: String? = nil
-	@objc public var placeholderAttributedString: NSAttributedString? = nil
+	@objc dynamic public var placeholderString: String? = nil
+	@objc dynamic public var placeholderAttributedString: NSAttributedString? = nil
 
     public var providesContentSize: Bool = true {
         didSet {

MochaUI/Interpolate.swift

@@ -193,7 +193,7 @@ public class Interpolate<T: Interpolatable>: AnyInterpolate {
     /**
      Next function used by animation(). Increments fractionComplete based on the duration.
      */
-    @objc fileprivate func next(_ fps: Double = 60.0) {
+    @objc dynamic fileprivate func next(_ fps: Double = 60.0) {
 
         let direction: CGFloat = (targetProgress > fractionComplete) ? 1.0 : -1.0
         let oldProgress = fractionComplete

MochaUI/KeyboardShortcutView.swift

@@ -118,7 +118,7 @@ open class KeyboardShortcutView: NSControl, NSSecureCoding, NSAccessibilityButto
 
 
     /// Eh, why not. It's good practice.
-    open static var supportsSecureCoding: Bool {
+    public static var supportsSecureCoding: Bool {
         return true
     }
 
@@ -146,13 +146,13 @@ open class KeyboardShortcutView: NSControl, NSSecureCoding, NSAccessibilityButto
     /// text color of the currently-recording shortcut.
     ///
     /// Note: by using a dynamic color, it will always match the current NSAppearance.
-    @objc open var tintColor: NSColor = .keyboardFocusIndicatorColor {
+    @objc dynamic open var tintColor: NSColor = .keyboardFocusIndicatorColor {
         didSet { self.needsDisplay = true }
     }
 
     /// The string to display to the user when no shortcut is displayed by, or
     /// being recorded by the control.
-    @objc open var placeholderString: String? {
+    @objc dynamic open var placeholderString: String? {
         get { return self.textLabel.placeholderAttributedString?.string }
         set {
             let style = NSMutableParagraphStyle()
@@ -204,7 +204,7 @@ open class KeyboardShortcutView: NSControl, NSSecureCoding, NSAccessibilityButto
     }
 
     /// Returns `true` if the control is currently recording a new shortcut.
-    @objc open private(set) var isRecording = false {
+    @objc dynamic open private(set) var isRecording = false {
         willSet { self.willChangeValue(forKey: #function) }
         didSet { self.didChangeValue(forKey: #function) }
     }
@@ -245,7 +245,7 @@ open class KeyboardShortcutView: NSControl, NSSecureCoding, NSAccessibilityButto
 
     /// Determines whether the control is capable of modifying its shortcut or
     /// recording a new shortcut.
-    @objc open override var isEnabled: Bool {
+    @objc dynamic open override var isEnabled: Bool {
         didSet {
             if !self.isEnabled { self.endRecording() }
             self.needsDisplay = true
@@ -720,7 +720,7 @@ open class KeyboardShortcutView: NSControl, NSSecureCoding, NSAccessibilityButto
 
     /// The trailing record/stop button was pressed: start recording if we're
     /// not already doing so, and if we are, clear the shortcut and end recording.
-    @objc private func buttonAction(_ button: NSButton) {
+    @objc dynamic private func buttonAction(_ button: NSButton) {
         if !self.isRecording && self.shortcut == nil { // cleared state
             self.window?.makeFirstResponder(self)
             _ = self.beginRecording()
@@ -740,7 +740,7 @@ open class KeyboardShortcutView: NSControl, NSSecureCoding, NSAccessibilityButto
 
     /// A `suggestions` shortcut was selected: circumvent recording and directly set.
     /// Note that a suggestion may be selected without the control being recording.
-    @objc private func selectAction(_ item: NSMenuItem) {
+    @objc dynamic private func selectAction(_ item: NSMenuItem) {
         guard self.isEnabled else { return }
         self.endRecording()
         self.shortcut = self.suggestions[item.tag]
@@ -784,7 +784,7 @@ open class KeyboardShortcutView: NSControl, NSSecureCoding, NSAccessibilityButto
     /// responder and discard any recording shortcut.
     ///
     /// Note: Unbalanced global mode changes can dramatically impact system usability!
-    @objc private func windowKeyednessChanged(_ note: Notification) {
+    @objc dynamic private func windowKeyednessChanged(_ note: Notification) {
         guard let window = self.window, (note.object as? NSWindow) == window else { return }
         if window.isKeyWindow && window.firstResponder == self { // becomeKey
             guard self.savedOperatingMode == nil else { return }

MochaUI/NSDrawer+Extensions.swift

@@ -60,7 +60,7 @@ public extension NSDrawer {
 fileprivate extension NSDrawer {
 
     /// This swizzle hook allows __setupModernDrawer to be invoked automatically.
-    @objc func swizzle__doSetParentWindow(_ arg1: AnyObject!) {
+    @objc dynamic func swizzle__doSetParentWindow(_ arg1: AnyObject!) {
         __setupModernDrawer()
         swizzle__doSetParentWindow(arg1)
     }

MochaUI/NSToolTipManager+Appearance.swift

@@ -33,7 +33,7 @@ import Mocha
 
     /// Swizzle: make sure we return a dynamic system color to match the visual
     /// effect view.
-    @objc func swizzle_toolTipTextColor() -> NSColor! {
+    @objc dynamic func swizzle_toolTipTextColor() -> NSColor! {
         return NSColor.labelColor
     }
 

MochaUI/PreviewController.swift

@@ -132,7 +132,7 @@ public class PreviewController: NSObject, NSPopoverDelegate, NSGestureRecognizer
         self.content = content
     }
 
-    @objc private func gesture(_ sender: PressureGestureRecognizer) {
+    @objc dynamic private func gesture(_ sender: PressureGestureRecognizer) {
         switch sender.state {
         case .possible: break // ignore
         case .began:

MochaUI/ViewAttachmentCell.swift

@@ -51,7 +51,7 @@ public class ViewAttachmentCell: NSTextAttachmentCell {
         self.view.frame = cellFrame
     }
 
-    @objc private func verifyAttached(_ note: Notification) {
+    @objc dynamic private func verifyAttached(_ note: Notification) {
         let str = (note.object as? NSTextView)?.attributedString()
         var attached = false