Merge branch 'update/issue-#35'

DanielStormApps · Sep 30, 2019 · c0bc89f · c0bc89f
2 parents cec8011 + b43de3a
commit c0bc89f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/Fanny/Fanny.xcodeproj/project.pbxproj b/Fanny/Fanny.xcodeproj/project.pbxproj
@@ -655,7 +655,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				PRODUCT_BUNDLE_IDENTIFIER = com.fannywidget;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -678,7 +678,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				PRODUCT_BUNDLE_IDENTIFIER = com.fannywidget;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -705,7 +705,7 @@
 					"@executable_path/../Frameworks",
 					"@executable_path/../../../../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.fannywidget.today-extension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -730,7 +730,7 @@
 					"@executable_path/../Frameworks",
 					"@executable_path/../../../../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.fannywidget.today-extension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;

diff --git a/Fanny/fanny/Menu/FNYMenuController.swift b/Fanny/fanny/Menu/FNYMenuController.swift
@@ -38,7 +38,15 @@ class FNYMenuController {
                               gpuTemperature: SMC.shared.gpuTemperature())
 
         guard !items.isEmpty else { return }
-        statusBar.menu.items = items
+        if #available(OSX 10.14, *) {
+            // This property is only settable in macOS 10.14 and later.
+            // Xcode does not throw a warning for this: https://stackoverflow.com/a/54682999/2108547
+            statusBar.menu.items = items
+        }
+        else {
+            statusBar.menu.removeAllItems()
+            items.forEach({ statusBar.menu.addItem($0) })
+        }
     }
 
     // MARK: - Formatted Menu Items