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))] ), diff --git a/TrustKit.xcodeproj/project.pbxproj b/TrustKit.xcodeproj/project.pbxproj index bd52de1f..843ed65e 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,9 +1551,12 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; - ENABLE_BITCODE = YES; + 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; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; @@ -1577,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; @@ -1587,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; }; @@ -1624,9 +1629,12 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; CURRENT_PROJECT_VERSION = 1; - ENABLE_BITCODE = YES; + 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; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_TREAT_WARNINGS_AS_ERRORS = YES; @@ -1646,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"; @@ -1656,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; }; @@ -1664,22 +1673,24 @@ isa = XCBuildConfiguration; buildSettings = { APPLICATION_EXTENSION_API_ONLY = "$(inherited)"; - BITCODE_GENERATION_MODE = bitcode; 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_BITCODE = "$(inherited)"; + 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)"; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11"; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.datatheorem.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1695,22 +1706,24 @@ isa = XCBuildConfiguration; buildSettings = { APPLICATION_EXTENSION_API_ONLY = "$(inherited)"; - BITCODE_GENERATION_MODE = bitcode; 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_BITCODE = "$(inherited)"; + 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)"; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11"; PRODUCT_BUNDLE_IDENTIFIER = "com.datatheorem.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; @@ -1727,7 +1740,6 @@ APPLICATION_EXTENSION_API_ONLY = NO; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; COMBINE_HIDPI_IMAGES = YES; - ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)", "$(inherited)", @@ -1739,8 +1751,13 @@ ); 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", + ); ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.datatheorem.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1756,7 +1773,6 @@ APPLICATION_EXTENSION_API_ONLY = NO; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; COMBINE_HIDPI_IMAGES = YES; - ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)", "$(inherited)", @@ -1764,8 +1780,13 @@ ); 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", + ); ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.datatheorem.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1783,17 +1804,20 @@ "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_BITCODE = "$(inherited)"; + 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)"; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11"; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = com.datatheorem.TrustKit; PRODUCT_NAME = TrustKit; @@ -1802,7 +1826,6 @@ SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "appletvsimulator appletvos"; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = "$(inherited)"; VALID_ARCHS = "$(ARCHS_STANDARD)"; }; name = Debug; @@ -1815,17 +1838,20 @@ "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_BITCODE = "$(inherited)"; + 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)"; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11"; PRODUCT_BUNDLE_IDENTIFIER = com.datatheorem.TrustKit; PRODUCT_NAME = TrustKit; PROVISIONING_PROFILE = ""; @@ -1833,7 +1859,6 @@ SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "appletvsimulator appletvos"; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = "$(inherited)"; VALID_ARCHS = "$(ARCHS_STANDARD)"; }; name = Release; @@ -1844,7 +1869,6 @@ APPLICATION_EXTENSION_API_ONLY = NO; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; COMBINE_HIDPI_IMAGES = YES; - ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)", "$(inherited)", @@ -1856,14 +1880,19 @@ ); 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", + ); 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; @@ -1874,7 +1903,6 @@ APPLICATION_EXTENSION_API_ONLY = NO; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; COMBINE_HIDPI_IMAGES = YES; - ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)", "$(inherited)", @@ -1882,14 +1910,19 @@ ); 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", + ); 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; @@ -1898,16 +1931,13 @@ 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", "$(inherited)", ); - IPHONEOS_DEPLOYMENT_TARGET = "$(inherited)"; LIBRARY_SEARCH_PATHS = "$(inherited)"; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = "-ObjC"; @@ -1923,13 +1953,10 @@ 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)"; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1946,20 +1973,24 @@ 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_BITCODE = NO; + 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)"; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11"; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = com.datatheorem.TrustKit; PRODUCT_NAME = TrustKit; @@ -1975,20 +2006,24 @@ 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_BITCODE = NO; + 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)"; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11"; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = com.datatheorem.TrustKit; PRODUCT_NAME = TrustKit; @@ -2003,16 +2038,19 @@ buildSettings = { CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/TrustKitTests/Dependencies/OCMock/Mac", ); 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", + ); ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.datatheorem.TrustKit-OS-XTests"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -2027,16 +2065,19 @@ CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/TrustKitTests/Dependencies/OCMock/Mac", ); 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", + ); ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.datatheorem.TrustKit-OS-XTests"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -2053,17 +2094,20 @@ "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_BITCODE = "$(inherited)"; + 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)"; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11"; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.datatheorem.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = TrustKit; @@ -2073,7 +2117,6 @@ SUPPORTED_PLATFORMS = "watchsimulator watchos"; TARGETED_DEVICE_FAMILY = 4; VALID_ARCHS = "$(ARCHS_STANDARD)"; - WATCHOS_DEPLOYMENT_TARGET = "$(inherited)"; }; name = Debug; }; @@ -2085,17 +2128,20 @@ "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_BITCODE = "$(inherited)"; + 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)"; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11"; PRODUCT_BUNDLE_IDENTIFIER = "com.datatheorem.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = TrustKit; PROVISIONING_PROFILE = ""; @@ -2104,7 +2150,6 @@ SUPPORTED_PLATFORMS = "watchsimulator watchos"; TARGETED_DEVICE_FAMILY = 4; VALID_ARCHS = "$(ARCHS_STANDARD)"; - WATCHOS_DEPLOYMENT_TARGET = "$(inherited)"; }; name = Release; }; 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