From 39e1233548ec3b5ae64ad6d52791e26c54770a78 Mon Sep 17 00:00:00 2001 From: Patrick Kladek Date: Sat, 12 Nov 2022 22:36:11 +0400 Subject: [PATCH] apply recommended settings --- .../CocoaDebugKit.xcodeproj/project.pbxproj | 5 ++-- .../CocoaDebugKit/CocoaDebugDescription.h | 2 +- .../CocoaDebugKit/CocoaDebugSettings.h | 2 +- CocoaDebugKit/CocoaDebugKit/CocoaDebugView.h | 2 +- CocoaDebugKit/CocoaDebugKit/CocoaDebugView.m | 2 +- .../CocoaDebugKit/Supporting Files/Info.plist | 2 +- Example/Example.xcodeproj/project.pbxproj | 25 +++++++++++++------ 7 files changed, 24 insertions(+), 16 deletions(-) diff --git a/CocoaDebugKit/CocoaDebugKit.xcodeproj/project.pbxproj b/CocoaDebugKit/CocoaDebugKit.xcodeproj/project.pbxproj index aa86ed2..eb1b0f0 100644 --- a/CocoaDebugKit/CocoaDebugKit.xcodeproj/project.pbxproj +++ b/CocoaDebugKit/CocoaDebugKit.xcodeproj/project.pbxproj @@ -284,7 +284,6 @@ TargetAttributes = { CD2761EA1B0E1C050000BB5D = { CreatedOnToolsVersion = 6.2; - ProvisioningStyle = Automatic; }; }; }; @@ -470,7 +469,7 @@ isa = XCBuildConfiguration; buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; - CODE_SIGN_IDENTITY = ""; + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; @@ -503,7 +502,7 @@ isa = XCBuildConfiguration; buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; - CODE_SIGN_IDENTITY = ""; + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; diff --git a/CocoaDebugKit/CocoaDebugKit/CocoaDebugDescription.h b/CocoaDebugKit/CocoaDebugKit/CocoaDebugDescription.h index 87eae8c..1b49ff5 100644 --- a/CocoaDebugKit/CocoaDebugKit/CocoaDebugDescription.h +++ b/CocoaDebugKit/CocoaDebugKit/CocoaDebugDescription.h @@ -7,7 +7,7 @@ // #import -#import "CrossPlatformDefinitions.h" +#import @interface CocoaDebugDescription : NSObject diff --git a/CocoaDebugKit/CocoaDebugKit/CocoaDebugSettings.h b/CocoaDebugKit/CocoaDebugKit/CocoaDebugSettings.h index 9d42fe1..42508b7 100644 --- a/CocoaDebugKit/CocoaDebugKit/CocoaDebugSettings.h +++ b/CocoaDebugKit/CocoaDebugKit/CocoaDebugSettings.h @@ -7,7 +7,7 @@ // #import -#import "CrossPlatformDefinitions.h" +#import @interface CocoaDebugSettings: NSObject diff --git a/CocoaDebugKit/CocoaDebugKit/CocoaDebugView.h b/CocoaDebugKit/CocoaDebugKit/CocoaDebugView.h index ed1e6db..5c18bb4 100644 --- a/CocoaDebugKit/CocoaDebugKit/CocoaDebugView.h +++ b/CocoaDebugKit/CocoaDebugKit/CocoaDebugView.h @@ -7,7 +7,7 @@ // #import -#import "CrossPlatformDefinitions.h" +#import @interface CocoaDebugView : CPView diff --git a/CocoaDebugKit/CocoaDebugKit/CocoaDebugView.m b/CocoaDebugKit/CocoaDebugKit/CocoaDebugView.m index 0f091fb..709a4f4 100644 --- a/CocoaDebugKit/CocoaDebugKit/CocoaDebugView.m +++ b/CocoaDebugKit/CocoaDebugKit/CocoaDebugView.m @@ -1041,7 +1041,7 @@ - (NSData *)dataFromImage:(CPImage *)image CGImageRef cgRef = [image CGImageForProposedRect:NULL context:nil hints:nil]; NSBitmapImageRep *newRep = [[NSBitmapImageRep alloc] initWithCGImage:cgRef]; [newRep setSize:[image size]];// if you want the same resolution - return [newRep representationUsingType:NSPNGFileType properties:@{}]; + return [newRep representationUsingType:NSBitmapImageFileTypePNG properties:@{}]; #endif } diff --git a/CocoaDebugKit/CocoaDebugKit/Supporting Files/Info.plist b/CocoaDebugKit/CocoaDebugKit/Supporting Files/Info.plist index 746878c..ed498ca 100644 --- a/CocoaDebugKit/CocoaDebugKit/Supporting Files/Info.plist +++ b/CocoaDebugKit/CocoaDebugKit/Supporting Files/Info.plist @@ -19,7 +19,7 @@ CFBundleSignature ???? CFBundleVersion - 1473 + 1492 NSHumanReadableCopyright Copyright © 2015 Patrick Kladek. All rights reserved. NSPrincipalClass diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj index b8b675c..605519a 100644 --- a/Example/Example.xcodeproj/project.pbxproj +++ b/Example/Example.xcodeproj/project.pbxproj @@ -255,12 +255,11 @@ CDB4E14B1ED1D3DA00DE6714 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1140; + LastUpgradeCheck = 1410; ORGANIZATIONNAME = "Patrick Kladek"; TargetAttributes = { CD63352023E2D28900293E4B = { CreatedOnToolsVersion = 11.3.1; - DevelopmentTeam = BQ6K935NHJ; ProvisioningStyle = Automatic; }; CD63A10D1ED33EE400D04814 = { @@ -387,10 +386,12 @@ CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_ENTITLEMENTS = "macOS-TestApp/macOS_TestApp.entitlements"; + CODE_SIGN_IDENTITY = "-"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; - DEVELOPMENT_TEAM = BQ6K935NHJ; + DEVELOPMENT_TEAM = ""; ENABLE_HARDENED_RUNTIME = YES; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = "macOS-TestApp/Info.plist"; @@ -415,10 +416,12 @@ CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_ENTITLEMENTS = "macOS-TestApp/macOS_TestApp.entitlements"; + CODE_SIGN_IDENTITY = "-"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = BQ6K935NHJ; + DEVELOPMENT_TEAM = ""; ENABLE_HARDENED_RUNTIME = YES; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = "macOS-TestApp/Info.plist"; @@ -442,9 +445,10 @@ "$(inherited)", ); INFOPLIST_FILE = "$(SRCROOT)/iOS-TestApp/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MACH_O_TYPE = mh_execute; + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; PRODUCT_BUNDLE_IDENTIFIER = com.kladek.TestApp; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -457,9 +461,10 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; FRAMEWORK_SEARCH_PATHS = ""; INFOPLIST_FILE = "$(SRCROOT)/iOS-TestApp/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MACH_O_TYPE = mh_execute; + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; PRODUCT_BUNDLE_IDENTIFIER = com.kladek.TestApp; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -488,6 +493,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -513,7 +519,8 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -546,6 +553,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -564,7 +572,8 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2";