Different approach

Toxblh · Apr 9, 2018 · e3f5da0 · e3f5da0
1 parent aaa7bc3
commit e3f5da0
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 13 deletions.
diff --git 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.12;
+				MACOSX_DEPLOYMENT_TARGET = 10.12.2;
 				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.12;
+				MACOSX_DEPLOYMENT_TARGET = 10.12.2;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";

diff --git a/MTMR/AppDelegate.swift b/MTMR/AppDelegate.swift
@@ -12,11 +12,7 @@ import Cocoa
 class AppDelegate: NSObject, NSApplicationDelegate {
 
     func applicationDidFinishLaunching(_ aNotification: Notification) {
-        if #available(OSX 10.12.2, *) {
-            TouchBarController.shared.setupControlStripPresence()
-        } else {
-            // Fallback on earlier versions
-        }
+        TouchBarController.shared.setupControlStripPresence()
         // Insert code here to initialize your application
     }
 

diff --git a/MTMR/AppleScriptTouchBarItem.swift b/MTMR/AppleScriptTouchBarItem.swift
@@ -1,6 +1,5 @@
 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
@@ -1,6 +1,5 @@
 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
@@ -8,7 +8,6 @@
 
 import Cocoa
 
-@available(OSX 10.12.2, *)
 class TouchBarController: NSObject, NSTouchBarDelegate {
 
     static let shared = TouchBarController()
@@ -102,7 +101,6 @@ 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
@@ -8,7 +8,6 @@
 
 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")
@@ -36,7 +35,6 @@ extension NSTouchBarItem.Identifier {
     static let controlStripItem = NSTouchBarItem.Identifier("com.toxblh.mtmr.controlStrip")
 }
 
-@available(OSX 10.12.2, *)
 class CustomButtonTouchBarItem: NSCustomTouchBarItem {
     let tapClosure: (NSCustomTouchBarItem) -> ()