From 746b0c31444c4d03f743d2a2269b5d336d61c762 Mon Sep 17 00:00:00 2001 From: Andrew Jackson Date: Wed, 27 Sep 2023 10:19:56 +0100 Subject: [PATCH] Dirty fix for Sonoma menuWillOpen --- HA Menu.xcodeproj/project.pbxproj | 37 +++++++++++++++---- .../xcschemes/HA Menu Launcher.xcscheme | 2 +- .../xcshareddata/xcschemes/HA Menu.xcscheme | 2 +- HA Menu/MenuItemController.swift | 22 ++++++----- 4 files changed, 43 insertions(+), 20 deletions(-) diff --git a/HA Menu.xcodeproj/project.pbxproj b/HA Menu.xcodeproj/project.pbxproj index 1254c06..9952ee0 100644 --- a/HA Menu.xcodeproj/project.pbxproj +++ b/HA Menu.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 52; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -329,8 +329,9 @@ 491F5291217CBF5200105921 /* Project object */ = { isa = PBXProject; attributes = { + BuildIndependentTargetsInParallel = YES; LastSwiftUpdateCheck = 1120; - LastUpgradeCheck = 1220; + LastUpgradeCheck = 1500; ORGANIZATIONNAME = CodeChimp; TargetAttributes = { 491F5298217CBF5200105921 = { @@ -529,9 +530,11 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -546,7 +549,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 = 11.5; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -592,9 +595,11 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -603,7 +608,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 = 11.5; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = macosx; @@ -622,6 +627,7 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 30; + DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = VZ3Z8BPWPW; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = "HA Menu/Info.plist"; @@ -629,7 +635,8 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MARKETING_VERSION = 2.7.0; + MACOSX_DEPLOYMENT_TARGET = 11.5; + MARKETING_VERSION = 2.7.1; OTHER_SWIFT_FLAGS = "-D DEBUG"; PRODUCT_BUNDLE_IDENTIFIER = "org.codechimp.HA-Menu"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -646,6 +653,7 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 30; + DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = VZ3Z8BPWPW; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = "HA Menu/Info.plist"; @@ -653,7 +661,8 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MARKETING_VERSION = 2.7.0; + MACOSX_DEPLOYMENT_TARGET = 11.5; + MARKETING_VERSION = 2.7.1; PRODUCT_BUNDLE_IDENTIFIER = "org.codechimp.HA-Menu"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -667,6 +676,7 @@ BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; + DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = VZ3Z8BPWPW; INFOPLIST_FILE = "HA MenuTests/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( @@ -674,6 +684,7 @@ "@executable_path/../Frameworks", "@loader_path/../Frameworks", ); + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; PRODUCT_BUNDLE_IDENTIFIER = "org.codechimp.HA-MenuTests"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -688,6 +699,7 @@ BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; + DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = VZ3Z8BPWPW; INFOPLIST_FILE = "HA MenuTests/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( @@ -695,6 +707,7 @@ "@executable_path/../Frameworks", "@loader_path/../Frameworks", ); + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; PRODUCT_BUNDLE_IDENTIFIER = "org.codechimp.HA-MenuTests"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -708,6 +721,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; + DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = VZ3Z8BPWPW; INFOPLIST_FILE = "HA MenuUITests/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( @@ -715,6 +729,7 @@ "@executable_path/../Frameworks", "@loader_path/../Frameworks", ); + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; PRODUCT_BUNDLE_IDENTIFIER = "org.codechimp.HA-MenuUITests"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -728,6 +743,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; + DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = VZ3Z8BPWPW; INFOPLIST_FILE = "HA MenuUITests/Info.plist"; LD_RUNPATH_SEARCH_PATHS = ( @@ -735,6 +751,7 @@ "@executable_path/../Frameworks", "@loader_path/../Frameworks", ); + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; PRODUCT_BUNDLE_IDENTIFIER = "org.codechimp.HA-MenuUITests"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -751,6 +768,7 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 30; + DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = VZ3Z8BPWPW; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = "HA Menu Launcher/Info.plist"; @@ -758,7 +776,8 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MARKETING_VERSION = 2.7.0; + MACOSX_DEPLOYMENT_TARGET = 11.5; + MARKETING_VERSION = 2.7.1; PRODUCT_BUNDLE_IDENTIFIER = "org.codechimp.HA-Menu-Launcher"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -775,6 +794,7 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 30; + DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = VZ3Z8BPWPW; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = "HA Menu Launcher/Info.plist"; @@ -782,7 +802,8 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MARKETING_VERSION = 2.7.0; + MACOSX_DEPLOYMENT_TARGET = 11.5; + MARKETING_VERSION = 2.7.1; PRODUCT_BUNDLE_IDENTIFIER = "org.codechimp.HA-Menu-Launcher"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; diff --git a/HA Menu.xcodeproj/xcshareddata/xcschemes/HA Menu Launcher.xcscheme b/HA Menu.xcodeproj/xcshareddata/xcschemes/HA Menu Launcher.xcscheme index 6a33fc6..f48d220 100644 --- a/HA Menu.xcodeproj/xcshareddata/xcschemes/HA Menu Launcher.xcscheme +++ b/HA Menu.xcodeproj/xcshareddata/xcschemes/HA Menu Launcher.xcscheme @@ -1,6 +1,6 @@