Skip to content

Commit 746b0c3

Browse files
andrew-codechimpandrew-codechimp
committed
Dirty fix for Sonoma menuWillOpen
1 parent 45d24bf commit 746b0c3

File tree

4 files changed

+43
-20
lines changed

4 files changed

+43
-20
lines changed

‎HA Menu.xcodeproj/project.pbxproj

Lines changed: 29 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 52;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -329,8 +329,9 @@
329329
491F5291217CBF5200105921 /* Project object */ = {
330330
isa = PBXProject;
331331
attributes = {
332+
BuildIndependentTargetsInParallel = YES;
332333
LastSwiftUpdateCheck = 1120;
333-
LastUpgradeCheck = 1220;
334+
LastUpgradeCheck = 1500;
334335
ORGANIZATIONNAME = CodeChimp;
335336
TargetAttributes = {
336337
491F5298217CBF5200105921 = {
@@ -529,9 +530,11 @@
529530
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
530531
CODE_SIGN_IDENTITY = "Mac Developer";
531532
COPY_PHASE_STRIP = NO;
533+
DEAD_CODE_STRIPPING = YES;
532534
DEBUG_INFORMATION_FORMAT = dwarf;
533535
ENABLE_STRICT_OBJC_MSGSEND = YES;
534536
ENABLE_TESTABILITY = YES;
537+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
535538
GCC_C_LANGUAGE_STANDARD = gnu11;
536539
GCC_DYNAMIC_NO_PIC = NO;
537540
GCC_NO_COMMON_BLOCKS = YES;
@@ -546,7 +549,7 @@
546549
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
547550
GCC_WARN_UNUSED_FUNCTION = YES;
548551
GCC_WARN_UNUSED_VARIABLE = YES;
549-
MACOSX_DEPLOYMENT_TARGET = 10.13;
552+
MACOSX_DEPLOYMENT_TARGET = 11.5;
550553
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
551554
MTL_FAST_MATH = YES;
552555
ONLY_ACTIVE_ARCH = YES;
@@ -592,9 +595,11 @@
592595
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
593596
CODE_SIGN_IDENTITY = "Mac Developer";
594597
COPY_PHASE_STRIP = NO;
598+
DEAD_CODE_STRIPPING = YES;
595599
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
596600
ENABLE_NS_ASSERTIONS = NO;
597601
ENABLE_STRICT_OBJC_MSGSEND = YES;
602+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
598603
GCC_C_LANGUAGE_STANDARD = gnu11;
599604
GCC_NO_COMMON_BLOCKS = YES;
600605
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -603,7 +608,7 @@
603608
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
604609
GCC_WARN_UNUSED_FUNCTION = YES;
605610
GCC_WARN_UNUSED_VARIABLE = YES;
606-
MACOSX_DEPLOYMENT_TARGET = 10.13;
611+
MACOSX_DEPLOYMENT_TARGET = 11.5;
607612
MTL_ENABLE_DEBUG_INFO = NO;
608613
MTL_FAST_MATH = YES;
609614
SDKROOT = macosx;
@@ -622,14 +627,16 @@
622627
CODE_SIGN_STYLE = Automatic;
623628
COMBINE_HIDPI_IMAGES = YES;
624629
CURRENT_PROJECT_VERSION = 30;
630+
DEAD_CODE_STRIPPING = YES;
625631
DEVELOPMENT_TEAM = VZ3Z8BPWPW;
626632
ENABLE_HARDENED_RUNTIME = YES;
627633
INFOPLIST_FILE = "HA Menu/Info.plist";
628634
LD_RUNPATH_SEARCH_PATHS = (
629635
"$(inherited)",
630636
"@executable_path/../Frameworks",
631637
);
632-
MARKETING_VERSION = 2.7.0;
638+
MACOSX_DEPLOYMENT_TARGET = 11.5;
639+
MARKETING_VERSION = 2.7.1;
633640
OTHER_SWIFT_FLAGS = "-D DEBUG";
634641
PRODUCT_BUNDLE_IDENTIFIER = "org.codechimp.HA-Menu";
635642
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -646,14 +653,16 @@
646653
CODE_SIGN_STYLE = Automatic;
647654
COMBINE_HIDPI_IMAGES = YES;
648655
CURRENT_PROJECT_VERSION = 30;
656+
DEAD_CODE_STRIPPING = YES;
649657
DEVELOPMENT_TEAM = VZ3Z8BPWPW;
650658
ENABLE_HARDENED_RUNTIME = YES;
651659
INFOPLIST_FILE = "HA Menu/Info.plist";
652660
LD_RUNPATH_SEARCH_PATHS = (
653661
"$(inherited)",
654662
"@executable_path/../Frameworks",
655663
);
656-
MARKETING_VERSION = 2.7.0;
664+
MACOSX_DEPLOYMENT_TARGET = 11.5;
665+
MARKETING_VERSION = 2.7.1;
657666
PRODUCT_BUNDLE_IDENTIFIER = "org.codechimp.HA-Menu";
658667
PRODUCT_NAME = "$(TARGET_NAME)";
659668
SWIFT_VERSION = 5.0;
@@ -667,13 +676,15 @@
667676
BUNDLE_LOADER = "$(TEST_HOST)";
668677
CODE_SIGN_STYLE = Automatic;
669678
COMBINE_HIDPI_IMAGES = YES;
679+
DEAD_CODE_STRIPPING = YES;
670680
DEVELOPMENT_TEAM = VZ3Z8BPWPW;
671681
INFOPLIST_FILE = "HA MenuTests/Info.plist";
672682
LD_RUNPATH_SEARCH_PATHS = (
673683
"$(inherited)",
674684
"@executable_path/../Frameworks",
675685
"@loader_path/../Frameworks",
676686
);
687+
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
677688
PRODUCT_BUNDLE_IDENTIFIER = "org.codechimp.HA-MenuTests";
678689
PRODUCT_NAME = "$(TARGET_NAME)";
679690
SWIFT_VERSION = 5.0;
@@ -688,13 +699,15 @@
688699
BUNDLE_LOADER = "$(TEST_HOST)";
689700
CODE_SIGN_STYLE = Automatic;
690701
COMBINE_HIDPI_IMAGES = YES;
702+
DEAD_CODE_STRIPPING = YES;
691703
DEVELOPMENT_TEAM = VZ3Z8BPWPW;
692704
INFOPLIST_FILE = "HA MenuTests/Info.plist";
693705
LD_RUNPATH_SEARCH_PATHS = (
694706
"$(inherited)",
695707
"@executable_path/../Frameworks",
696708
"@loader_path/../Frameworks",
697709
);
710+
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
698711
PRODUCT_BUNDLE_IDENTIFIER = "org.codechimp.HA-MenuTests";
699712
PRODUCT_NAME = "$(TARGET_NAME)";
700713
SWIFT_VERSION = 5.0;
@@ -708,13 +721,15 @@
708721
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
709722
CODE_SIGN_STYLE = Automatic;
710723
COMBINE_HIDPI_IMAGES = YES;
724+
DEAD_CODE_STRIPPING = YES;
711725
DEVELOPMENT_TEAM = VZ3Z8BPWPW;
712726
INFOPLIST_FILE = "HA MenuUITests/Info.plist";
713727
LD_RUNPATH_SEARCH_PATHS = (
714728
"$(inherited)",
715729
"@executable_path/../Frameworks",
716730
"@loader_path/../Frameworks",
717731
);
732+
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
718733
PRODUCT_BUNDLE_IDENTIFIER = "org.codechimp.HA-MenuUITests";
719734
PRODUCT_NAME = "$(TARGET_NAME)";
720735
SWIFT_VERSION = 5.0;
@@ -728,13 +743,15 @@
728743
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
729744
CODE_SIGN_STYLE = Automatic;
730745
COMBINE_HIDPI_IMAGES = YES;
746+
DEAD_CODE_STRIPPING = YES;
731747
DEVELOPMENT_TEAM = VZ3Z8BPWPW;
732748
INFOPLIST_FILE = "HA MenuUITests/Info.plist";
733749
LD_RUNPATH_SEARCH_PATHS = (
734750
"$(inherited)",
735751
"@executable_path/../Frameworks",
736752
"@loader_path/../Frameworks",
737753
);
754+
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
738755
PRODUCT_BUNDLE_IDENTIFIER = "org.codechimp.HA-MenuUITests";
739756
PRODUCT_NAME = "$(TARGET_NAME)";
740757
SWIFT_VERSION = 5.0;
@@ -751,14 +768,16 @@
751768
CODE_SIGN_STYLE = Automatic;
752769
COMBINE_HIDPI_IMAGES = YES;
753770
CURRENT_PROJECT_VERSION = 30;
771+
DEAD_CODE_STRIPPING = YES;
754772
DEVELOPMENT_TEAM = VZ3Z8BPWPW;
755773
ENABLE_HARDENED_RUNTIME = YES;
756774
INFOPLIST_FILE = "HA Menu Launcher/Info.plist";
757775
LD_RUNPATH_SEARCH_PATHS = (
758776
"$(inherited)",
759777
"@executable_path/../Frameworks",
760778
);
761-
MARKETING_VERSION = 2.7.0;
779+
MACOSX_DEPLOYMENT_TARGET = 11.5;
780+
MARKETING_VERSION = 2.7.1;
762781
PRODUCT_BUNDLE_IDENTIFIER = "org.codechimp.HA-Menu-Launcher";
763782
PRODUCT_NAME = "$(TARGET_NAME)";
764783
SKIP_INSTALL = YES;
@@ -775,14 +794,16 @@
775794
CODE_SIGN_STYLE = Automatic;
776795
COMBINE_HIDPI_IMAGES = YES;
777796
CURRENT_PROJECT_VERSION = 30;
797+
DEAD_CODE_STRIPPING = YES;
778798
DEVELOPMENT_TEAM = VZ3Z8BPWPW;
779799
ENABLE_HARDENED_RUNTIME = YES;
780800
INFOPLIST_FILE = "HA Menu Launcher/Info.plist";
781801
LD_RUNPATH_SEARCH_PATHS = (
782802
"$(inherited)",
783803
"@executable_path/../Frameworks",
784804
);
785-
MARKETING_VERSION = 2.7.0;
805+
MACOSX_DEPLOYMENT_TARGET = 11.5;
806+
MARKETING_VERSION = 2.7.1;
786807
PRODUCT_BUNDLE_IDENTIFIER = "org.codechimp.HA-Menu-Launcher";
787808
PRODUCT_NAME = "$(TARGET_NAME)";
788809
SKIP_INSTALL = YES;

‎HA Menu.xcodeproj/xcshareddata/xcschemes/HA Menu Launcher.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1220"
3+
LastUpgradeVersion = "1500"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎HA Menu.xcodeproj/xcshareddata/xcschemes/HA Menu.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1220"
3+
LastUpgradeVersion = "1500"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎HA Menu/MenuItemController.swift

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,21 +59,23 @@ final class MenuItemController: NSObject, NSMenuDelegate {
5959
}
6060

6161
public func menuWillOpen(_ menu: NSMenu){
62-
self.removeDynamicMenuItems()
62+
// Dirty fix for Sonoma which doesn't like menu items being changed during WillOpen
63+
DispatchQueue.main.async {
64+
self.removeDynamicMenuItems()
6365

64-
self.addDynamicMenuItems(){
65-
result in
66-
switch result {
67-
case .success( _):
68-
self.checkForUpdate()
69-
case .failure( _):
70-
break
66+
self.addDynamicMenuItems(){
67+
result in
68+
switch result {
69+
case .success( _):
70+
self.checkForUpdate()
71+
case .failure( _):
72+
break
73+
}
7174
}
7275
}
7376
}
74-
77+
7578
public func menuDidClose(_ menu: NSMenu){
76-
7779
}
7880

7981
func buildStaticMenu() {

0 commit comments

Comments
 (0)