diff --git a/MTMR.xcodeproj/project.pbxproj b/MTMR.xcodeproj/project.pbxproj index edea1c7..22199f7 100644 --- a/MTMR.xcodeproj/project.pbxproj +++ b/MTMR.xcodeproj/project.pbxproj @@ -412,7 +412,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.13; + MACOSX_DEPLOYMENT_TARGET = 10.12; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; @@ -465,7 +465,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.13; + MACOSX_DEPLOYMENT_TARGET = 10.12; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; diff --git a/MTMR/AppDelegate.swift b/MTMR/AppDelegate.swift index ab5d0cf..c3a2934 100644 --- a/MTMR/AppDelegate.swift +++ b/MTMR/AppDelegate.swift @@ -11,10 +11,12 @@ import Cocoa @NSApplicationMain class AppDelegate: NSObject, NSApplicationDelegate { - - func applicationDidFinishLaunching(_ aNotification: Notification) { - TouchBarController.shared.setupControlStripPresence() + if #available(OSX 10.12.2, *) { + TouchBarController.shared.setupControlStripPresence() + } else { + // Fallback on earlier versions + } // Insert code here to initialize your application } diff --git a/MTMR/AppleScriptTouchBarItem.swift b/MTMR/AppleScriptTouchBarItem.swift index 7e10d53..87c4dc7 100644 --- a/MTMR/AppleScriptTouchBarItem.swift +++ b/MTMR/AppleScriptTouchBarItem.swift @@ -1,5 +1,6 @@ import Foundation +@available(OSX 10.12.2, *) class AppleScriptTouchBarItem: NSCustomTouchBarItem { let script: NSAppleScript private var timer: Timer! diff --git a/MTMR/TimeTouchBarItem.swift b/MTMR/TimeTouchBarItem.swift index 045db1c..e409eba 100644 --- a/MTMR/TimeTouchBarItem.swift +++ b/MTMR/TimeTouchBarItem.swift @@ -1,5 +1,6 @@ import Cocoa +@available(OSX 10.12.2, *) class TimeTouchBarItem: NSCustomTouchBarItem { private let dateFormatter = DateFormatter() private var timer: Timer! diff --git a/MTMR/TouchBarController.swift b/MTMR/TouchBarController.swift index 34868ee..25622c0 100644 --- a/MTMR/TouchBarController.swift +++ b/MTMR/TouchBarController.swift @@ -8,6 +8,7 @@ import Cocoa +@available(OSX 10.12.2, *) class TouchBarController: NSObject, NSTouchBarDelegate { static let shared = TouchBarController() @@ -101,6 +102,7 @@ class TouchBarController: NSObject, NSTouchBarDelegate { } +@available(OSX 10.12.2, *) extension CustomButtonTouchBarItem { convenience init(identifier: NSTouchBarItem.Identifier, title: String, HIDKeycode: Int) { self.init(identifier: identifier, title: title) { _ in diff --git a/MTMR/TouchBarItems.swift b/MTMR/TouchBarItems.swift index af2ffcd..d74c5e6 100644 --- a/MTMR/TouchBarItems.swift +++ b/MTMR/TouchBarItems.swift @@ -8,6 +8,7 @@ import Cocoa +@available(OSX 10.12.2, *) extension NSTouchBarItem.Identifier { static let escButton = NSTouchBarItem.Identifier("com.toxblh.mtmr.escButton") static let dismissButton = NSTouchBarItem.Identifier("com.toxblh.mtmr.dismissButton") @@ -35,6 +36,7 @@ extension NSTouchBarItem.Identifier { static let controlStripItem = NSTouchBarItem.Identifier("com.toxblh.mtmr.controlStrip") } +@available(OSX 10.12.2, *) class CustomButtonTouchBarItem: NSCustomTouchBarItem { let tapClosure: (NSCustomTouchBarItem) -> ()