From e7edb8dcb265af0d83641abc0da3c6b0c8c865fc Mon Sep 17 00:00:00 2001 From: Abhishek Date: Mon, 5 Jul 2021 15:24:30 -0400 Subject: [PATCH] Supporting Apple Silicon. --- Clocker/Clocker.xcodeproj/project.pbxproj | 12 ++++--- .../xcshareddata/xcschemes/Clocker.xcscheme | 6 ++-- .../xcshareddata/xcschemes/Tests.xcscheme | 2 +- .../xcdebugger/Breakpoints_v2.xcbkptlist | 32 ------------------- .../xcschemes/PTHotKey.framework.xcscheme | 2 +- .../ShortcutRecorder.framework.xcscheme | 2 +- 6 files changed, 13 insertions(+), 43 deletions(-) diff --git a/Clocker/Clocker.xcodeproj/project.pbxproj b/Clocker/Clocker.xcodeproj/project.pbxproj index 65fa0d0..3565af1 100755 --- a/Clocker/Clocker.xcodeproj/project.pbxproj +++ b/Clocker/Clocker.xcodeproj/project.pbxproj @@ -1054,7 +1054,7 @@ CLASSPREFIX = ""; DefaultBuildSystemTypeForWorkspace = Latest; LastSwiftUpdateCheck = 1000; - LastUpgradeCheck = 1140; + LastUpgradeCheck = 1250; TargetAttributes = { 9A7547CF1F184DC3004705EF = { CreatedOnToolsVersion = 8.3.2; @@ -1508,6 +1508,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -1539,7 +1540,6 @@ 9A5B1A8C1BECDB5B00A77C68 /* Distribution */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(NATIVE_ARCH_ACTUAL)"; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "Accent Color"; CLANG_ANALYZER_GCD_PERFORMANCE = YES; @@ -1599,6 +1599,7 @@ ); MACOSX_DEPLOYMENT_TARGET = 10.13; MARKETING_VERSION = 21.07.01; + ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "-ObjC"; PRODUCT_BUNDLE_IDENTIFIER = com.abhishek.Clocker; PRODUCT_NAME = Clocker; @@ -2020,6 +2021,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -2073,6 +2075,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -2106,7 +2109,6 @@ DD4F7C2313C30F9F00825C6E /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(NATIVE_ARCH_ACTUAL)"; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "Accent Color"; CLANG_ANALYZER_GCD_PERFORMANCE = YES; @@ -2167,7 +2169,7 @@ ); MACOSX_DEPLOYMENT_TARGET = 10.13; MARKETING_VERSION = 21.07.01; - ONLY_ACTIVE_ARCH = NO; + ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "-ObjC"; "OTHER_SWIFT_FLAGS[arch=*]" = "-D DEBUG"; PRODUCT_BUNDLE_IDENTIFIER = com.abhishek.Clocker; @@ -2189,7 +2191,6 @@ DD4F7C2413C30F9F00825C6E /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(NATIVE_ARCH_ACTUAL)"; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "Accent Color"; CLANG_ANALYZER_GCD_PERFORMANCE = YES; @@ -2249,6 +2250,7 @@ ); MACOSX_DEPLOYMENT_TARGET = 10.13; MARKETING_VERSION = 21.07.01; + ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "-ObjC"; "OTHER_SWIFT_FLAGS[arch=*]" = "-D RELEASE"; PRODUCT_BUNDLE_IDENTIFIER = com.abhishek.Clocker; diff --git a/Clocker/Clocker.xcodeproj/xcshareddata/xcschemes/Clocker.xcscheme b/Clocker/Clocker.xcodeproj/xcshareddata/xcschemes/Clocker.xcscheme index d1ace0a..3f791db 100644 --- a/Clocker/Clocker.xcodeproj/xcshareddata/xcschemes/Clocker.xcscheme +++ b/Clocker/Clocker.xcodeproj/xcshareddata/xcschemes/Clocker.xcscheme @@ -1,6 +1,6 @@ - - - - - - - - diff --git a/Clocker/Clocker/ShortcutRecorder-master/ShortcutRecorder.xcodeproj/xcshareddata/xcschemes/PTHotKey.framework.xcscheme b/Clocker/Clocker/ShortcutRecorder-master/ShortcutRecorder.xcodeproj/xcshareddata/xcschemes/PTHotKey.framework.xcscheme index ba60c7a..03a7cdb 100755 --- a/Clocker/Clocker/ShortcutRecorder-master/ShortcutRecorder.xcodeproj/xcshareddata/xcschemes/PTHotKey.framework.xcscheme +++ b/Clocker/Clocker/ShortcutRecorder-master/ShortcutRecorder.xcodeproj/xcshareddata/xcschemes/PTHotKey.framework.xcscheme @@ -1,6 +1,6 @@