From 523c08000660efe8480a529e51c99d24b97986df Mon Sep 17 00:00:00 2001 From: Alexander DiBenedetto Date: Tue, 17 Feb 2026 16:25:39 -0700 Subject: [PATCH 1/4] Simplified package.swift to resolve build issue. --- Package.swift | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/Package.swift b/Package.swift index 2038f58f..2e488b21 100644 --- a/Package.swift +++ b/Package.swift @@ -14,25 +14,14 @@ let package = Package( name: "TrustKit", targets: ["TrustKit"] ), - .library( - name: "TrustKitDynamic", - type: .dynamic, - targets: ["TrustKit"] - ), - .library( - name: "TrustKitStatic", - type: .static, - targets: ["TrustKit"] - ), ], dependencies: [ ], targets: [ .target( name: "TrustKit", - dependencies: [], path: "TrustKit", - resources: [.copy("PrivacyInfo.xcprivacy")], + resources: [.process("PrivacyInfo.xcprivacy")], publicHeadersPath: "public", cSettings: [.define("NS_BLOCK_ASSERTIONS", to: "1", .when(configuration: .release))] ), From 2b0c0261f7464df4608ce9d5679e264ac99f4d1a Mon Sep 17 00:00:00 2001 From: Alexander DiBenedetto Date: Tue, 17 Feb 2026 16:30:08 -0700 Subject: [PATCH 2/4] Removes bitcode setting. --- TrustKit.xcodeproj/project.pbxproj | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/TrustKit.xcodeproj/project.pbxproj b/TrustKit.xcodeproj/project.pbxproj index bd52de1f..513b1b0f 100644 --- a/TrustKit.xcodeproj/project.pbxproj +++ b/TrustKit.xcodeproj/project.pbxproj @@ -1550,7 +1550,6 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; - ENABLE_BITCODE = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -1624,7 +1623,6 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; CURRENT_PROJECT_VERSION = 1; - ENABLE_BITCODE = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -1664,7 +1662,6 @@ isa = XCBuildConfiguration; buildSettings = { APPLICATION_EXTENSION_API_ONLY = "$(inherited)"; - BITCODE_GENERATION_MODE = bitcode; CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; COMBINE_HIDPI_IMAGES = YES; @@ -1672,7 +1669,6 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_BITCODE = "$(inherited)"; GCC_GENERATE_TEST_COVERAGE_FILES = YES; GENERATE_PKGINFO_FILE = YES; INFOPLIST_FILE = "$(SRCROOT)/TrustKit/Framework/Info.plist"; @@ -1695,7 +1691,6 @@ isa = XCBuildConfiguration; buildSettings = { APPLICATION_EXTENSION_API_ONLY = "$(inherited)"; - BITCODE_GENERATION_MODE = bitcode; CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; COMBINE_HIDPI_IMAGES = YES; @@ -1703,7 +1698,6 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_BITCODE = "$(inherited)"; GCC_GENERATE_TEST_COVERAGE_FILES = YES; GENERATE_PKGINFO_FILE = YES; INFOPLIST_FILE = "$(SRCROOT)/TrustKit/Framework/Info.plist"; @@ -1727,7 +1721,6 @@ APPLICATION_EXTENSION_API_ONLY = NO; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; COMBINE_HIDPI_IMAGES = YES; - ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)", "$(inherited)", @@ -1756,7 +1749,6 @@ APPLICATION_EXTENSION_API_ONLY = NO; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; COMBINE_HIDPI_IMAGES = YES; - ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)", "$(inherited)", @@ -1787,7 +1779,6 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_BITCODE = "$(inherited)"; GCC_GENERATE_TEST_COVERAGE_FILES = YES; INFOPLIST_FILE = "$(SRCROOT)/TrustKit/Framework/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -1819,7 +1810,6 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_BITCODE = "$(inherited)"; GCC_GENERATE_TEST_COVERAGE_FILES = YES; INFOPLIST_FILE = "$(SRCROOT)/TrustKit/Framework/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -1844,7 +1834,6 @@ APPLICATION_EXTENSION_API_ONLY = NO; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; COMBINE_HIDPI_IMAGES = YES; - ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)", "$(inherited)", @@ -1874,7 +1863,6 @@ APPLICATION_EXTENSION_API_ONLY = NO; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; COMBINE_HIDPI_IMAGES = YES; - ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)", "$(inherited)", @@ -1898,10 +1886,8 @@ isa = XCBuildConfiguration; buildSettings = { APPLICATION_EXTENSION_API_ONLY = "$(inherited)"; - BITCODE_GENERATION_MODE = bitcode; COMBINE_HIDPI_IMAGES = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_BITCODE = "$(inherited)"; GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -1923,11 +1909,9 @@ isa = XCBuildConfiguration; buildSettings = { APPLICATION_EXTENSION_API_ONLY = "$(inherited)"; - BITCODE_GENERATION_MODE = bitcode; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_BITCODE = "$(inherited)"; GCC_NO_COMMON_BLOCKS = YES; IPHONEOS_DEPLOYMENT_TARGET = "$(inherited)"; LIBRARY_SEARCH_PATHS = "$(inherited)"; @@ -1951,7 +1935,6 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_BITCODE = NO; FRAMEWORK_VERSION = A; GCC_GENERATE_TEST_COVERAGE_FILES = YES; GCC_NO_COMMON_BLOCKS = YES; @@ -1980,7 +1963,6 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_BITCODE = NO; FRAMEWORK_VERSION = A; GCC_GENERATE_TEST_COVERAGE_FILES = YES; GCC_NO_COMMON_BLOCKS = YES; @@ -2004,7 +1986,6 @@ CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/TrustKitTests/Dependencies/OCMock/Mac", @@ -2028,7 +2009,6 @@ COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/TrustKitTests/Dependencies/OCMock/Mac", @@ -2057,7 +2037,6 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_BITCODE = "$(inherited)"; GCC_GENERATE_TEST_COVERAGE_FILES = YES; INFOPLIST_FILE = "$(SRCROOT)/TrustKit/Framework/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -2089,7 +2068,6 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_BITCODE = "$(inherited)"; GCC_GENERATE_TEST_COVERAGE_FILES = YES; INFOPLIST_FILE = "$(SRCROOT)/TrustKit/Framework/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; From d61942e2570d949985ee30249d6d922b9987724c Mon Sep 17 00:00:00 2001 From: Alexander DiBenedetto Date: Tue, 17 Feb 2026 16:44:45 -0700 Subject: [PATCH 3/4] Updated to Apple Xcode 26 recommended settings; fix failing integration test by updating datatheorem.com key. --- TrustKit.xcodeproj/project.pbxproj | 151 ++++++++++++++---- .../xcschemes/TrustKit OS X.xcscheme | 2 +- .../xcschemes/TrustKit tvOS.xcscheme | 2 +- .../xcschemes/TrustKit watchOS.xcscheme | 2 +- .../xcshareddata/xcschemes/TrustKit.xcscheme | 2 +- .../xcschemes/TrustKit_Static.xcscheme | 2 +- TrustKit/public/TSKPinningValidator.h | 7 +- TrustKit/public/TSKPinningValidatorCallback.h | 4 +- TrustKit/public/TSKPinningValidatorResult.h | 7 +- TrustKit/public/TSKTrustDecision.h | 4 - TrustKit/public/TSKTrustKitConfig.h | 4 - TrustKit/public/TrustKit.h | 14 +- TrustKitTests/TSKEndToEndSwizzlingTests.m | 2 +- 13 files changed, 138 insertions(+), 65 deletions(-) diff --git a/TrustKit.xcodeproj/project.pbxproj b/TrustKit.xcodeproj/project.pbxproj index 513b1b0f..fbbfa7c9 100644 --- a/TrustKit.xcodeproj/project.pbxproj +++ b/TrustKit.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -1159,8 +1159,9 @@ 8C84803E1A896EE30017C155 /* Project object */ = { isa = PBXProject; attributes = { + BuildIndependentTargetsInParallel = YES; CLASSPREFIX = TSK; - LastUpgradeCheck = 1250; + LastUpgradeCheck = 2620; ORGANIZATIONNAME = TrustKit; TargetAttributes = { 8C8480461A896EE30017C155 = { @@ -1550,8 +1551,11 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; + DEAD_CODE_STRIPPING = YES; + DEFINES_MODULE = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; @@ -1623,8 +1627,11 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; CURRENT_PROJECT_VERSION = 1; + DEAD_CODE_STRIPPING = YES; + DEFINES_MODULE = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_TREAT_WARNINGS_AS_ERRORS = YES; @@ -1665,17 +1672,23 @@ CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; COMBINE_HIDPI_IMAGES = YES; - DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = YES; GCC_GENERATE_TEST_COVERAGE_FILES = YES; GENERATE_PKGINFO_FILE = YES; INFOPLIST_FILE = "$(SRCROOT)/TrustKit/Framework/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = "$(inherited)"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); LIBRARY_SEARCH_PATHS = "$(inherited)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11"; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.datatheorem.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1694,17 +1707,23 @@ CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; COMBINE_HIDPI_IMAGES = YES; - DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = YES; GCC_GENERATE_TEST_COVERAGE_FILES = YES; GENERATE_PKGINFO_FILE = YES; INFOPLIST_FILE = "$(SRCROOT)/TrustKit/Framework/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = "$(inherited)"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); LIBRARY_SEARCH_PATHS = "$(inherited)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11"; PRODUCT_BUNDLE_IDENTIFIER = "com.datatheorem.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; @@ -1733,7 +1752,14 @@ GCC_TREAT_WARNINGS_AS_ERRORS = YES; INFOPLIST_FILE = TrustKitTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = "$(inherited)"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks @loader_path/../Frameworks @executable_path/../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + "@loader_path/../Frameworks", + "@executable_path/../Frameworks", + ); + MACOSX_DEPLOYMENT_TARGET = 11.0; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.datatheorem.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1757,7 +1783,14 @@ GCC_TREAT_WARNINGS_AS_ERRORS = YES; INFOPLIST_FILE = TrustKitTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = "$(inherited)"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks @loader_path/../Frameworks @executable_path/../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + "@loader_path/../Frameworks", + "@executable_path/../Frameworks", + ); + MACOSX_DEPLOYMENT_TARGET = 11.0; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.datatheorem.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1775,16 +1808,22 @@ "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COMBINE_HIDPI_IMAGES = YES; - DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = YES; GCC_GENERATE_TEST_COVERAGE_FILES = YES; INFOPLIST_FILE = "$(SRCROOT)/TrustKit/Framework/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = "$(inherited)"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); LIBRARY_SEARCH_PATHS = "$(inherited)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11"; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = com.datatheorem.TrustKit; PRODUCT_NAME = TrustKit; @@ -1806,16 +1845,22 @@ "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COMBINE_HIDPI_IMAGES = YES; - DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = YES; GCC_GENERATE_TEST_COVERAGE_FILES = YES; INFOPLIST_FILE = "$(SRCROOT)/TrustKit/Framework/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = "$(inherited)"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); LIBRARY_SEARCH_PATHS = "$(inherited)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11"; PRODUCT_BUNDLE_IDENTIFIER = com.datatheorem.TrustKit; PRODUCT_NAME = TrustKit; PROVISIONING_PROFILE = ""; @@ -1845,7 +1890,14 @@ ); GCC_TREAT_WARNINGS_AS_ERRORS = YES; INFOPLIST_FILE = TrustKitTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks @loader_path/../Frameworks @executable_path/../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + "@loader_path/../Frameworks", + "@executable_path/../Frameworks", + ); + MACOSX_DEPLOYMENT_TARGET = 11.0; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.datatheorem.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1870,7 +1922,14 @@ ); GCC_TREAT_WARNINGS_AS_ERRORS = YES; INFOPLIST_FILE = TrustKitTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks @loader_path/../Frameworks @executable_path/../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + "@loader_path/../Frameworks", + "@executable_path/../Frameworks", + ); + MACOSX_DEPLOYMENT_TARGET = 11.0; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.datatheorem.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1895,6 +1954,7 @@ ); IPHONEOS_DEPLOYMENT_TARGET = "$(inherited)"; LIBRARY_SEARCH_PATHS = "$(inherited)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1915,6 +1975,7 @@ GCC_NO_COMMON_BLOCKS = YES; IPHONEOS_DEPLOYMENT_TARGET = "$(inherited)"; LIBRARY_SEARCH_PATHS = "$(inherited)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; @@ -1930,19 +1991,25 @@ CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; COMBINE_HIDPI_IMAGES = YES; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; - DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = YES; FRAMEWORK_VERSION = A; GCC_GENERATE_TEST_COVERAGE_FILES = YES; GCC_NO_COMMON_BLOCKS = YES; INFOPLIST_FILE = "$(SRCROOT)/TrustKit/Framework/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/Frameworks", + ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MACOSX_DEPLOYMENT_TARGET = "$(inherited)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11"; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = com.datatheorem.TrustKit; PRODUCT_NAME = TrustKit; @@ -1958,19 +2025,25 @@ CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = YES; FRAMEWORK_VERSION = A; GCC_GENERATE_TEST_COVERAGE_FILES = YES; GCC_NO_COMMON_BLOCKS = YES; INFOPLIST_FILE = "$(SRCROOT)/TrustKit/Framework/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/Frameworks", + ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MACOSX_DEPLOYMENT_TARGET = "$(inherited)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11"; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = com.datatheorem.TrustKit; PRODUCT_NAME = TrustKit; @@ -1985,6 +2058,7 @@ buildSettings = { CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -1992,8 +2066,12 @@ ); GCC_NO_COMMON_BLOCKS = YES; INFOPLIST_FILE = TrustKitTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = "$(inherited)"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/../Frameworks", + ); + MACOSX_DEPLOYMENT_TARGET = 11.0; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.datatheorem.TrustKit-OS-XTests"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -2008,6 +2086,7 @@ CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -2015,8 +2094,12 @@ ); GCC_NO_COMMON_BLOCKS = YES; INFOPLIST_FILE = TrustKitTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = "$(inherited)"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/../Frameworks", + ); + MACOSX_DEPLOYMENT_TARGET = 11.0; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.datatheorem.TrustKit-OS-XTests"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -2033,16 +2116,22 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; COMBINE_HIDPI_IMAGES = YES; - DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = YES; GCC_GENERATE_TEST_COVERAGE_FILES = YES; INFOPLIST_FILE = "$(SRCROOT)/TrustKit/Framework/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = "$(inherited)"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); LIBRARY_SEARCH_PATHS = "$(inherited)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11"; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.datatheorem.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = TrustKit; @@ -2064,16 +2153,22 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; COMBINE_HIDPI_IMAGES = YES; - DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = YES; GCC_GENERATE_TEST_COVERAGE_FILES = YES; INFOPLIST_FILE = "$(SRCROOT)/TrustKit/Framework/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = "$(inherited)"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); LIBRARY_SEARCH_PATHS = "$(inherited)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11"; PRODUCT_BUNDLE_IDENTIFIER = "com.datatheorem.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = TrustKit; PROVISIONING_PROFILE = ""; diff --git a/TrustKit.xcodeproj/xcshareddata/xcschemes/TrustKit OS X.xcscheme b/TrustKit.xcodeproj/xcshareddata/xcschemes/TrustKit OS X.xcscheme index 32b4387e..a18dee6f 100644 --- a/TrustKit.xcodeproj/xcshareddata/xcschemes/TrustKit OS X.xcscheme +++ b/TrustKit.xcodeproj/xcshareddata/xcschemes/TrustKit OS X.xcscheme @@ -1,6 +1,6 @@ #import -#endif @class TSKPinningValidatorResult; @class TSKSPKIHashCache; diff --git a/TrustKit/public/TSKPinningValidatorCallback.h b/TrustKit/public/TSKPinningValidatorCallback.h index 3e67d94c..1248ddbc 100644 --- a/TrustKit/public/TSKPinningValidatorCallback.h +++ b/TrustKit/public/TSKPinningValidatorCallback.h @@ -12,8 +12,8 @@ #ifndef TSKPinningValidatorCallback_h #define TSKPinningValidatorCallback_h -#import "TSKPinningValidatorResult.h" -#import "TSKTrustKitConfig.h" +#import +#import /** The pinning policy set for a specific hostname. diff --git a/TrustKit/public/TSKPinningValidatorResult.h b/TrustKit/public/TSKPinningValidatorResult.h index 18820b56..13559362 100644 --- a/TrustKit/public/TSKPinningValidatorResult.h +++ b/TrustKit/public/TSKPinningValidatorResult.h @@ -9,13 +9,8 @@ */ -#import "TSKTrustDecision.h" - -#if __has_feature(modules) -@import Foundation; -#else +#import #import -#endif /** A `TSKPinningValidatorResult` instance contains all the details regarding a pinning validation diff --git a/TrustKit/public/TSKTrustDecision.h b/TrustKit/public/TSKTrustDecision.h index c86d2b66..a4262c93 100644 --- a/TrustKit/public/TSKTrustDecision.h +++ b/TrustKit/public/TSKTrustDecision.h @@ -9,11 +9,7 @@ */ -#if __has_feature(modules) -@import Foundation; -#else #import -#endif /** Possible return values when verifying a server's identity against a set of pins. diff --git a/TrustKit/public/TSKTrustKitConfig.h b/TrustKit/public/TSKTrustKitConfig.h index 680b73d9..1ebf7d2c 100644 --- a/TrustKit/public/TSKTrustKitConfig.h +++ b/TrustKit/public/TSKTrustKitConfig.h @@ -9,11 +9,7 @@ */ -#if __has_feature(modules) -@import Foundation; -#else #import -#endif /** The version of TrustKit, such as "1.4.0". diff --git a/TrustKit/public/TrustKit.h b/TrustKit/public/TrustKit.h index 5e6ff9f9..cbba8916 100644 --- a/TrustKit/public/TrustKit.h +++ b/TrustKit/public/TrustKit.h @@ -9,19 +9,15 @@ */ -#if __has_feature(modules) -@import Foundation; -#else #import -#endif #ifndef _TRUSTKIT_ #define _TRUSTKIT_ - #import "TSKTrustKitConfig.h" - #import "TSKPinningValidatorResult.h" - #import "TSKPinningValidatorCallback.h" - #import "TSKPinningValidator.h" - #import "TSKTrustDecision.h" + #import + #import + #import + #import + #import #endif /* _TRUSTKIT_ */ NS_ASSUME_NONNULL_BEGIN diff --git a/TrustKitTests/TSKEndToEndSwizzlingTests.m b/TrustKitTests/TSKEndToEndSwizzlingTests.m index ca7a1346..5bc962bb 100644 --- a/TrustKitTests/TSKEndToEndSwizzlingTests.m +++ b/TrustKitTests/TSKEndToEndSwizzlingTests.m @@ -167,7 +167,7 @@ - (void)test // Valid pinning configuration @"www.datatheorem.com" : @{ kTSKEnforcePinning : @YES, - kTSKPublicKeyHashes : @[@"F6jTih9VkkYZS8yuYqeU/4DUGehJ+niBGkkQ1yg8H3U=", // CA key + kTSKPublicKeyHashes : @[@"OdSlmQD9NWJh4EbcOHBxkhygPwNSwA9Q91eounfbcoE=", // CA key @"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" // Fake key ]}, // Invalid pinning configuration From 0b559a6973235c26f5d8acd8e1136a933b62d450 Mon Sep 17 00:00:00 2001 From: Alexander DiBenedetto Date: Tue, 17 Feb 2026 16:50:53 -0700 Subject: [PATCH 4/4] Align project versions and remove specific target overrides. --- TrustKit.xcodeproj/project.pbxproj | 44 ++++++------------------------ 1 file changed, 8 insertions(+), 36 deletions(-) diff --git a/TrustKit.xcodeproj/project.pbxproj b/TrustKit.xcodeproj/project.pbxproj index fbbfa7c9..843ed65e 100644 --- a/TrustKit.xcodeproj/project.pbxproj +++ b/TrustKit.xcodeproj/project.pbxproj @@ -1553,6 +1553,7 @@ CURRENT_PROJECT_VERSION = 1; DEAD_CODE_STRIPPING = YES; DEFINES_MODULE = YES; + DRIVERKIT_DEPLOYMENT_TARGET = 20.0; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; ENABLE_USER_SCRIPT_SANDBOXING = YES; @@ -1580,7 +1581,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = "$(SRCROOT)/**"; IPHONEOS_DEPLOYMENT_TARGET = 12.0; - MACOSX_DEPLOYMENT_TARGET = 10.13; + MACOSX_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; @@ -1590,7 +1591,8 @@ VALID_ARCHS = "$(ARCHS_STANDARD)"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; - WATCHOS_DEPLOYMENT_TARGET = 4.0; + WATCHOS_DEPLOYMENT_TARGET = 5.0; + XROS_DEPLOYMENT_TARGET = 1.0; }; name = Debug; }; @@ -1629,6 +1631,7 @@ CURRENT_PROJECT_VERSION = 1; DEAD_CODE_STRIPPING = YES; DEFINES_MODULE = YES; + DRIVERKIT_DEPLOYMENT_TARGET = 20.0; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_USER_SCRIPT_SANDBOXING = YES; @@ -1651,7 +1654,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = "$(SRCROOT)/**"; IPHONEOS_DEPLOYMENT_TARGET = 12.0; - MACOSX_DEPLOYMENT_TARGET = 10.13; + MACOSX_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx"; @@ -1661,7 +1664,8 @@ VALID_ARCHS = "$(ARCHS_STANDARD)"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; - WATCHOS_DEPLOYMENT_TARGET = 4.0; + WATCHOS_DEPLOYMENT_TARGET = 5.0; + XROS_DEPLOYMENT_TARGET = 1.0; }; name = Release; }; @@ -1680,14 +1684,12 @@ GENERATE_PKGINFO_FILE = YES; INFOPLIST_FILE = "$(SRCROOT)/TrustKit/Framework/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = "$(inherited)"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MACOSX_DEPLOYMENT_TARGET = 11.0; MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11"; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.datatheorem.$(PRODUCT_NAME:rfc1034identifier)"; @@ -1715,14 +1717,12 @@ GENERATE_PKGINFO_FILE = YES; INFOPLIST_FILE = "$(SRCROOT)/TrustKit/Framework/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = "$(inherited)"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MACOSX_DEPLOYMENT_TARGET = 11.0; MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11"; PRODUCT_BUNDLE_IDENTIFIER = "com.datatheorem.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1751,7 +1751,6 @@ ); GCC_TREAT_WARNINGS_AS_ERRORS = YES; INFOPLIST_FILE = TrustKitTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = "$(inherited)"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1759,7 +1758,6 @@ "@loader_path/../Frameworks", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 11.0; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.datatheorem.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1782,7 +1780,6 @@ ); GCC_TREAT_WARNINGS_AS_ERRORS = YES; INFOPLIST_FILE = TrustKitTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = "$(inherited)"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1790,7 +1787,6 @@ "@loader_path/../Frameworks", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 11.0; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.datatheorem.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1815,14 +1811,12 @@ GCC_GENERATE_TEST_COVERAGE_FILES = YES; INFOPLIST_FILE = "$(SRCROOT)/TrustKit/Framework/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = "$(inherited)"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MACOSX_DEPLOYMENT_TARGET = 11.0; MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11"; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = com.datatheorem.TrustKit; @@ -1832,7 +1826,6 @@ SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "appletvsimulator appletvos"; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = "$(inherited)"; VALID_ARCHS = "$(ARCHS_STANDARD)"; }; name = Debug; @@ -1852,14 +1845,12 @@ GCC_GENERATE_TEST_COVERAGE_FILES = YES; INFOPLIST_FILE = "$(SRCROOT)/TrustKit/Framework/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = "$(inherited)"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MACOSX_DEPLOYMENT_TARGET = 11.0; MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11"; PRODUCT_BUNDLE_IDENTIFIER = com.datatheorem.TrustKit; PRODUCT_NAME = TrustKit; @@ -1868,7 +1859,6 @@ SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "appletvsimulator appletvos"; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = "$(inherited)"; VALID_ARCHS = "$(ARCHS_STANDARD)"; }; name = Release; @@ -1897,14 +1887,12 @@ "@loader_path/../Frameworks", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 11.0; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.datatheorem.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; SUPPORTED_PLATFORMS = "appletvsimulator appletvos"; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = "$(inherited)"; VALID_ARCHS = "$(ARCHS_STANDARD)"; }; name = Debug; @@ -1929,14 +1917,12 @@ "@loader_path/../Frameworks", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 11.0; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.datatheorem.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; SUPPORTED_PLATFORMS = "appletvsimulator appletvos"; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = "$(inherited)"; VALID_ARCHS = "$(ARCHS_STANDARD)"; }; name = Release; @@ -1952,9 +1938,7 @@ "DEBUG=1", "$(inherited)", ); - IPHONEOS_DEPLOYMENT_TARGET = "$(inherited)"; LIBRARY_SEARCH_PATHS = "$(inherited)"; - MACOSX_DEPLOYMENT_TARGET = 11.0; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1973,9 +1957,7 @@ COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_NO_COMMON_BLOCKS = YES; - IPHONEOS_DEPLOYMENT_TARGET = "$(inherited)"; LIBRARY_SEARCH_PATHS = "$(inherited)"; - MACOSX_DEPLOYMENT_TARGET = 11.0; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; @@ -2008,7 +1990,6 @@ "@loader_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MACOSX_DEPLOYMENT_TARGET = 11.0; MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11"; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = com.datatheorem.TrustKit; @@ -2042,7 +2023,6 @@ "@loader_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MACOSX_DEPLOYMENT_TARGET = 11.0; MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11"; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = com.datatheorem.TrustKit; @@ -2071,7 +2051,6 @@ "@executable_path/../Frameworks", "@loader_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 11.0; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.datatheorem.TrustKit-OS-XTests"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -2099,7 +2078,6 @@ "@executable_path/../Frameworks", "@loader_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 11.0; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.datatheorem.TrustKit-OS-XTests"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -2123,14 +2101,12 @@ GCC_GENERATE_TEST_COVERAGE_FILES = YES; INFOPLIST_FILE = "$(SRCROOT)/TrustKit/Framework/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = "$(inherited)"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MACOSX_DEPLOYMENT_TARGET = 11.0; MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11"; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.datatheorem.$(PRODUCT_NAME:rfc1034identifier)"; @@ -2141,7 +2117,6 @@ SUPPORTED_PLATFORMS = "watchsimulator watchos"; TARGETED_DEVICE_FAMILY = 4; VALID_ARCHS = "$(ARCHS_STANDARD)"; - WATCHOS_DEPLOYMENT_TARGET = "$(inherited)"; }; name = Debug; }; @@ -2160,14 +2135,12 @@ GCC_GENERATE_TEST_COVERAGE_FILES = YES; INFOPLIST_FILE = "$(SRCROOT)/TrustKit/Framework/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = "$(inherited)"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MACOSX_DEPLOYMENT_TARGET = 11.0; MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11"; PRODUCT_BUNDLE_IDENTIFIER = "com.datatheorem.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = TrustKit; @@ -2177,7 +2150,6 @@ SUPPORTED_PLATFORMS = "watchsimulator watchos"; TARGETED_DEVICE_FAMILY = 4; VALID_ARCHS = "$(ARCHS_STANDARD)"; - WATCHOS_DEPLOYMENT_TARGET = "$(inherited)"; }; name = Release; };