diff --git a/Support/HockeySDK.xcodeproj/project.pbxproj b/Support/HockeySDK.xcodeproj/project.pbxproj index e4bb7c0b10..2e3c2d4594 100644 --- a/Support/HockeySDK.xcodeproj/project.pbxproj +++ b/Support/HockeySDK.xcodeproj/project.pbxproj @@ -276,14 +276,14 @@ 802C45B41BD9629C000D043C /* HockeySDKNullability.h in Headers */ = {isa = PBXBuildFile; fileRef = 1E3A260E1B2B207900D59683 /* HockeySDKNullability.h */; settings = {ATTRIBUTES = (Public, ); }; }; 807756401BC6A44E0037C3DA /* HockeySDKEnums.h in Headers */ = {isa = PBXBuildFile; fileRef = 8077563F1BC6A44D0037C3DA /* HockeySDKEnums.h */; settings = {ATTRIBUTES = (Public, ); }; }; 807756411BC6B6050037C3DA /* HockeySDKEnums.h in Headers */ = {isa = PBXBuildFile; fileRef = 8077563F1BC6A44D0037C3DA /* HockeySDKEnums.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 808441641C20617200644A40 /* libOCMock.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 808441611C20617200644A40 /* libOCMock.a */; }; - 808441651C20617300644A40 /* libOCMock.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 808441611C20617200644A40 /* libOCMock.a */; }; 808441661C20617300644A40 /* OCHamcrestIOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 808441621C20617200644A40 /* OCHamcrestIOS.framework */; }; 808441671C20617300644A40 /* OCHamcrestIOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 808441621C20617200644A40 /* OCHamcrestIOS.framework */; }; 808441681C20617300644A40 /* OCMockitoIOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 808441631C20617200644A40 /* OCMockitoIOS.framework */; }; 808441691C20617300644A40 /* OCMockitoIOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 808441631C20617200644A40 /* OCMockitoIOS.framework */; }; 80A4662E1C58F4DF00199909 /* BITCrashReportTextFormatterPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 80A4662D1C58F4DF00199909 /* BITCrashReportTextFormatterPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; 80A4662F1C58F4DF00199909 /* BITCrashReportTextFormatterPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 80A4662D1C58F4DF00199909 /* BITCrashReportTextFormatterPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; + 80CA63891C67BD5400362DBF /* libOCMock.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 80CA63881C67BD5400362DBF /* libOCMock.a */; }; + 80CA638A1C67BD5400362DBF /* libOCMock.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 80CA63881C67BD5400362DBF /* libOCMock.a */; }; 846A901F1B20B0EB0076BB80 /* BITCrashCXXExceptionHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 846A901D1B20B0EB0076BB80 /* BITCrashCXXExceptionHandler.h */; }; 846A90201B20B0EB0076BB80 /* BITCrashCXXExceptionHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 846A901D1B20B0EB0076BB80 /* BITCrashCXXExceptionHandler.h */; }; 846A90211B20B0EB0076BB80 /* BITCrashCXXExceptionHandler.mm in Sources */ = {isa = PBXBuildFile; fileRef = 846A901E1B20B0EB0076BB80 /* BITCrashCXXExceptionHandler.mm */; }; @@ -520,7 +520,6 @@ 1EFF03D717F20F8300A5F13C /* BITCrashManagerPrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BITCrashManagerPrivate.h; sourceTree = ""; }; 1EFF03E417F2485500A5F13C /* BITCrashManagerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BITCrashManagerTests.m; sourceTree = ""; }; 8077563F1BC6A44D0037C3DA /* HockeySDKEnums.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HockeySDKEnums.h; sourceTree = ""; }; - 808441611C20617200644A40 /* libOCMock.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libOCMock.a; path = HockeySDKTests/Vendor/libOCMock.a; sourceTree = SOURCE_ROOT; }; 808441621C20617200644A40 /* OCHamcrestIOS.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OCHamcrestIOS.framework; path = HockeySDKTests/Vendor/OCHamcrestIOS.framework; sourceTree = SOURCE_ROOT; }; 808441631C20617200644A40 /* OCMockitoIOS.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OCMockitoIOS.framework; path = HockeySDKTests/Vendor/OCMockitoIOS.framework; sourceTree = SOURCE_ROOT; }; 8084416B1C20617C00644A40 /* NSNotificationCenter+OCMAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSNotificationCenter+OCMAdditions.h"; sourceTree = ""; }; @@ -534,6 +533,7 @@ 808441731C20617C00644A40 /* OCMRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMRecorder.h; sourceTree = ""; }; 808441741C20617C00644A40 /* OCMStubRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMStubRecorder.h; sourceTree = ""; }; 80A4662D1C58F4DF00199909 /* BITCrashReportTextFormatterPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BITCrashReportTextFormatterPrivate.h; sourceTree = ""; }; + 80CA63881C67BD5400362DBF /* libOCMock.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libOCMock.a; sourceTree = ""; }; 846A901D1B20B0EB0076BB80 /* BITCrashCXXExceptionHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BITCrashCXXExceptionHandler.h; sourceTree = ""; }; 846A901E1B20B0EB0076BB80 /* BITCrashCXXExceptionHandler.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = BITCrashCXXExceptionHandler.mm; sourceTree = ""; }; 973EC8B518BCA8A200DBFFBB /* BITRectangleImageAnnotation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BITRectangleImageAnnotation.h; sourceTree = ""; }; @@ -613,8 +613,8 @@ 97CC11F71917AB7C0028768F /* QuickLook.framework in Frameworks */, 808441661C20617300644A40 /* OCHamcrestIOS.framework in Frameworks */, 1EA1170016F4D32C001C015C /* libHockeySDK.a in Frameworks */, - 808441641C20617200644A40 /* libOCMock.a in Frameworks */, 808441681C20617300644A40 /* OCMockitoIOS.framework in Frameworks */, + 80CA63891C67BD5400362DBF /* libOCMock.a in Frameworks */, 1EA1170116F4D354001C015C /* CrashReporter.framework in Frameworks */, 1E5A459516F0DFC200B55C04 /* Foundation.framework in Frameworks */, ); @@ -643,9 +643,9 @@ buildActionMask = 2147483647; files = ( 1EB617D51B0A36AE0035A986 /* Foundation.framework in Frameworks */, - 808441651C20617300644A40 /* libOCMock.a in Frameworks */, 808441671C20617300644A40 /* OCHamcrestIOS.framework in Frameworks */, 1EB6174A1B0A30480035A986 /* HockeySDK.framework in Frameworks */, + 80CA638A1C67BD5400362DBF /* libOCMock.a in Frameworks */, 1EB617CC1B0A34040035A986 /* CrashReporter.framework in Frameworks */, 808441691C20617300644A40 /* OCMockitoIOS.framework in Frameworks */, ); @@ -708,6 +708,7 @@ 1EFF03E417F2485500A5F13C /* BITCrashManagerTests.m */, 1E61CCAE18E0585A00A5E38E /* BITFeedbackManagerTests.m */, E40E0B0817DA19DC005E38C1 /* BITHockeyAppClientTests.m */, + 1E70A23517F31B82001BB32D /* BITHockeyHelperTests.m */, E4507E4217F0658F00171A0D /* BITKeychainUtilsTests.m */, 1E70A23517F31B82001BB32D /* BITHockeyHelperTests.m */, 1E566D061A275C4C0070F514 /* BITCrashReportTextFormatterTests.m */, @@ -920,9 +921,8 @@ 802326BB1C46AC1F00B6BF22 /* Frameworks */ = { isa = PBXGroup; children = ( - 8084416A1C20617C00644A40 /* OCMock */, - 808441611C20617200644A40 /* libOCMock.a */, 808441621C20617200644A40 /* OCHamcrestIOS.framework */, + 8084416A1C20617C00644A40 /* OCMock */, 808441631C20617200644A40 /* OCMockitoIOS.framework */, ); name = Frameworks; @@ -932,6 +932,7 @@ 8084416A1C20617C00644A40 /* OCMock */ = { isa = PBXGroup; children = ( + 80CA63881C67BD5400362DBF /* libOCMock.a */, 8084416B1C20617C00644A40 /* NSNotificationCenter+OCMAdditions.h */, 8084416C1C20617C00644A40 /* OCMArg.h */, 8084416D1C20617C00644A40 /* OCMConstraint.h */, @@ -1741,12 +1742,15 @@ ); GCC_PREFIX_HEADER = ""; GCC_WARN_UNINITIALIZED_AUTOS = YES; - HEADER_SEARCH_PATHS = "$(SRCROOT)/HockeySDKTests/Vendor"; + HEADER_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)/HockeySDKTests/Vendor/**", + ); INFOPLIST_FILE = "HockeySDKTests/HockeySDKTests-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 6.1; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/HockeySDKTests/Vendor", + "$(PROJECT_DIR)/HockeySDKTests/Vendor/**", ); ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( @@ -2037,12 +2041,15 @@ "$(inherited)", ); GCC_WARN_UNINITIALIZED_AUTOS = YES; - HEADER_SEARCH_PATHS = "$(SRCROOT)/HockeySDKTests/Vendor"; + HEADER_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)/HockeySDKTests/Vendor/**", + ); INFOPLIST_FILE = "HockeySDKTests/HockeySDKTests-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 6.1; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/HockeySDKTests/Vendor", + "$(PROJECT_DIR)/HockeySDKTests/Vendor/**", ); ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( @@ -2093,12 +2100,15 @@ ); GCC_PREFIX_HEADER = ""; GCC_WARN_UNINITIALIZED_AUTOS = YES; - HEADER_SEARCH_PATHS = "$(SRCROOT)/HockeySDKTests/Vendor"; + HEADER_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)/HockeySDKTests/Vendor/**", + ); INFOPLIST_FILE = "HockeySDKTests/HockeySDKTests-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 6.1; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/HockeySDKTests/Vendor", + "$(PROJECT_DIR)/HockeySDKTests/Vendor/**", ); ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( @@ -2236,12 +2246,15 @@ ); GCC_PREFIX_HEADER = ""; GCC_WARN_UNINITIALIZED_AUTOS = YES; - HEADER_SEARCH_PATHS = "$(SRCROOT)/HockeySDKTests/Vendor"; + HEADER_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)/HockeySDKTests/Vendor/**", + ); INFOPLIST_FILE = "HockeySDKTests/HockeySDKTests-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 6.1; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/HockeySDKTests/Vendor", + "$(PROJECT_DIR)/HockeySDKTests/Vendor/**", ); ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( diff --git a/Support/HockeySDKTests/Vendor/libOCMock.a b/Support/HockeySDKTests/Vendor/OCMock/libOCMock.a similarity index 100% rename from Support/HockeySDKTests/Vendor/libOCMock.a rename to Support/HockeySDKTests/Vendor/OCMock/libOCMock.a