From 032f0ed488c9de91a1f296dda3a4ac54c6d2dc43 Mon Sep 17 00:00:00 2001 From: Jens Nerup Date: Thu, 23 Jan 2025 20:43:40 +0100 Subject: [PATCH 1/4] Move Xcode project Moved the Xcode project file, the xcconfig files and info.plists to the Resource folder. The distribution scripts where also moved to the Resource folder and the Cartfile.project and Github actions where updated to reflect the changes as well. --- .github/workflows/build.yml | 2 +- Cartfile.project | 2 +- Package.swift | 10 ------ {Source => Resources}/MakeDistribution.sh | 0 {Source => Resources}/OCHamcrest-Info.plist | 0 .../OCHamcrest.xcodeproj/project.pbxproj | 14 +++++---- .../xcschemes/OCHamcrest.xcscheme | 31 +++++-------------- .../Resources => Resources}/Tests-Info.plist | 0 {Source => Resources}/XcodeTargets.xcconfig | 0 {Source => Resources}/XcodeWarnings.xcconfig | 0 {Source => Resources}/makeXCFramework.sh | 0 11 files changed, 17 insertions(+), 42 deletions(-) rename {Source => Resources}/MakeDistribution.sh (100%) rename {Source => Resources}/OCHamcrest-Info.plist (100%) rename {Source => Resources}/OCHamcrest.xcodeproj/project.pbxproj (99%) rename {Source => Resources}/OCHamcrest.xcodeproj/xcshareddata/xcschemes/OCHamcrest.xcscheme (72%) rename {Tests/OCHamcrestTests/Resources => Resources}/Tests-Info.plist (100%) rename {Source => Resources}/XcodeTargets.xcconfig (100%) rename {Source => Resources}/XcodeWarnings.xcconfig (100%) rename {Source => Resources}/makeXCFramework.sh (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 343d219a..4c6acfaa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ concurrency: cancel-in-progress: true env: - project: Source/OCHamcrest.xcodeproj + project: Resources/OCHamcrest.xcodeproj jobs: build: diff --git a/Cartfile.project b/Cartfile.project index 1737886b..2dd222a9 100644 --- a/Cartfile.project +++ b/Cartfile.project @@ -1,5 +1,5 @@ OCHamcrest: - project: Source/OCHamcrest.xcodeproj + project: Resources/OCHamcrest.xcodeproj sdks: - macosx - iphonesimulator diff --git a/Package.swift b/Package.swift index 7a9a89ba..ea1e6603 100644 --- a/Package.swift +++ b/Package.swift @@ -19,13 +19,6 @@ let package = Package( .target( name: "OCHamcrest", path: "Source", - exclude: [ - "MakeDistribution.sh", - "makeXCFramework.sh", - "OCHamcrest-Info.plist", - "XcodeTargets.xcconfig", - "XcodeWarnings.xcconfig", - ], publicHeadersPath: "include", cSettings: [ CSetting.headerSearchPath("./Core/Helpers"), @@ -38,9 +31,6 @@ let package = Package( dependencies: [ .target(name: "OCHamcrest") ], - exclude: [ - "Resources/Tests-Info.plist", - ], cSettings: [ .headerSearchPath("."), ] diff --git a/Source/MakeDistribution.sh b/Resources/MakeDistribution.sh similarity index 100% rename from Source/MakeDistribution.sh rename to Resources/MakeDistribution.sh diff --git a/Source/OCHamcrest-Info.plist b/Resources/OCHamcrest-Info.plist similarity index 100% rename from Source/OCHamcrest-Info.plist rename to Resources/OCHamcrest-Info.plist diff --git a/Source/OCHamcrest.xcodeproj/project.pbxproj b/Resources/OCHamcrest.xcodeproj/project.pbxproj similarity index 99% rename from Source/OCHamcrest.xcodeproj/project.pbxproj rename to Resources/OCHamcrest.xcodeproj/project.pbxproj index aef284b1..d8cf36e0 100644 --- a/Source/OCHamcrest.xcodeproj/project.pbxproj +++ b/Resources/OCHamcrest.xcodeproj/project.pbxproj @@ -281,7 +281,7 @@ 0876035E13440AD8001B439B /* HCStringEndsWithTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCStringEndsWithTests.m; sourceTree = ""; }; 0876035F13440AD8001B439B /* HCStringStartsWithTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCStringStartsWithTests.m; sourceTree = ""; }; 0876038D13440B80001B439B /* OCHamcrest-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "OCHamcrest-Info.plist"; sourceTree = ""; }; - 0876039113440BB0001B439B /* Tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Tests-Info.plist"; path = "../Tests/OCHamcrestTests/Resources/Tests-Info.plist"; sourceTree = ""; }; + 0876039113440BB0001B439B /* Tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Tests-Info.plist"; sourceTree = ""; }; 088FB0AA136A6DEA00C191E1 /* HCStringContainsInOrderTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCStringContainsInOrderTests.m; sourceTree = ""; }; 0E49BBDB1C47498C00418A3C /* XcodeWarnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = XcodeWarnings.xcconfig; sourceTree = ""; }; 0E5ECE6B1BC20C3300C15D2A /* HCIsCollectionContainingInRelativeOrder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HCIsCollectionContainingInRelativeOrder.h; sourceTree = ""; }; @@ -372,7 +372,7 @@ BB333522A78D6A7D1A8414B3 /* HCIsIn.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCIsIn.m; sourceTree = ""; }; BB333528C8E2ED8489ACB161 /* HCTestFailureReporter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCTestFailureReporter.m; sourceTree = ""; }; BB33355AD08369793188986F /* HCObjectReturnGetter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCObjectReturnGetter.m; sourceTree = ""; }; - BB33356A6185FA4F1B6E240F /* OCHamcrest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCHamcrest.h; sourceTree = ""; }; + BB33356A6185FA4F1B6E240F /* OCHamcrest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OCHamcrest.h; path = ../Source/OCHamcrest.h; sourceTree = ""; }; BB33359133039118AE88E2A8 /* HCIsNil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HCIsNil.h; sourceTree = ""; }; BB333594FB0AC2DAC3B73077 /* HCIsSame.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCIsSame.m; sourceTree = ""; }; BB3335974ADA5C5408FE0F69 /* HCStringEndsWith.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCStringEndsWith.m; sourceTree = ""; }; @@ -715,7 +715,8 @@ BB333D43717AD7243D63A4AB /* HCStringDescription.m */, BB33378F4CD8AE4C7EFC1CF0 /* Helpers */, ); - path = Core; + name = Core; + path = ../Source/Core; sourceTree = ""; }; BB33378F4CD8AE4C7EFC1CF0 /* Helpers */ = { @@ -831,7 +832,8 @@ BB333072EBF64C385754421B /* Object */, BB333EA5543B2EAB4E34B3CF /* Text */, ); - path = Library; + name = Library; + path = ../Source/Library; sourceTree = ""; }; BB333EA5543B2EAB4E34B3CF /* Text */ = { @@ -1336,7 +1338,7 @@ baseConfigurationReference = 0E49BBDB1C47498C00418A3C /* XcodeWarnings.xcconfig */; buildSettings = { FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; - INFOPLIST_FILE = "$(SRCROOT)/../Tests/OCHamcrestTests/Resources/Tests-Info.plist"; + INFOPLIST_FILE = "Tests-Info.plist"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; }; @@ -1347,7 +1349,7 @@ baseConfigurationReference = 0E49BBDB1C47498C00418A3C /* XcodeWarnings.xcconfig */; buildSettings = { FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; - INFOPLIST_FILE = "$(SRCROOT)/../Tests/OCHamcrestTests/Resources/Tests-Info.plist"; + INFOPLIST_FILE = "Tests-Info.plist"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; }; diff --git a/Source/OCHamcrest.xcodeproj/xcshareddata/xcschemes/OCHamcrest.xcscheme b/Resources/OCHamcrest.xcodeproj/xcshareddata/xcschemes/OCHamcrest.xcscheme similarity index 72% rename from Source/OCHamcrest.xcodeproj/xcshareddata/xcschemes/OCHamcrest.xcscheme rename to Resources/OCHamcrest.xcodeproj/xcshareddata/xcschemes/OCHamcrest.xcscheme index b6f993f5..956455d2 100644 --- a/Source/OCHamcrest.xcodeproj/xcshareddata/xcschemes/OCHamcrest.xcscheme +++ b/Resources/OCHamcrest.xcodeproj/xcshareddata/xcschemes/OCHamcrest.xcscheme @@ -1,10 +1,11 @@ + LastUpgradeVersion = "1600" + version = "1.7"> + buildImplicitDependencies = "YES" + buildArchitectures = "Automatic"> - - - - + shouldAutocreateTestPlan = "YES"> @@ -60,15 +52,6 @@ debugDocumentVersioning = "YES" debugServiceExtension = "internal" allowLocationSimulation = "YES"> - - - - Date: Thu, 23 Jan 2025 20:55:53 +0100 Subject: [PATCH 2/4] Move content of Source Moved all source code from the Source folder to Sources/OCHamcrest. Updated Package.swift and Xcode to reflect the folder change. --- OCHamcrest.podspec | 4 ++-- Package.swift | 8 +++----- Resources/OCHamcrest.xcodeproj/project.pbxproj | 6 +++--- {Source => Sources/OCHamcrest}/Core/HCAssertThat.h | 0 {Source => Sources/OCHamcrest}/Core/HCAssertThat.m | 0 {Source => Sources/OCHamcrest}/Core/HCBaseDescription.h | 0 {Source => Sources/OCHamcrest}/Core/HCBaseDescription.m | 0 {Source => Sources/OCHamcrest}/Core/HCBaseMatcher.h | 0 {Source => Sources/OCHamcrest}/Core/HCBaseMatcher.m | 0 {Source => Sources/OCHamcrest}/Core/HCDescription.h | 0 {Source => Sources/OCHamcrest}/Core/HCDiagnosingMatcher.h | 0 {Source => Sources/OCHamcrest}/Core/HCDiagnosingMatcher.m | 0 {Source => Sources/OCHamcrest}/Core/HCMatcher.h | 0 {Source => Sources/OCHamcrest}/Core/HCSelfDescribing.h | 0 {Source => Sources/OCHamcrest}/Core/HCStringDescription.h | 0 {Source => Sources/OCHamcrest}/Core/HCStringDescription.m | 0 {Source => Sources/OCHamcrest}/Core/Helpers/HCCollect.h | 0 {Source => Sources/OCHamcrest}/Core/Helpers/HCCollect.m | 0 .../OCHamcrest}/Core/Helpers/HCInvocationMatcher.h | 0 .../OCHamcrest}/Core/Helpers/HCInvocationMatcher.m | 0 .../OCHamcrest}/Core/Helpers/HCRequireNonNilObject.h | 0 .../OCHamcrest}/Core/Helpers/HCRequireNonNilObject.m | 0 .../OCHamcrest}/Core/Helpers/HCRunloopRunner.h | 0 .../OCHamcrest}/Core/Helpers/HCRunloopRunner.m | 0 .../OCHamcrest}/Core/Helpers/HCWrapInMatcher.h | 0 .../OCHamcrest}/Core/Helpers/HCWrapInMatcher.m | 0 .../OCHamcrest}/Core/Helpers/NSInvocation+OCHamcrest.h | 0 .../OCHamcrest}/Core/Helpers/NSInvocation+OCHamcrest.m | 0 .../Core/Helpers/ReturnValueGetters/HCBoolReturnGetter.h | 0 .../Core/Helpers/ReturnValueGetters/HCBoolReturnGetter.m | 0 .../Core/Helpers/ReturnValueGetters/HCCharReturnGetter.h | 0 .../Core/Helpers/ReturnValueGetters/HCCharReturnGetter.m | 0 .../Helpers/ReturnValueGetters/HCDoubleReturnGetter.h | 0 .../Helpers/ReturnValueGetters/HCDoubleReturnGetter.m | 0 .../Core/Helpers/ReturnValueGetters/HCFloatReturnGetter.h | 0 .../Core/Helpers/ReturnValueGetters/HCFloatReturnGetter.m | 0 .../Core/Helpers/ReturnValueGetters/HCIntReturnGetter.h | 0 .../Core/Helpers/ReturnValueGetters/HCIntReturnGetter.m | 0 .../Helpers/ReturnValueGetters/HCLongLongReturnGetter.h | 0 .../Helpers/ReturnValueGetters/HCLongLongReturnGetter.m | 0 .../Core/Helpers/ReturnValueGetters/HCLongReturnGetter.h | 0 .../Core/Helpers/ReturnValueGetters/HCLongReturnGetter.m | 0 .../Helpers/ReturnValueGetters/HCObjectReturnGetter.h | 0 .../Helpers/ReturnValueGetters/HCObjectReturnGetter.m | 0 .../Helpers/ReturnValueGetters/HCReturnTypeHandlerChain.h | 0 .../Helpers/ReturnValueGetters/HCReturnTypeHandlerChain.m | 0 .../Core/Helpers/ReturnValueGetters/HCReturnValueGetter.h | 0 .../Core/Helpers/ReturnValueGetters/HCReturnValueGetter.m | 0 .../Core/Helpers/ReturnValueGetters/HCShortReturnGetter.h | 0 .../Core/Helpers/ReturnValueGetters/HCShortReturnGetter.m | 0 .../ReturnValueGetters/HCUnsignedCharReturnGetter.h | 0 .../ReturnValueGetters/HCUnsignedCharReturnGetter.m | 0 .../ReturnValueGetters/HCUnsignedIntReturnGetter.h | 0 .../ReturnValueGetters/HCUnsignedIntReturnGetter.m | 0 .../ReturnValueGetters/HCUnsignedLongLongReturnGetter.h | 0 .../ReturnValueGetters/HCUnsignedLongLongReturnGetter.m | 0 .../ReturnValueGetters/HCUnsignedLongReturnGetter.h | 0 .../ReturnValueGetters/HCUnsignedLongReturnGetter.m | 0 .../ReturnValueGetters/HCUnsignedShortReturnGetter.h | 0 .../ReturnValueGetters/HCUnsignedShortReturnGetter.m | 0 .../TestFailureReporters/HCGenericTestFailureReporter.h | 0 .../TestFailureReporters/HCGenericTestFailureReporter.m | 0 .../TestFailureReporters/HCSenTestFailureReporter.h | 0 .../TestFailureReporters/HCSenTestFailureReporter.m | 0 .../Core/Helpers/TestFailureReporters/HCTestFailure.h | 0 .../Core/Helpers/TestFailureReporters/HCTestFailure.m | 0 .../Helpers/TestFailureReporters/HCTestFailureReporter.h | 0 .../Helpers/TestFailureReporters/HCTestFailureReporter.m | 0 .../TestFailureReporters/HCTestFailureReporterChain.h | 0 .../TestFailureReporters/HCTestFailureReporterChain.m | 0 .../TestFailureReporters/HCXCTestFailureReporter.h | 0 .../TestFailureReporters/HCXCTestFailureReporter.m | 0 .../TestFailureReporters/HCXCTestIssueFailureReporter.h | 0 .../TestFailureReporters/HCXCTestIssueFailureReporter.m | 0 .../OCHamcrest}/Library/Collection/HCEvery.h | 0 .../OCHamcrest}/Library/Collection/HCEvery.m | 0 .../OCHamcrest}/Library/Collection/HCHasCount.h | 0 .../OCHamcrest}/Library/Collection/HCHasCount.m | 0 .../Library/Collection/HCIsCollectionContaining.h | 0 .../Library/Collection/HCIsCollectionContaining.m | 0 .../Collection/HCIsCollectionContainingInAnyOrder.h | 0 .../Collection/HCIsCollectionContainingInAnyOrder.m | 0 .../Library/Collection/HCIsCollectionContainingInOrder.h | 0 .../Library/Collection/HCIsCollectionContainingInOrder.m | 0 .../Collection/HCIsCollectionContainingInRelativeOrder.h | 0 .../Collection/HCIsCollectionContainingInRelativeOrder.m | 0 .../Library/Collection/HCIsCollectionOnlyContaining.h | 0 .../Library/Collection/HCIsCollectionOnlyContaining.m | 0 .../Library/Collection/HCIsDictionaryContaining.h | 0 .../Library/Collection/HCIsDictionaryContaining.m | 0 .../Library/Collection/HCIsDictionaryContainingEntries.h | 0 .../Library/Collection/HCIsDictionaryContainingEntries.m | 0 .../Library/Collection/HCIsDictionaryContainingKey.h | 0 .../Library/Collection/HCIsDictionaryContainingKey.m | 0 .../Library/Collection/HCIsDictionaryContainingValue.h | 0 .../Library/Collection/HCIsDictionaryContainingValue.m | 0 .../OCHamcrest}/Library/Collection/HCIsEmptyCollection.h | 0 .../OCHamcrest}/Library/Collection/HCIsEmptyCollection.m | 0 .../OCHamcrest}/Library/Collection/HCIsIn.h | 0 .../OCHamcrest}/Library/Collection/HCIsIn.m | 0 .../OCHamcrest}/Library/Decorator/HCDescribedAs.h | 0 .../OCHamcrest}/Library/Decorator/HCDescribedAs.m | 0 {Source => Sources/OCHamcrest}/Library/Decorator/HCIs.h | 0 {Source => Sources/OCHamcrest}/Library/Decorator/HCIs.m | 0 {Source => Sources/OCHamcrest}/Library/Logical/HCAllOf.h | 0 {Source => Sources/OCHamcrest}/Library/Logical/HCAllOf.m | 0 {Source => Sources/OCHamcrest}/Library/Logical/HCAnyOf.h | 0 {Source => Sources/OCHamcrest}/Library/Logical/HCAnyOf.m | 0 .../OCHamcrest}/Library/Logical/HCIsAnything.h | 0 .../OCHamcrest}/Library/Logical/HCIsAnything.m | 0 {Source => Sources/OCHamcrest}/Library/Logical/HCIsNot.h | 0 {Source => Sources/OCHamcrest}/Library/Logical/HCIsNot.m | 0 .../OCHamcrest}/Library/Number/HCIsCloseTo.h | 0 .../OCHamcrest}/Library/Number/HCIsCloseTo.m | 0 .../OCHamcrest}/Library/Number/HCIsEqualToNumber.h | 0 .../OCHamcrest}/Library/Number/HCIsEqualToNumber.m | 0 .../OCHamcrest}/Library/Number/HCIsTrueFalse.h | 0 .../OCHamcrest}/Library/Number/HCIsTrueFalse.m | 0 .../OCHamcrest}/Library/Number/HCNumberAssert.h | 0 .../OCHamcrest}/Library/Number/HCNumberAssert.m | 0 .../OCHamcrest}/Library/Number/HCOrderingComparison.h | 0 .../OCHamcrest}/Library/Number/HCOrderingComparison.m | 0 .../OCHamcrest}/Library/Object/HCArgumentCaptor.h | 0 .../OCHamcrest}/Library/Object/HCArgumentCaptor.m | 0 .../OCHamcrest}/Library/Object/HCClassMatcher.h | 0 .../OCHamcrest}/Library/Object/HCClassMatcher.m | 0 .../OCHamcrest}/Library/Object/HCConformsToProtocol.h | 0 .../OCHamcrest}/Library/Object/HCConformsToProtocol.m | 0 .../OCHamcrest}/Library/Object/HCHasDescription.h | 0 .../OCHamcrest}/Library/Object/HCHasDescription.m | 0 .../OCHamcrest}/Library/Object/HCHasProperty.h | 0 .../OCHamcrest}/Library/Object/HCHasProperty.m | 0 {Source => Sources/OCHamcrest}/Library/Object/HCIsEqual.h | 0 {Source => Sources/OCHamcrest}/Library/Object/HCIsEqual.m | 0 .../OCHamcrest}/Library/Object/HCIsInstanceOf.h | 0 .../OCHamcrest}/Library/Object/HCIsInstanceOf.m | 0 {Source => Sources/OCHamcrest}/Library/Object/HCIsNil.h | 0 {Source => Sources/OCHamcrest}/Library/Object/HCIsNil.m | 0 {Source => Sources/OCHamcrest}/Library/Object/HCIsSame.h | 0 {Source => Sources/OCHamcrest}/Library/Object/HCIsSame.m | 0 .../OCHamcrest}/Library/Object/HCIsTypeOf.h | 0 .../OCHamcrest}/Library/Object/HCIsTypeOf.m | 0 .../OCHamcrest}/Library/Object/HCThrowsException.h | 0 .../OCHamcrest}/Library/Object/HCThrowsException.m | 0 .../Library/Text/HCIsEqualCompressingWhiteSpace.h | 0 .../Library/Text/HCIsEqualCompressingWhiteSpace.m | 0 .../OCHamcrest}/Library/Text/HCIsEqualIgnoringCase.h | 0 .../OCHamcrest}/Library/Text/HCIsEqualIgnoringCase.m | 0 .../OCHamcrest}/Library/Text/HCStringContains.h | 0 .../OCHamcrest}/Library/Text/HCStringContains.m | 0 .../OCHamcrest}/Library/Text/HCStringContainsInOrder.h | 0 .../OCHamcrest}/Library/Text/HCStringContainsInOrder.m | 0 .../OCHamcrest}/Library/Text/HCStringEndsWith.h | 0 .../OCHamcrest}/Library/Text/HCStringEndsWith.m | 0 .../OCHamcrest}/Library/Text/HCStringStartsWith.h | 0 .../OCHamcrest}/Library/Text/HCStringStartsWith.m | 0 .../OCHamcrest}/Library/Text/HCSubstringMatcher.h | 0 .../OCHamcrest}/Library/Text/HCSubstringMatcher.m | 0 {Source => Sources/OCHamcrest}/OCHamcrest.h | 0 .../OCHamcrest}/include/OCHamcrest/HCAllOf.h | 0 .../OCHamcrest}/include/OCHamcrest/HCAnyOf.h | 0 .../OCHamcrest}/include/OCHamcrest/HCArgumentCaptor.h | 0 .../OCHamcrest}/include/OCHamcrest/HCAssertThat.h | 0 .../OCHamcrest}/include/OCHamcrest/HCBaseDescription.h | 0 .../OCHamcrest}/include/OCHamcrest/HCBaseMatcher.h | 0 .../OCHamcrest}/include/OCHamcrest/HCClassMatcher.h | 0 .../OCHamcrest}/include/OCHamcrest/HCCollect.h | 0 .../OCHamcrest}/include/OCHamcrest/HCConformsToProtocol.h | 0 .../OCHamcrest}/include/OCHamcrest/HCDescribedAs.h | 0 .../OCHamcrest}/include/OCHamcrest/HCDescription.h | 0 .../OCHamcrest}/include/OCHamcrest/HCDiagnosingMatcher.h | 0 .../OCHamcrest}/include/OCHamcrest/HCEvery.h | 0 .../OCHamcrest}/include/OCHamcrest/HCHasCount.h | 0 .../OCHamcrest}/include/OCHamcrest/HCHasDescription.h | 0 .../OCHamcrest}/include/OCHamcrest/HCHasProperty.h | 0 .../OCHamcrest}/include/OCHamcrest/HCInvocationMatcher.h | 0 {Source => Sources/OCHamcrest}/include/OCHamcrest/HCIs.h | 0 .../OCHamcrest}/include/OCHamcrest/HCIsAnything.h | 0 .../OCHamcrest}/include/OCHamcrest/HCIsCloseTo.h | 0 .../include/OCHamcrest/HCIsCollectionContaining.h | 0 .../OCHamcrest/HCIsCollectionContainingInAnyOrder.h | 0 .../include/OCHamcrest/HCIsCollectionContainingInOrder.h | 0 .../OCHamcrest/HCIsCollectionContainingInRelativeOrder.h | 0 .../include/OCHamcrest/HCIsCollectionOnlyContaining.h | 0 .../include/OCHamcrest/HCIsDictionaryContaining.h | 0 .../include/OCHamcrest/HCIsDictionaryContainingEntries.h | 0 .../include/OCHamcrest/HCIsDictionaryContainingKey.h | 0 .../include/OCHamcrest/HCIsDictionaryContainingValue.h | 0 .../OCHamcrest}/include/OCHamcrest/HCIsEmptyCollection.h | 0 .../OCHamcrest}/include/OCHamcrest/HCIsEqual.h | 0 .../include/OCHamcrest/HCIsEqualCompressingWhiteSpace.h | 0 .../include/OCHamcrest/HCIsEqualIgnoringCase.h | 0 .../OCHamcrest}/include/OCHamcrest/HCIsEqualToNumber.h | 0 .../OCHamcrest}/include/OCHamcrest/HCIsIn.h | 0 .../OCHamcrest}/include/OCHamcrest/HCIsInstanceOf.h | 0 .../OCHamcrest}/include/OCHamcrest/HCIsNil.h | 0 .../OCHamcrest}/include/OCHamcrest/HCIsNot.h | 0 .../OCHamcrest}/include/OCHamcrest/HCIsSame.h | 0 .../OCHamcrest}/include/OCHamcrest/HCIsTrueFalse.h | 0 .../OCHamcrest}/include/OCHamcrest/HCIsTypeOf.h | 0 .../OCHamcrest}/include/OCHamcrest/HCMatcher.h | 0 .../OCHamcrest}/include/OCHamcrest/HCNumberAssert.h | 0 .../OCHamcrest}/include/OCHamcrest/HCOrderingComparison.h | 0 .../include/OCHamcrest/HCRequireNonNilObject.h | 0 .../OCHamcrest}/include/OCHamcrest/HCSelfDescribing.h | 0 .../OCHamcrest}/include/OCHamcrest/HCStringContains.h | 0 .../include/OCHamcrest/HCStringContainsInOrder.h | 0 .../OCHamcrest}/include/OCHamcrest/HCStringDescription.h | 0 .../OCHamcrest}/include/OCHamcrest/HCStringEndsWith.h | 0 .../OCHamcrest}/include/OCHamcrest/HCStringStartsWith.h | 0 .../OCHamcrest}/include/OCHamcrest/HCSubstringMatcher.h | 0 .../OCHamcrest}/include/OCHamcrest/HCTestFailure.h | 0 .../include/OCHamcrest/HCTestFailureReporter.h | 0 .../include/OCHamcrest/HCTestFailureReporterChain.h | 0 .../OCHamcrest}/include/OCHamcrest/HCThrowsException.h | 0 .../OCHamcrest}/include/OCHamcrest/HCWrapInMatcher.h | 0 .../OCHamcrest}/include/OCHamcrest/OCHamcrest.h | 0 217 files changed, 8 insertions(+), 10 deletions(-) rename {Source => Sources/OCHamcrest}/Core/HCAssertThat.h (100%) rename {Source => Sources/OCHamcrest}/Core/HCAssertThat.m (100%) rename {Source => Sources/OCHamcrest}/Core/HCBaseDescription.h (100%) rename {Source => Sources/OCHamcrest}/Core/HCBaseDescription.m (100%) rename {Source => Sources/OCHamcrest}/Core/HCBaseMatcher.h (100%) rename {Source => Sources/OCHamcrest}/Core/HCBaseMatcher.m (100%) rename {Source => Sources/OCHamcrest}/Core/HCDescription.h (100%) rename {Source => Sources/OCHamcrest}/Core/HCDiagnosingMatcher.h (100%) rename {Source => Sources/OCHamcrest}/Core/HCDiagnosingMatcher.m (100%) rename {Source => Sources/OCHamcrest}/Core/HCMatcher.h (100%) rename {Source => Sources/OCHamcrest}/Core/HCSelfDescribing.h (100%) rename {Source => Sources/OCHamcrest}/Core/HCStringDescription.h (100%) rename {Source => Sources/OCHamcrest}/Core/HCStringDescription.m (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/HCCollect.h (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/HCCollect.m (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/HCInvocationMatcher.h (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/HCInvocationMatcher.m (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/HCRequireNonNilObject.h (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/HCRequireNonNilObject.m (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/HCRunloopRunner.h (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/HCRunloopRunner.m (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/HCWrapInMatcher.h (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/HCWrapInMatcher.m (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/NSInvocation+OCHamcrest.h (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/NSInvocation+OCHamcrest.m (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/ReturnValueGetters/HCBoolReturnGetter.h (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/ReturnValueGetters/HCBoolReturnGetter.m (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/ReturnValueGetters/HCCharReturnGetter.h (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/ReturnValueGetters/HCCharReturnGetter.m (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/ReturnValueGetters/HCDoubleReturnGetter.h (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/ReturnValueGetters/HCDoubleReturnGetter.m (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/ReturnValueGetters/HCFloatReturnGetter.h (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/ReturnValueGetters/HCFloatReturnGetter.m (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/ReturnValueGetters/HCIntReturnGetter.h (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/ReturnValueGetters/HCIntReturnGetter.m (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/ReturnValueGetters/HCLongLongReturnGetter.h (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/ReturnValueGetters/HCLongLongReturnGetter.m (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/ReturnValueGetters/HCLongReturnGetter.h (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/ReturnValueGetters/HCLongReturnGetter.m (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/ReturnValueGetters/HCObjectReturnGetter.h (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/ReturnValueGetters/HCObjectReturnGetter.m (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/ReturnValueGetters/HCReturnTypeHandlerChain.h (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/ReturnValueGetters/HCReturnTypeHandlerChain.m (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/ReturnValueGetters/HCReturnValueGetter.h (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/ReturnValueGetters/HCReturnValueGetter.m (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/ReturnValueGetters/HCShortReturnGetter.h (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/ReturnValueGetters/HCShortReturnGetter.m (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/ReturnValueGetters/HCUnsignedCharReturnGetter.h (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/ReturnValueGetters/HCUnsignedCharReturnGetter.m (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/ReturnValueGetters/HCUnsignedIntReturnGetter.h (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/ReturnValueGetters/HCUnsignedIntReturnGetter.m (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/ReturnValueGetters/HCUnsignedLongLongReturnGetter.h (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/ReturnValueGetters/HCUnsignedLongLongReturnGetter.m (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/ReturnValueGetters/HCUnsignedLongReturnGetter.h (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/ReturnValueGetters/HCUnsignedLongReturnGetter.m (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/ReturnValueGetters/HCUnsignedShortReturnGetter.h (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/ReturnValueGetters/HCUnsignedShortReturnGetter.m (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/TestFailureReporters/HCGenericTestFailureReporter.h (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/TestFailureReporters/HCGenericTestFailureReporter.m (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/TestFailureReporters/HCSenTestFailureReporter.h (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/TestFailureReporters/HCSenTestFailureReporter.m (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/TestFailureReporters/HCTestFailure.h (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/TestFailureReporters/HCTestFailure.m (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/TestFailureReporters/HCTestFailureReporter.h (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/TestFailureReporters/HCTestFailureReporter.m (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/TestFailureReporters/HCTestFailureReporterChain.h (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/TestFailureReporters/HCTestFailureReporterChain.m (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/TestFailureReporters/HCXCTestFailureReporter.h (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/TestFailureReporters/HCXCTestFailureReporter.m (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/TestFailureReporters/HCXCTestIssueFailureReporter.h (100%) rename {Source => Sources/OCHamcrest}/Core/Helpers/TestFailureReporters/HCXCTestIssueFailureReporter.m (100%) rename {Source => Sources/OCHamcrest}/Library/Collection/HCEvery.h (100%) rename {Source => Sources/OCHamcrest}/Library/Collection/HCEvery.m (100%) rename {Source => Sources/OCHamcrest}/Library/Collection/HCHasCount.h (100%) rename {Source => Sources/OCHamcrest}/Library/Collection/HCHasCount.m (100%) rename {Source => Sources/OCHamcrest}/Library/Collection/HCIsCollectionContaining.h (100%) rename {Source => Sources/OCHamcrest}/Library/Collection/HCIsCollectionContaining.m (100%) rename {Source => Sources/OCHamcrest}/Library/Collection/HCIsCollectionContainingInAnyOrder.h (100%) rename {Source => Sources/OCHamcrest}/Library/Collection/HCIsCollectionContainingInAnyOrder.m (100%) rename {Source => Sources/OCHamcrest}/Library/Collection/HCIsCollectionContainingInOrder.h (100%) rename {Source => Sources/OCHamcrest}/Library/Collection/HCIsCollectionContainingInOrder.m (100%) rename {Source => Sources/OCHamcrest}/Library/Collection/HCIsCollectionContainingInRelativeOrder.h (100%) rename {Source => Sources/OCHamcrest}/Library/Collection/HCIsCollectionContainingInRelativeOrder.m (100%) rename {Source => Sources/OCHamcrest}/Library/Collection/HCIsCollectionOnlyContaining.h (100%) rename {Source => Sources/OCHamcrest}/Library/Collection/HCIsCollectionOnlyContaining.m (100%) rename {Source => Sources/OCHamcrest}/Library/Collection/HCIsDictionaryContaining.h (100%) rename {Source => Sources/OCHamcrest}/Library/Collection/HCIsDictionaryContaining.m (100%) rename {Source => Sources/OCHamcrest}/Library/Collection/HCIsDictionaryContainingEntries.h (100%) rename {Source => Sources/OCHamcrest}/Library/Collection/HCIsDictionaryContainingEntries.m (100%) rename {Source => Sources/OCHamcrest}/Library/Collection/HCIsDictionaryContainingKey.h (100%) rename {Source => Sources/OCHamcrest}/Library/Collection/HCIsDictionaryContainingKey.m (100%) rename {Source => Sources/OCHamcrest}/Library/Collection/HCIsDictionaryContainingValue.h (100%) rename {Source => Sources/OCHamcrest}/Library/Collection/HCIsDictionaryContainingValue.m (100%) rename {Source => Sources/OCHamcrest}/Library/Collection/HCIsEmptyCollection.h (100%) rename {Source => Sources/OCHamcrest}/Library/Collection/HCIsEmptyCollection.m (100%) rename {Source => Sources/OCHamcrest}/Library/Collection/HCIsIn.h (100%) rename {Source => Sources/OCHamcrest}/Library/Collection/HCIsIn.m (100%) rename {Source => Sources/OCHamcrest}/Library/Decorator/HCDescribedAs.h (100%) rename {Source => Sources/OCHamcrest}/Library/Decorator/HCDescribedAs.m (100%) rename {Source => Sources/OCHamcrest}/Library/Decorator/HCIs.h (100%) rename {Source => Sources/OCHamcrest}/Library/Decorator/HCIs.m (100%) rename {Source => Sources/OCHamcrest}/Library/Logical/HCAllOf.h (100%) rename {Source => Sources/OCHamcrest}/Library/Logical/HCAllOf.m (100%) rename {Source => Sources/OCHamcrest}/Library/Logical/HCAnyOf.h (100%) rename {Source => Sources/OCHamcrest}/Library/Logical/HCAnyOf.m (100%) rename {Source => Sources/OCHamcrest}/Library/Logical/HCIsAnything.h (100%) rename {Source => Sources/OCHamcrest}/Library/Logical/HCIsAnything.m (100%) rename {Source => Sources/OCHamcrest}/Library/Logical/HCIsNot.h (100%) rename {Source => Sources/OCHamcrest}/Library/Logical/HCIsNot.m (100%) rename {Source => Sources/OCHamcrest}/Library/Number/HCIsCloseTo.h (100%) rename {Source => Sources/OCHamcrest}/Library/Number/HCIsCloseTo.m (100%) rename {Source => Sources/OCHamcrest}/Library/Number/HCIsEqualToNumber.h (100%) rename {Source => Sources/OCHamcrest}/Library/Number/HCIsEqualToNumber.m (100%) rename {Source => Sources/OCHamcrest}/Library/Number/HCIsTrueFalse.h (100%) rename {Source => Sources/OCHamcrest}/Library/Number/HCIsTrueFalse.m (100%) rename {Source => Sources/OCHamcrest}/Library/Number/HCNumberAssert.h (100%) rename {Source => Sources/OCHamcrest}/Library/Number/HCNumberAssert.m (100%) rename {Source => Sources/OCHamcrest}/Library/Number/HCOrderingComparison.h (100%) rename {Source => Sources/OCHamcrest}/Library/Number/HCOrderingComparison.m (100%) rename {Source => Sources/OCHamcrest}/Library/Object/HCArgumentCaptor.h (100%) rename {Source => Sources/OCHamcrest}/Library/Object/HCArgumentCaptor.m (100%) rename {Source => Sources/OCHamcrest}/Library/Object/HCClassMatcher.h (100%) rename {Source => Sources/OCHamcrest}/Library/Object/HCClassMatcher.m (100%) rename {Source => Sources/OCHamcrest}/Library/Object/HCConformsToProtocol.h (100%) rename {Source => Sources/OCHamcrest}/Library/Object/HCConformsToProtocol.m (100%) rename {Source => Sources/OCHamcrest}/Library/Object/HCHasDescription.h (100%) rename {Source => Sources/OCHamcrest}/Library/Object/HCHasDescription.m (100%) rename {Source => Sources/OCHamcrest}/Library/Object/HCHasProperty.h (100%) rename {Source => Sources/OCHamcrest}/Library/Object/HCHasProperty.m (100%) rename {Source => Sources/OCHamcrest}/Library/Object/HCIsEqual.h (100%) rename {Source => Sources/OCHamcrest}/Library/Object/HCIsEqual.m (100%) rename {Source => Sources/OCHamcrest}/Library/Object/HCIsInstanceOf.h (100%) rename {Source => Sources/OCHamcrest}/Library/Object/HCIsInstanceOf.m (100%) rename {Source => Sources/OCHamcrest}/Library/Object/HCIsNil.h (100%) rename {Source => Sources/OCHamcrest}/Library/Object/HCIsNil.m (100%) rename {Source => Sources/OCHamcrest}/Library/Object/HCIsSame.h (100%) rename {Source => Sources/OCHamcrest}/Library/Object/HCIsSame.m (100%) rename {Source => Sources/OCHamcrest}/Library/Object/HCIsTypeOf.h (100%) rename {Source => Sources/OCHamcrest}/Library/Object/HCIsTypeOf.m (100%) rename {Source => Sources/OCHamcrest}/Library/Object/HCThrowsException.h (100%) rename {Source => Sources/OCHamcrest}/Library/Object/HCThrowsException.m (100%) rename {Source => Sources/OCHamcrest}/Library/Text/HCIsEqualCompressingWhiteSpace.h (100%) rename {Source => Sources/OCHamcrest}/Library/Text/HCIsEqualCompressingWhiteSpace.m (100%) rename {Source => Sources/OCHamcrest}/Library/Text/HCIsEqualIgnoringCase.h (100%) rename {Source => Sources/OCHamcrest}/Library/Text/HCIsEqualIgnoringCase.m (100%) rename {Source => Sources/OCHamcrest}/Library/Text/HCStringContains.h (100%) rename {Source => Sources/OCHamcrest}/Library/Text/HCStringContains.m (100%) rename {Source => Sources/OCHamcrest}/Library/Text/HCStringContainsInOrder.h (100%) rename {Source => Sources/OCHamcrest}/Library/Text/HCStringContainsInOrder.m (100%) rename {Source => Sources/OCHamcrest}/Library/Text/HCStringEndsWith.h (100%) rename {Source => Sources/OCHamcrest}/Library/Text/HCStringEndsWith.m (100%) rename {Source => Sources/OCHamcrest}/Library/Text/HCStringStartsWith.h (100%) rename {Source => Sources/OCHamcrest}/Library/Text/HCStringStartsWith.m (100%) rename {Source => Sources/OCHamcrest}/Library/Text/HCSubstringMatcher.h (100%) rename {Source => Sources/OCHamcrest}/Library/Text/HCSubstringMatcher.m (100%) rename {Source => Sources/OCHamcrest}/OCHamcrest.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCAllOf.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCAnyOf.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCArgumentCaptor.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCAssertThat.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCBaseDescription.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCBaseMatcher.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCClassMatcher.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCCollect.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCConformsToProtocol.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCDescribedAs.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCDescription.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCDiagnosingMatcher.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCEvery.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCHasCount.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCHasDescription.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCHasProperty.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCInvocationMatcher.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCIs.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCIsAnything.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCIsCloseTo.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCIsCollectionContaining.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCIsCollectionContainingInAnyOrder.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCIsCollectionContainingInOrder.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCIsCollectionContainingInRelativeOrder.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCIsCollectionOnlyContaining.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCIsDictionaryContaining.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCIsDictionaryContainingEntries.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCIsDictionaryContainingKey.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCIsDictionaryContainingValue.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCIsEmptyCollection.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCIsEqual.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCIsEqualCompressingWhiteSpace.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCIsEqualIgnoringCase.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCIsEqualToNumber.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCIsIn.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCIsInstanceOf.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCIsNil.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCIsNot.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCIsSame.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCIsTrueFalse.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCIsTypeOf.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCMatcher.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCNumberAssert.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCOrderingComparison.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCRequireNonNilObject.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCSelfDescribing.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCStringContains.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCStringContainsInOrder.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCStringDescription.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCStringEndsWith.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCStringStartsWith.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCSubstringMatcher.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCTestFailure.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCTestFailureReporter.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCTestFailureReporterChain.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCThrowsException.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/HCWrapInMatcher.h (100%) rename {Source => Sources/OCHamcrest}/include/OCHamcrest/OCHamcrest.h (100%) diff --git a/OCHamcrest.podspec b/OCHamcrest.podspec index b2bb1c08..8398fc14 100644 --- a/OCHamcrest.podspec +++ b/OCHamcrest.podspec @@ -35,7 +35,7 @@ Pod::Spec.new do |s| s.watchos.deployment_target = '4.0' s.visionos.deployment_target = '1.0' s.source = { :git => 'https://github.com/hamcrest/OCHamcrest.git', :tag => 'v9.0.3' } - s.source_files = 'Source/OCHamcrest.h', 'Source/Core/**/*.{h,m}', 'Source/Library/**/*.{h,m}' - s.private_header_files = 'Source/Core/Helpers/HCRunloopRunner.h', 'Source/Core/Helpers/NSInvocation+OCHamcrest.h', 'Source/Core/Helpers/ReturnValueGetters/*.h', 'Source/Core/Helpers/TestFailureReporters/HCGenericTestFailureReporter.h', 'Source/Core/Helpers/TestFailureReporters/HCSenTestFailureReporter.h', 'Source/Core/Helpers/TestFailureReporters/HCXCTestFailureReporter.h' + s.source_files = 'Sources/OCHamcrest/OCHamcrest.h', 'Sources/OCHamcrest/Core/**/*.{h,m}', 'Sources/OCHamcrest/Library/**/*.{h,m}' + s.private_header_files = 'Sources/OCHamcrest/Core/Helpers/HCRunloopRunner.h', 'Sources/OCHamcrest/Core/Helpers/NSInvocation+OCHamcrest.h', 'Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/*.h', 'Sources/OCHamcrest/Core/Helpers/TestFailureReporters/HCGenericTestFailureReporter.h', 'Sources/OCHamcrest/Core/Helpers/TestFailureReporters/HCSenTestFailureReporter.h', 'Sources/OCHamcrest/Core/Helpers/TestFailureReporters/HCXCTestFailureReporter.h' s.requires_arc = true end diff --git a/Package.swift b/Package.swift index ea1e6603..22403cdd 100644 --- a/Package.swift +++ b/Package.swift @@ -18,12 +18,10 @@ let package = Package( targets: [ .target( name: "OCHamcrest", - path: "Source", - publicHeadersPath: "include", cSettings: [ - CSetting.headerSearchPath("./Core/Helpers"), - CSetting.headerSearchPath("./Core/Helpers/ReturnValueGetters"), - CSetting.headerSearchPath("./Core/Helpers/TestFailureReporters"), + .headerSearchPath("./Core/Helpers"), + .headerSearchPath("./Core/Helpers/ReturnValueGetters"), + .headerSearchPath("./Core/Helpers/TestFailureReporters"), ] ), .testTarget( diff --git a/Resources/OCHamcrest.xcodeproj/project.pbxproj b/Resources/OCHamcrest.xcodeproj/project.pbxproj index d8cf36e0..97451693 100644 --- a/Resources/OCHamcrest.xcodeproj/project.pbxproj +++ b/Resources/OCHamcrest.xcodeproj/project.pbxproj @@ -372,7 +372,7 @@ BB333522A78D6A7D1A8414B3 /* HCIsIn.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCIsIn.m; sourceTree = ""; }; BB333528C8E2ED8489ACB161 /* HCTestFailureReporter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCTestFailureReporter.m; sourceTree = ""; }; BB33355AD08369793188986F /* HCObjectReturnGetter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCObjectReturnGetter.m; sourceTree = ""; }; - BB33356A6185FA4F1B6E240F /* OCHamcrest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OCHamcrest.h; path = ../Source/OCHamcrest.h; sourceTree = ""; }; + BB33356A6185FA4F1B6E240F /* OCHamcrest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OCHamcrest.h; path = ../Sources/OCHamcrest/OCHamcrest.h; sourceTree = ""; }; BB33359133039118AE88E2A8 /* HCIsNil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HCIsNil.h; sourceTree = ""; }; BB333594FB0AC2DAC3B73077 /* HCIsSame.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCIsSame.m; sourceTree = ""; }; BB3335974ADA5C5408FE0F69 /* HCStringEndsWith.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCStringEndsWith.m; sourceTree = ""; }; @@ -716,7 +716,7 @@ BB33378F4CD8AE4C7EFC1CF0 /* Helpers */, ); name = Core; - path = ../Source/Core; + path = ../Sources/OCHamcrest/Core; sourceTree = ""; }; BB33378F4CD8AE4C7EFC1CF0 /* Helpers */ = { @@ -833,7 +833,7 @@ BB333EA5543B2EAB4E34B3CF /* Text */, ); name = Library; - path = ../Source/Library; + path = ../Sources/OCHamcrest/Library; sourceTree = ""; }; BB333EA5543B2EAB4E34B3CF /* Text */ = { diff --git a/Source/Core/HCAssertThat.h b/Sources/OCHamcrest/Core/HCAssertThat.h similarity index 100% rename from Source/Core/HCAssertThat.h rename to Sources/OCHamcrest/Core/HCAssertThat.h diff --git a/Source/Core/HCAssertThat.m b/Sources/OCHamcrest/Core/HCAssertThat.m similarity index 100% rename from Source/Core/HCAssertThat.m rename to Sources/OCHamcrest/Core/HCAssertThat.m diff --git a/Source/Core/HCBaseDescription.h b/Sources/OCHamcrest/Core/HCBaseDescription.h similarity index 100% rename from Source/Core/HCBaseDescription.h rename to Sources/OCHamcrest/Core/HCBaseDescription.h diff --git a/Source/Core/HCBaseDescription.m b/Sources/OCHamcrest/Core/HCBaseDescription.m similarity index 100% rename from Source/Core/HCBaseDescription.m rename to Sources/OCHamcrest/Core/HCBaseDescription.m diff --git a/Source/Core/HCBaseMatcher.h b/Sources/OCHamcrest/Core/HCBaseMatcher.h similarity index 100% rename from Source/Core/HCBaseMatcher.h rename to Sources/OCHamcrest/Core/HCBaseMatcher.h diff --git a/Source/Core/HCBaseMatcher.m b/Sources/OCHamcrest/Core/HCBaseMatcher.m similarity index 100% rename from Source/Core/HCBaseMatcher.m rename to Sources/OCHamcrest/Core/HCBaseMatcher.m diff --git a/Source/Core/HCDescription.h b/Sources/OCHamcrest/Core/HCDescription.h similarity index 100% rename from Source/Core/HCDescription.h rename to Sources/OCHamcrest/Core/HCDescription.h diff --git a/Source/Core/HCDiagnosingMatcher.h b/Sources/OCHamcrest/Core/HCDiagnosingMatcher.h similarity index 100% rename from Source/Core/HCDiagnosingMatcher.h rename to Sources/OCHamcrest/Core/HCDiagnosingMatcher.h diff --git a/Source/Core/HCDiagnosingMatcher.m b/Sources/OCHamcrest/Core/HCDiagnosingMatcher.m similarity index 100% rename from Source/Core/HCDiagnosingMatcher.m rename to Sources/OCHamcrest/Core/HCDiagnosingMatcher.m diff --git a/Source/Core/HCMatcher.h b/Sources/OCHamcrest/Core/HCMatcher.h similarity index 100% rename from Source/Core/HCMatcher.h rename to Sources/OCHamcrest/Core/HCMatcher.h diff --git a/Source/Core/HCSelfDescribing.h b/Sources/OCHamcrest/Core/HCSelfDescribing.h similarity index 100% rename from Source/Core/HCSelfDescribing.h rename to Sources/OCHamcrest/Core/HCSelfDescribing.h diff --git a/Source/Core/HCStringDescription.h b/Sources/OCHamcrest/Core/HCStringDescription.h similarity index 100% rename from Source/Core/HCStringDescription.h rename to Sources/OCHamcrest/Core/HCStringDescription.h diff --git a/Source/Core/HCStringDescription.m b/Sources/OCHamcrest/Core/HCStringDescription.m similarity index 100% rename from Source/Core/HCStringDescription.m rename to Sources/OCHamcrest/Core/HCStringDescription.m diff --git a/Source/Core/Helpers/HCCollect.h b/Sources/OCHamcrest/Core/Helpers/HCCollect.h similarity index 100% rename from Source/Core/Helpers/HCCollect.h rename to Sources/OCHamcrest/Core/Helpers/HCCollect.h diff --git a/Source/Core/Helpers/HCCollect.m b/Sources/OCHamcrest/Core/Helpers/HCCollect.m similarity index 100% rename from Source/Core/Helpers/HCCollect.m rename to Sources/OCHamcrest/Core/Helpers/HCCollect.m diff --git a/Source/Core/Helpers/HCInvocationMatcher.h b/Sources/OCHamcrest/Core/Helpers/HCInvocationMatcher.h similarity index 100% rename from Source/Core/Helpers/HCInvocationMatcher.h rename to Sources/OCHamcrest/Core/Helpers/HCInvocationMatcher.h diff --git a/Source/Core/Helpers/HCInvocationMatcher.m b/Sources/OCHamcrest/Core/Helpers/HCInvocationMatcher.m similarity index 100% rename from Source/Core/Helpers/HCInvocationMatcher.m rename to Sources/OCHamcrest/Core/Helpers/HCInvocationMatcher.m diff --git a/Source/Core/Helpers/HCRequireNonNilObject.h b/Sources/OCHamcrest/Core/Helpers/HCRequireNonNilObject.h similarity index 100% rename from Source/Core/Helpers/HCRequireNonNilObject.h rename to Sources/OCHamcrest/Core/Helpers/HCRequireNonNilObject.h diff --git a/Source/Core/Helpers/HCRequireNonNilObject.m b/Sources/OCHamcrest/Core/Helpers/HCRequireNonNilObject.m similarity index 100% rename from Source/Core/Helpers/HCRequireNonNilObject.m rename to Sources/OCHamcrest/Core/Helpers/HCRequireNonNilObject.m diff --git a/Source/Core/Helpers/HCRunloopRunner.h b/Sources/OCHamcrest/Core/Helpers/HCRunloopRunner.h similarity index 100% rename from Source/Core/Helpers/HCRunloopRunner.h rename to Sources/OCHamcrest/Core/Helpers/HCRunloopRunner.h diff --git a/Source/Core/Helpers/HCRunloopRunner.m b/Sources/OCHamcrest/Core/Helpers/HCRunloopRunner.m similarity index 100% rename from Source/Core/Helpers/HCRunloopRunner.m rename to Sources/OCHamcrest/Core/Helpers/HCRunloopRunner.m diff --git a/Source/Core/Helpers/HCWrapInMatcher.h b/Sources/OCHamcrest/Core/Helpers/HCWrapInMatcher.h similarity index 100% rename from Source/Core/Helpers/HCWrapInMatcher.h rename to Sources/OCHamcrest/Core/Helpers/HCWrapInMatcher.h diff --git a/Source/Core/Helpers/HCWrapInMatcher.m b/Sources/OCHamcrest/Core/Helpers/HCWrapInMatcher.m similarity index 100% rename from Source/Core/Helpers/HCWrapInMatcher.m rename to Sources/OCHamcrest/Core/Helpers/HCWrapInMatcher.m diff --git a/Source/Core/Helpers/NSInvocation+OCHamcrest.h b/Sources/OCHamcrest/Core/Helpers/NSInvocation+OCHamcrest.h similarity index 100% rename from Source/Core/Helpers/NSInvocation+OCHamcrest.h rename to Sources/OCHamcrest/Core/Helpers/NSInvocation+OCHamcrest.h diff --git a/Source/Core/Helpers/NSInvocation+OCHamcrest.m b/Sources/OCHamcrest/Core/Helpers/NSInvocation+OCHamcrest.m similarity index 100% rename from Source/Core/Helpers/NSInvocation+OCHamcrest.m rename to Sources/OCHamcrest/Core/Helpers/NSInvocation+OCHamcrest.m diff --git a/Source/Core/Helpers/ReturnValueGetters/HCBoolReturnGetter.h b/Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCBoolReturnGetter.h similarity index 100% rename from Source/Core/Helpers/ReturnValueGetters/HCBoolReturnGetter.h rename to Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCBoolReturnGetter.h diff --git a/Source/Core/Helpers/ReturnValueGetters/HCBoolReturnGetter.m b/Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCBoolReturnGetter.m similarity index 100% rename from Source/Core/Helpers/ReturnValueGetters/HCBoolReturnGetter.m rename to Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCBoolReturnGetter.m diff --git a/Source/Core/Helpers/ReturnValueGetters/HCCharReturnGetter.h b/Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCCharReturnGetter.h similarity index 100% rename from Source/Core/Helpers/ReturnValueGetters/HCCharReturnGetter.h rename to Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCCharReturnGetter.h diff --git a/Source/Core/Helpers/ReturnValueGetters/HCCharReturnGetter.m b/Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCCharReturnGetter.m similarity index 100% rename from Source/Core/Helpers/ReturnValueGetters/HCCharReturnGetter.m rename to Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCCharReturnGetter.m diff --git a/Source/Core/Helpers/ReturnValueGetters/HCDoubleReturnGetter.h b/Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCDoubleReturnGetter.h similarity index 100% rename from Source/Core/Helpers/ReturnValueGetters/HCDoubleReturnGetter.h rename to Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCDoubleReturnGetter.h diff --git a/Source/Core/Helpers/ReturnValueGetters/HCDoubleReturnGetter.m b/Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCDoubleReturnGetter.m similarity index 100% rename from Source/Core/Helpers/ReturnValueGetters/HCDoubleReturnGetter.m rename to Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCDoubleReturnGetter.m diff --git a/Source/Core/Helpers/ReturnValueGetters/HCFloatReturnGetter.h b/Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCFloatReturnGetter.h similarity index 100% rename from Source/Core/Helpers/ReturnValueGetters/HCFloatReturnGetter.h rename to Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCFloatReturnGetter.h diff --git a/Source/Core/Helpers/ReturnValueGetters/HCFloatReturnGetter.m b/Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCFloatReturnGetter.m similarity index 100% rename from Source/Core/Helpers/ReturnValueGetters/HCFloatReturnGetter.m rename to Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCFloatReturnGetter.m diff --git a/Source/Core/Helpers/ReturnValueGetters/HCIntReturnGetter.h b/Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCIntReturnGetter.h similarity index 100% rename from Source/Core/Helpers/ReturnValueGetters/HCIntReturnGetter.h rename to Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCIntReturnGetter.h diff --git a/Source/Core/Helpers/ReturnValueGetters/HCIntReturnGetter.m b/Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCIntReturnGetter.m similarity index 100% rename from Source/Core/Helpers/ReturnValueGetters/HCIntReturnGetter.m rename to Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCIntReturnGetter.m diff --git a/Source/Core/Helpers/ReturnValueGetters/HCLongLongReturnGetter.h b/Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCLongLongReturnGetter.h similarity index 100% rename from Source/Core/Helpers/ReturnValueGetters/HCLongLongReturnGetter.h rename to Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCLongLongReturnGetter.h diff --git a/Source/Core/Helpers/ReturnValueGetters/HCLongLongReturnGetter.m b/Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCLongLongReturnGetter.m similarity index 100% rename from Source/Core/Helpers/ReturnValueGetters/HCLongLongReturnGetter.m rename to Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCLongLongReturnGetter.m diff --git a/Source/Core/Helpers/ReturnValueGetters/HCLongReturnGetter.h b/Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCLongReturnGetter.h similarity index 100% rename from Source/Core/Helpers/ReturnValueGetters/HCLongReturnGetter.h rename to Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCLongReturnGetter.h diff --git a/Source/Core/Helpers/ReturnValueGetters/HCLongReturnGetter.m b/Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCLongReturnGetter.m similarity index 100% rename from Source/Core/Helpers/ReturnValueGetters/HCLongReturnGetter.m rename to Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCLongReturnGetter.m diff --git a/Source/Core/Helpers/ReturnValueGetters/HCObjectReturnGetter.h b/Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCObjectReturnGetter.h similarity index 100% rename from Source/Core/Helpers/ReturnValueGetters/HCObjectReturnGetter.h rename to Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCObjectReturnGetter.h diff --git a/Source/Core/Helpers/ReturnValueGetters/HCObjectReturnGetter.m b/Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCObjectReturnGetter.m similarity index 100% rename from Source/Core/Helpers/ReturnValueGetters/HCObjectReturnGetter.m rename to Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCObjectReturnGetter.m diff --git a/Source/Core/Helpers/ReturnValueGetters/HCReturnTypeHandlerChain.h b/Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCReturnTypeHandlerChain.h similarity index 100% rename from Source/Core/Helpers/ReturnValueGetters/HCReturnTypeHandlerChain.h rename to Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCReturnTypeHandlerChain.h diff --git a/Source/Core/Helpers/ReturnValueGetters/HCReturnTypeHandlerChain.m b/Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCReturnTypeHandlerChain.m similarity index 100% rename from Source/Core/Helpers/ReturnValueGetters/HCReturnTypeHandlerChain.m rename to Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCReturnTypeHandlerChain.m diff --git a/Source/Core/Helpers/ReturnValueGetters/HCReturnValueGetter.h b/Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCReturnValueGetter.h similarity index 100% rename from Source/Core/Helpers/ReturnValueGetters/HCReturnValueGetter.h rename to Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCReturnValueGetter.h diff --git a/Source/Core/Helpers/ReturnValueGetters/HCReturnValueGetter.m b/Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCReturnValueGetter.m similarity index 100% rename from Source/Core/Helpers/ReturnValueGetters/HCReturnValueGetter.m rename to Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCReturnValueGetter.m diff --git a/Source/Core/Helpers/ReturnValueGetters/HCShortReturnGetter.h b/Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCShortReturnGetter.h similarity index 100% rename from Source/Core/Helpers/ReturnValueGetters/HCShortReturnGetter.h rename to Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCShortReturnGetter.h diff --git a/Source/Core/Helpers/ReturnValueGetters/HCShortReturnGetter.m b/Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCShortReturnGetter.m similarity index 100% rename from Source/Core/Helpers/ReturnValueGetters/HCShortReturnGetter.m rename to Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCShortReturnGetter.m diff --git a/Source/Core/Helpers/ReturnValueGetters/HCUnsignedCharReturnGetter.h b/Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCUnsignedCharReturnGetter.h similarity index 100% rename from Source/Core/Helpers/ReturnValueGetters/HCUnsignedCharReturnGetter.h rename to Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCUnsignedCharReturnGetter.h diff --git a/Source/Core/Helpers/ReturnValueGetters/HCUnsignedCharReturnGetter.m b/Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCUnsignedCharReturnGetter.m similarity index 100% rename from Source/Core/Helpers/ReturnValueGetters/HCUnsignedCharReturnGetter.m rename to Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCUnsignedCharReturnGetter.m diff --git a/Source/Core/Helpers/ReturnValueGetters/HCUnsignedIntReturnGetter.h b/Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCUnsignedIntReturnGetter.h similarity index 100% rename from Source/Core/Helpers/ReturnValueGetters/HCUnsignedIntReturnGetter.h rename to Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCUnsignedIntReturnGetter.h diff --git a/Source/Core/Helpers/ReturnValueGetters/HCUnsignedIntReturnGetter.m b/Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCUnsignedIntReturnGetter.m similarity index 100% rename from Source/Core/Helpers/ReturnValueGetters/HCUnsignedIntReturnGetter.m rename to Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCUnsignedIntReturnGetter.m diff --git a/Source/Core/Helpers/ReturnValueGetters/HCUnsignedLongLongReturnGetter.h b/Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCUnsignedLongLongReturnGetter.h similarity index 100% rename from Source/Core/Helpers/ReturnValueGetters/HCUnsignedLongLongReturnGetter.h rename to Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCUnsignedLongLongReturnGetter.h diff --git a/Source/Core/Helpers/ReturnValueGetters/HCUnsignedLongLongReturnGetter.m b/Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCUnsignedLongLongReturnGetter.m similarity index 100% rename from Source/Core/Helpers/ReturnValueGetters/HCUnsignedLongLongReturnGetter.m rename to Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCUnsignedLongLongReturnGetter.m diff --git a/Source/Core/Helpers/ReturnValueGetters/HCUnsignedLongReturnGetter.h b/Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCUnsignedLongReturnGetter.h similarity index 100% rename from Source/Core/Helpers/ReturnValueGetters/HCUnsignedLongReturnGetter.h rename to Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCUnsignedLongReturnGetter.h diff --git a/Source/Core/Helpers/ReturnValueGetters/HCUnsignedLongReturnGetter.m b/Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCUnsignedLongReturnGetter.m similarity index 100% rename from Source/Core/Helpers/ReturnValueGetters/HCUnsignedLongReturnGetter.m rename to Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCUnsignedLongReturnGetter.m diff --git a/Source/Core/Helpers/ReturnValueGetters/HCUnsignedShortReturnGetter.h b/Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCUnsignedShortReturnGetter.h similarity index 100% rename from Source/Core/Helpers/ReturnValueGetters/HCUnsignedShortReturnGetter.h rename to Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCUnsignedShortReturnGetter.h diff --git a/Source/Core/Helpers/ReturnValueGetters/HCUnsignedShortReturnGetter.m b/Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCUnsignedShortReturnGetter.m similarity index 100% rename from Source/Core/Helpers/ReturnValueGetters/HCUnsignedShortReturnGetter.m rename to Sources/OCHamcrest/Core/Helpers/ReturnValueGetters/HCUnsignedShortReturnGetter.m diff --git a/Source/Core/Helpers/TestFailureReporters/HCGenericTestFailureReporter.h b/Sources/OCHamcrest/Core/Helpers/TestFailureReporters/HCGenericTestFailureReporter.h similarity index 100% rename from Source/Core/Helpers/TestFailureReporters/HCGenericTestFailureReporter.h rename to Sources/OCHamcrest/Core/Helpers/TestFailureReporters/HCGenericTestFailureReporter.h diff --git a/Source/Core/Helpers/TestFailureReporters/HCGenericTestFailureReporter.m b/Sources/OCHamcrest/Core/Helpers/TestFailureReporters/HCGenericTestFailureReporter.m similarity index 100% rename from Source/Core/Helpers/TestFailureReporters/HCGenericTestFailureReporter.m rename to Sources/OCHamcrest/Core/Helpers/TestFailureReporters/HCGenericTestFailureReporter.m diff --git a/Source/Core/Helpers/TestFailureReporters/HCSenTestFailureReporter.h b/Sources/OCHamcrest/Core/Helpers/TestFailureReporters/HCSenTestFailureReporter.h similarity index 100% rename from Source/Core/Helpers/TestFailureReporters/HCSenTestFailureReporter.h rename to Sources/OCHamcrest/Core/Helpers/TestFailureReporters/HCSenTestFailureReporter.h diff --git a/Source/Core/Helpers/TestFailureReporters/HCSenTestFailureReporter.m b/Sources/OCHamcrest/Core/Helpers/TestFailureReporters/HCSenTestFailureReporter.m similarity index 100% rename from Source/Core/Helpers/TestFailureReporters/HCSenTestFailureReporter.m rename to Sources/OCHamcrest/Core/Helpers/TestFailureReporters/HCSenTestFailureReporter.m diff --git a/Source/Core/Helpers/TestFailureReporters/HCTestFailure.h b/Sources/OCHamcrest/Core/Helpers/TestFailureReporters/HCTestFailure.h similarity index 100% rename from Source/Core/Helpers/TestFailureReporters/HCTestFailure.h rename to Sources/OCHamcrest/Core/Helpers/TestFailureReporters/HCTestFailure.h diff --git a/Source/Core/Helpers/TestFailureReporters/HCTestFailure.m b/Sources/OCHamcrest/Core/Helpers/TestFailureReporters/HCTestFailure.m similarity index 100% rename from Source/Core/Helpers/TestFailureReporters/HCTestFailure.m rename to Sources/OCHamcrest/Core/Helpers/TestFailureReporters/HCTestFailure.m diff --git a/Source/Core/Helpers/TestFailureReporters/HCTestFailureReporter.h b/Sources/OCHamcrest/Core/Helpers/TestFailureReporters/HCTestFailureReporter.h similarity index 100% rename from Source/Core/Helpers/TestFailureReporters/HCTestFailureReporter.h rename to Sources/OCHamcrest/Core/Helpers/TestFailureReporters/HCTestFailureReporter.h diff --git a/Source/Core/Helpers/TestFailureReporters/HCTestFailureReporter.m b/Sources/OCHamcrest/Core/Helpers/TestFailureReporters/HCTestFailureReporter.m similarity index 100% rename from Source/Core/Helpers/TestFailureReporters/HCTestFailureReporter.m rename to Sources/OCHamcrest/Core/Helpers/TestFailureReporters/HCTestFailureReporter.m diff --git a/Source/Core/Helpers/TestFailureReporters/HCTestFailureReporterChain.h b/Sources/OCHamcrest/Core/Helpers/TestFailureReporters/HCTestFailureReporterChain.h similarity index 100% rename from Source/Core/Helpers/TestFailureReporters/HCTestFailureReporterChain.h rename to Sources/OCHamcrest/Core/Helpers/TestFailureReporters/HCTestFailureReporterChain.h diff --git a/Source/Core/Helpers/TestFailureReporters/HCTestFailureReporterChain.m b/Sources/OCHamcrest/Core/Helpers/TestFailureReporters/HCTestFailureReporterChain.m similarity index 100% rename from Source/Core/Helpers/TestFailureReporters/HCTestFailureReporterChain.m rename to Sources/OCHamcrest/Core/Helpers/TestFailureReporters/HCTestFailureReporterChain.m diff --git a/Source/Core/Helpers/TestFailureReporters/HCXCTestFailureReporter.h b/Sources/OCHamcrest/Core/Helpers/TestFailureReporters/HCXCTestFailureReporter.h similarity index 100% rename from Source/Core/Helpers/TestFailureReporters/HCXCTestFailureReporter.h rename to Sources/OCHamcrest/Core/Helpers/TestFailureReporters/HCXCTestFailureReporter.h diff --git a/Source/Core/Helpers/TestFailureReporters/HCXCTestFailureReporter.m b/Sources/OCHamcrest/Core/Helpers/TestFailureReporters/HCXCTestFailureReporter.m similarity index 100% rename from Source/Core/Helpers/TestFailureReporters/HCXCTestFailureReporter.m rename to Sources/OCHamcrest/Core/Helpers/TestFailureReporters/HCXCTestFailureReporter.m diff --git a/Source/Core/Helpers/TestFailureReporters/HCXCTestIssueFailureReporter.h b/Sources/OCHamcrest/Core/Helpers/TestFailureReporters/HCXCTestIssueFailureReporter.h similarity index 100% rename from Source/Core/Helpers/TestFailureReporters/HCXCTestIssueFailureReporter.h rename to Sources/OCHamcrest/Core/Helpers/TestFailureReporters/HCXCTestIssueFailureReporter.h diff --git a/Source/Core/Helpers/TestFailureReporters/HCXCTestIssueFailureReporter.m b/Sources/OCHamcrest/Core/Helpers/TestFailureReporters/HCXCTestIssueFailureReporter.m similarity index 100% rename from Source/Core/Helpers/TestFailureReporters/HCXCTestIssueFailureReporter.m rename to Sources/OCHamcrest/Core/Helpers/TestFailureReporters/HCXCTestIssueFailureReporter.m diff --git a/Source/Library/Collection/HCEvery.h b/Sources/OCHamcrest/Library/Collection/HCEvery.h similarity index 100% rename from Source/Library/Collection/HCEvery.h rename to Sources/OCHamcrest/Library/Collection/HCEvery.h diff --git a/Source/Library/Collection/HCEvery.m b/Sources/OCHamcrest/Library/Collection/HCEvery.m similarity index 100% rename from Source/Library/Collection/HCEvery.m rename to Sources/OCHamcrest/Library/Collection/HCEvery.m diff --git a/Source/Library/Collection/HCHasCount.h b/Sources/OCHamcrest/Library/Collection/HCHasCount.h similarity index 100% rename from Source/Library/Collection/HCHasCount.h rename to Sources/OCHamcrest/Library/Collection/HCHasCount.h diff --git a/Source/Library/Collection/HCHasCount.m b/Sources/OCHamcrest/Library/Collection/HCHasCount.m similarity index 100% rename from Source/Library/Collection/HCHasCount.m rename to Sources/OCHamcrest/Library/Collection/HCHasCount.m diff --git a/Source/Library/Collection/HCIsCollectionContaining.h b/Sources/OCHamcrest/Library/Collection/HCIsCollectionContaining.h similarity index 100% rename from Source/Library/Collection/HCIsCollectionContaining.h rename to Sources/OCHamcrest/Library/Collection/HCIsCollectionContaining.h diff --git a/Source/Library/Collection/HCIsCollectionContaining.m b/Sources/OCHamcrest/Library/Collection/HCIsCollectionContaining.m similarity index 100% rename from Source/Library/Collection/HCIsCollectionContaining.m rename to Sources/OCHamcrest/Library/Collection/HCIsCollectionContaining.m diff --git a/Source/Library/Collection/HCIsCollectionContainingInAnyOrder.h b/Sources/OCHamcrest/Library/Collection/HCIsCollectionContainingInAnyOrder.h similarity index 100% rename from Source/Library/Collection/HCIsCollectionContainingInAnyOrder.h rename to Sources/OCHamcrest/Library/Collection/HCIsCollectionContainingInAnyOrder.h diff --git a/Source/Library/Collection/HCIsCollectionContainingInAnyOrder.m b/Sources/OCHamcrest/Library/Collection/HCIsCollectionContainingInAnyOrder.m similarity index 100% rename from Source/Library/Collection/HCIsCollectionContainingInAnyOrder.m rename to Sources/OCHamcrest/Library/Collection/HCIsCollectionContainingInAnyOrder.m diff --git a/Source/Library/Collection/HCIsCollectionContainingInOrder.h b/Sources/OCHamcrest/Library/Collection/HCIsCollectionContainingInOrder.h similarity index 100% rename from Source/Library/Collection/HCIsCollectionContainingInOrder.h rename to Sources/OCHamcrest/Library/Collection/HCIsCollectionContainingInOrder.h diff --git a/Source/Library/Collection/HCIsCollectionContainingInOrder.m b/Sources/OCHamcrest/Library/Collection/HCIsCollectionContainingInOrder.m similarity index 100% rename from Source/Library/Collection/HCIsCollectionContainingInOrder.m rename to Sources/OCHamcrest/Library/Collection/HCIsCollectionContainingInOrder.m diff --git a/Source/Library/Collection/HCIsCollectionContainingInRelativeOrder.h b/Sources/OCHamcrest/Library/Collection/HCIsCollectionContainingInRelativeOrder.h similarity index 100% rename from Source/Library/Collection/HCIsCollectionContainingInRelativeOrder.h rename to Sources/OCHamcrest/Library/Collection/HCIsCollectionContainingInRelativeOrder.h diff --git a/Source/Library/Collection/HCIsCollectionContainingInRelativeOrder.m b/Sources/OCHamcrest/Library/Collection/HCIsCollectionContainingInRelativeOrder.m similarity index 100% rename from Source/Library/Collection/HCIsCollectionContainingInRelativeOrder.m rename to Sources/OCHamcrest/Library/Collection/HCIsCollectionContainingInRelativeOrder.m diff --git a/Source/Library/Collection/HCIsCollectionOnlyContaining.h b/Sources/OCHamcrest/Library/Collection/HCIsCollectionOnlyContaining.h similarity index 100% rename from Source/Library/Collection/HCIsCollectionOnlyContaining.h rename to Sources/OCHamcrest/Library/Collection/HCIsCollectionOnlyContaining.h diff --git a/Source/Library/Collection/HCIsCollectionOnlyContaining.m b/Sources/OCHamcrest/Library/Collection/HCIsCollectionOnlyContaining.m similarity index 100% rename from Source/Library/Collection/HCIsCollectionOnlyContaining.m rename to Sources/OCHamcrest/Library/Collection/HCIsCollectionOnlyContaining.m diff --git a/Source/Library/Collection/HCIsDictionaryContaining.h b/Sources/OCHamcrest/Library/Collection/HCIsDictionaryContaining.h similarity index 100% rename from Source/Library/Collection/HCIsDictionaryContaining.h rename to Sources/OCHamcrest/Library/Collection/HCIsDictionaryContaining.h diff --git a/Source/Library/Collection/HCIsDictionaryContaining.m b/Sources/OCHamcrest/Library/Collection/HCIsDictionaryContaining.m similarity index 100% rename from Source/Library/Collection/HCIsDictionaryContaining.m rename to Sources/OCHamcrest/Library/Collection/HCIsDictionaryContaining.m diff --git a/Source/Library/Collection/HCIsDictionaryContainingEntries.h b/Sources/OCHamcrest/Library/Collection/HCIsDictionaryContainingEntries.h similarity index 100% rename from Source/Library/Collection/HCIsDictionaryContainingEntries.h rename to Sources/OCHamcrest/Library/Collection/HCIsDictionaryContainingEntries.h diff --git a/Source/Library/Collection/HCIsDictionaryContainingEntries.m b/Sources/OCHamcrest/Library/Collection/HCIsDictionaryContainingEntries.m similarity index 100% rename from Source/Library/Collection/HCIsDictionaryContainingEntries.m rename to Sources/OCHamcrest/Library/Collection/HCIsDictionaryContainingEntries.m diff --git a/Source/Library/Collection/HCIsDictionaryContainingKey.h b/Sources/OCHamcrest/Library/Collection/HCIsDictionaryContainingKey.h similarity index 100% rename from Source/Library/Collection/HCIsDictionaryContainingKey.h rename to Sources/OCHamcrest/Library/Collection/HCIsDictionaryContainingKey.h diff --git a/Source/Library/Collection/HCIsDictionaryContainingKey.m b/Sources/OCHamcrest/Library/Collection/HCIsDictionaryContainingKey.m similarity index 100% rename from Source/Library/Collection/HCIsDictionaryContainingKey.m rename to Sources/OCHamcrest/Library/Collection/HCIsDictionaryContainingKey.m diff --git a/Source/Library/Collection/HCIsDictionaryContainingValue.h b/Sources/OCHamcrest/Library/Collection/HCIsDictionaryContainingValue.h similarity index 100% rename from Source/Library/Collection/HCIsDictionaryContainingValue.h rename to Sources/OCHamcrest/Library/Collection/HCIsDictionaryContainingValue.h diff --git a/Source/Library/Collection/HCIsDictionaryContainingValue.m b/Sources/OCHamcrest/Library/Collection/HCIsDictionaryContainingValue.m similarity index 100% rename from Source/Library/Collection/HCIsDictionaryContainingValue.m rename to Sources/OCHamcrest/Library/Collection/HCIsDictionaryContainingValue.m diff --git a/Source/Library/Collection/HCIsEmptyCollection.h b/Sources/OCHamcrest/Library/Collection/HCIsEmptyCollection.h similarity index 100% rename from Source/Library/Collection/HCIsEmptyCollection.h rename to Sources/OCHamcrest/Library/Collection/HCIsEmptyCollection.h diff --git a/Source/Library/Collection/HCIsEmptyCollection.m b/Sources/OCHamcrest/Library/Collection/HCIsEmptyCollection.m similarity index 100% rename from Source/Library/Collection/HCIsEmptyCollection.m rename to Sources/OCHamcrest/Library/Collection/HCIsEmptyCollection.m diff --git a/Source/Library/Collection/HCIsIn.h b/Sources/OCHamcrest/Library/Collection/HCIsIn.h similarity index 100% rename from Source/Library/Collection/HCIsIn.h rename to Sources/OCHamcrest/Library/Collection/HCIsIn.h diff --git a/Source/Library/Collection/HCIsIn.m b/Sources/OCHamcrest/Library/Collection/HCIsIn.m similarity index 100% rename from Source/Library/Collection/HCIsIn.m rename to Sources/OCHamcrest/Library/Collection/HCIsIn.m diff --git a/Source/Library/Decorator/HCDescribedAs.h b/Sources/OCHamcrest/Library/Decorator/HCDescribedAs.h similarity index 100% rename from Source/Library/Decorator/HCDescribedAs.h rename to Sources/OCHamcrest/Library/Decorator/HCDescribedAs.h diff --git a/Source/Library/Decorator/HCDescribedAs.m b/Sources/OCHamcrest/Library/Decorator/HCDescribedAs.m similarity index 100% rename from Source/Library/Decorator/HCDescribedAs.m rename to Sources/OCHamcrest/Library/Decorator/HCDescribedAs.m diff --git a/Source/Library/Decorator/HCIs.h b/Sources/OCHamcrest/Library/Decorator/HCIs.h similarity index 100% rename from Source/Library/Decorator/HCIs.h rename to Sources/OCHamcrest/Library/Decorator/HCIs.h diff --git a/Source/Library/Decorator/HCIs.m b/Sources/OCHamcrest/Library/Decorator/HCIs.m similarity index 100% rename from Source/Library/Decorator/HCIs.m rename to Sources/OCHamcrest/Library/Decorator/HCIs.m diff --git a/Source/Library/Logical/HCAllOf.h b/Sources/OCHamcrest/Library/Logical/HCAllOf.h similarity index 100% rename from Source/Library/Logical/HCAllOf.h rename to Sources/OCHamcrest/Library/Logical/HCAllOf.h diff --git a/Source/Library/Logical/HCAllOf.m b/Sources/OCHamcrest/Library/Logical/HCAllOf.m similarity index 100% rename from Source/Library/Logical/HCAllOf.m rename to Sources/OCHamcrest/Library/Logical/HCAllOf.m diff --git a/Source/Library/Logical/HCAnyOf.h b/Sources/OCHamcrest/Library/Logical/HCAnyOf.h similarity index 100% rename from Source/Library/Logical/HCAnyOf.h rename to Sources/OCHamcrest/Library/Logical/HCAnyOf.h diff --git a/Source/Library/Logical/HCAnyOf.m b/Sources/OCHamcrest/Library/Logical/HCAnyOf.m similarity index 100% rename from Source/Library/Logical/HCAnyOf.m rename to Sources/OCHamcrest/Library/Logical/HCAnyOf.m diff --git a/Source/Library/Logical/HCIsAnything.h b/Sources/OCHamcrest/Library/Logical/HCIsAnything.h similarity index 100% rename from Source/Library/Logical/HCIsAnything.h rename to Sources/OCHamcrest/Library/Logical/HCIsAnything.h diff --git a/Source/Library/Logical/HCIsAnything.m b/Sources/OCHamcrest/Library/Logical/HCIsAnything.m similarity index 100% rename from Source/Library/Logical/HCIsAnything.m rename to Sources/OCHamcrest/Library/Logical/HCIsAnything.m diff --git a/Source/Library/Logical/HCIsNot.h b/Sources/OCHamcrest/Library/Logical/HCIsNot.h similarity index 100% rename from Source/Library/Logical/HCIsNot.h rename to Sources/OCHamcrest/Library/Logical/HCIsNot.h diff --git a/Source/Library/Logical/HCIsNot.m b/Sources/OCHamcrest/Library/Logical/HCIsNot.m similarity index 100% rename from Source/Library/Logical/HCIsNot.m rename to Sources/OCHamcrest/Library/Logical/HCIsNot.m diff --git a/Source/Library/Number/HCIsCloseTo.h b/Sources/OCHamcrest/Library/Number/HCIsCloseTo.h similarity index 100% rename from Source/Library/Number/HCIsCloseTo.h rename to Sources/OCHamcrest/Library/Number/HCIsCloseTo.h diff --git a/Source/Library/Number/HCIsCloseTo.m b/Sources/OCHamcrest/Library/Number/HCIsCloseTo.m similarity index 100% rename from Source/Library/Number/HCIsCloseTo.m rename to Sources/OCHamcrest/Library/Number/HCIsCloseTo.m diff --git a/Source/Library/Number/HCIsEqualToNumber.h b/Sources/OCHamcrest/Library/Number/HCIsEqualToNumber.h similarity index 100% rename from Source/Library/Number/HCIsEqualToNumber.h rename to Sources/OCHamcrest/Library/Number/HCIsEqualToNumber.h diff --git a/Source/Library/Number/HCIsEqualToNumber.m b/Sources/OCHamcrest/Library/Number/HCIsEqualToNumber.m similarity index 100% rename from Source/Library/Number/HCIsEqualToNumber.m rename to Sources/OCHamcrest/Library/Number/HCIsEqualToNumber.m diff --git a/Source/Library/Number/HCIsTrueFalse.h b/Sources/OCHamcrest/Library/Number/HCIsTrueFalse.h similarity index 100% rename from Source/Library/Number/HCIsTrueFalse.h rename to Sources/OCHamcrest/Library/Number/HCIsTrueFalse.h diff --git a/Source/Library/Number/HCIsTrueFalse.m b/Sources/OCHamcrest/Library/Number/HCIsTrueFalse.m similarity index 100% rename from Source/Library/Number/HCIsTrueFalse.m rename to Sources/OCHamcrest/Library/Number/HCIsTrueFalse.m diff --git a/Source/Library/Number/HCNumberAssert.h b/Sources/OCHamcrest/Library/Number/HCNumberAssert.h similarity index 100% rename from Source/Library/Number/HCNumberAssert.h rename to Sources/OCHamcrest/Library/Number/HCNumberAssert.h diff --git a/Source/Library/Number/HCNumberAssert.m b/Sources/OCHamcrest/Library/Number/HCNumberAssert.m similarity index 100% rename from Source/Library/Number/HCNumberAssert.m rename to Sources/OCHamcrest/Library/Number/HCNumberAssert.m diff --git a/Source/Library/Number/HCOrderingComparison.h b/Sources/OCHamcrest/Library/Number/HCOrderingComparison.h similarity index 100% rename from Source/Library/Number/HCOrderingComparison.h rename to Sources/OCHamcrest/Library/Number/HCOrderingComparison.h diff --git a/Source/Library/Number/HCOrderingComparison.m b/Sources/OCHamcrest/Library/Number/HCOrderingComparison.m similarity index 100% rename from Source/Library/Number/HCOrderingComparison.m rename to Sources/OCHamcrest/Library/Number/HCOrderingComparison.m diff --git a/Source/Library/Object/HCArgumentCaptor.h b/Sources/OCHamcrest/Library/Object/HCArgumentCaptor.h similarity index 100% rename from Source/Library/Object/HCArgumentCaptor.h rename to Sources/OCHamcrest/Library/Object/HCArgumentCaptor.h diff --git a/Source/Library/Object/HCArgumentCaptor.m b/Sources/OCHamcrest/Library/Object/HCArgumentCaptor.m similarity index 100% rename from Source/Library/Object/HCArgumentCaptor.m rename to Sources/OCHamcrest/Library/Object/HCArgumentCaptor.m diff --git a/Source/Library/Object/HCClassMatcher.h b/Sources/OCHamcrest/Library/Object/HCClassMatcher.h similarity index 100% rename from Source/Library/Object/HCClassMatcher.h rename to Sources/OCHamcrest/Library/Object/HCClassMatcher.h diff --git a/Source/Library/Object/HCClassMatcher.m b/Sources/OCHamcrest/Library/Object/HCClassMatcher.m similarity index 100% rename from Source/Library/Object/HCClassMatcher.m rename to Sources/OCHamcrest/Library/Object/HCClassMatcher.m diff --git a/Source/Library/Object/HCConformsToProtocol.h b/Sources/OCHamcrest/Library/Object/HCConformsToProtocol.h similarity index 100% rename from Source/Library/Object/HCConformsToProtocol.h rename to Sources/OCHamcrest/Library/Object/HCConformsToProtocol.h diff --git a/Source/Library/Object/HCConformsToProtocol.m b/Sources/OCHamcrest/Library/Object/HCConformsToProtocol.m similarity index 100% rename from Source/Library/Object/HCConformsToProtocol.m rename to Sources/OCHamcrest/Library/Object/HCConformsToProtocol.m diff --git a/Source/Library/Object/HCHasDescription.h b/Sources/OCHamcrest/Library/Object/HCHasDescription.h similarity index 100% rename from Source/Library/Object/HCHasDescription.h rename to Sources/OCHamcrest/Library/Object/HCHasDescription.h diff --git a/Source/Library/Object/HCHasDescription.m b/Sources/OCHamcrest/Library/Object/HCHasDescription.m similarity index 100% rename from Source/Library/Object/HCHasDescription.m rename to Sources/OCHamcrest/Library/Object/HCHasDescription.m diff --git a/Source/Library/Object/HCHasProperty.h b/Sources/OCHamcrest/Library/Object/HCHasProperty.h similarity index 100% rename from Source/Library/Object/HCHasProperty.h rename to Sources/OCHamcrest/Library/Object/HCHasProperty.h diff --git a/Source/Library/Object/HCHasProperty.m b/Sources/OCHamcrest/Library/Object/HCHasProperty.m similarity index 100% rename from Source/Library/Object/HCHasProperty.m rename to Sources/OCHamcrest/Library/Object/HCHasProperty.m diff --git a/Source/Library/Object/HCIsEqual.h b/Sources/OCHamcrest/Library/Object/HCIsEqual.h similarity index 100% rename from Source/Library/Object/HCIsEqual.h rename to Sources/OCHamcrest/Library/Object/HCIsEqual.h diff --git a/Source/Library/Object/HCIsEqual.m b/Sources/OCHamcrest/Library/Object/HCIsEqual.m similarity index 100% rename from Source/Library/Object/HCIsEqual.m rename to Sources/OCHamcrest/Library/Object/HCIsEqual.m diff --git a/Source/Library/Object/HCIsInstanceOf.h b/Sources/OCHamcrest/Library/Object/HCIsInstanceOf.h similarity index 100% rename from Source/Library/Object/HCIsInstanceOf.h rename to Sources/OCHamcrest/Library/Object/HCIsInstanceOf.h diff --git a/Source/Library/Object/HCIsInstanceOf.m b/Sources/OCHamcrest/Library/Object/HCIsInstanceOf.m similarity index 100% rename from Source/Library/Object/HCIsInstanceOf.m rename to Sources/OCHamcrest/Library/Object/HCIsInstanceOf.m diff --git a/Source/Library/Object/HCIsNil.h b/Sources/OCHamcrest/Library/Object/HCIsNil.h similarity index 100% rename from Source/Library/Object/HCIsNil.h rename to Sources/OCHamcrest/Library/Object/HCIsNil.h diff --git a/Source/Library/Object/HCIsNil.m b/Sources/OCHamcrest/Library/Object/HCIsNil.m similarity index 100% rename from Source/Library/Object/HCIsNil.m rename to Sources/OCHamcrest/Library/Object/HCIsNil.m diff --git a/Source/Library/Object/HCIsSame.h b/Sources/OCHamcrest/Library/Object/HCIsSame.h similarity index 100% rename from Source/Library/Object/HCIsSame.h rename to Sources/OCHamcrest/Library/Object/HCIsSame.h diff --git a/Source/Library/Object/HCIsSame.m b/Sources/OCHamcrest/Library/Object/HCIsSame.m similarity index 100% rename from Source/Library/Object/HCIsSame.m rename to Sources/OCHamcrest/Library/Object/HCIsSame.m diff --git a/Source/Library/Object/HCIsTypeOf.h b/Sources/OCHamcrest/Library/Object/HCIsTypeOf.h similarity index 100% rename from Source/Library/Object/HCIsTypeOf.h rename to Sources/OCHamcrest/Library/Object/HCIsTypeOf.h diff --git a/Source/Library/Object/HCIsTypeOf.m b/Sources/OCHamcrest/Library/Object/HCIsTypeOf.m similarity index 100% rename from Source/Library/Object/HCIsTypeOf.m rename to Sources/OCHamcrest/Library/Object/HCIsTypeOf.m diff --git a/Source/Library/Object/HCThrowsException.h b/Sources/OCHamcrest/Library/Object/HCThrowsException.h similarity index 100% rename from Source/Library/Object/HCThrowsException.h rename to Sources/OCHamcrest/Library/Object/HCThrowsException.h diff --git a/Source/Library/Object/HCThrowsException.m b/Sources/OCHamcrest/Library/Object/HCThrowsException.m similarity index 100% rename from Source/Library/Object/HCThrowsException.m rename to Sources/OCHamcrest/Library/Object/HCThrowsException.m diff --git a/Source/Library/Text/HCIsEqualCompressingWhiteSpace.h b/Sources/OCHamcrest/Library/Text/HCIsEqualCompressingWhiteSpace.h similarity index 100% rename from Source/Library/Text/HCIsEqualCompressingWhiteSpace.h rename to Sources/OCHamcrest/Library/Text/HCIsEqualCompressingWhiteSpace.h diff --git a/Source/Library/Text/HCIsEqualCompressingWhiteSpace.m b/Sources/OCHamcrest/Library/Text/HCIsEqualCompressingWhiteSpace.m similarity index 100% rename from Source/Library/Text/HCIsEqualCompressingWhiteSpace.m rename to Sources/OCHamcrest/Library/Text/HCIsEqualCompressingWhiteSpace.m diff --git a/Source/Library/Text/HCIsEqualIgnoringCase.h b/Sources/OCHamcrest/Library/Text/HCIsEqualIgnoringCase.h similarity index 100% rename from Source/Library/Text/HCIsEqualIgnoringCase.h rename to Sources/OCHamcrest/Library/Text/HCIsEqualIgnoringCase.h diff --git a/Source/Library/Text/HCIsEqualIgnoringCase.m b/Sources/OCHamcrest/Library/Text/HCIsEqualIgnoringCase.m similarity index 100% rename from Source/Library/Text/HCIsEqualIgnoringCase.m rename to Sources/OCHamcrest/Library/Text/HCIsEqualIgnoringCase.m diff --git a/Source/Library/Text/HCStringContains.h b/Sources/OCHamcrest/Library/Text/HCStringContains.h similarity index 100% rename from Source/Library/Text/HCStringContains.h rename to Sources/OCHamcrest/Library/Text/HCStringContains.h diff --git a/Source/Library/Text/HCStringContains.m b/Sources/OCHamcrest/Library/Text/HCStringContains.m similarity index 100% rename from Source/Library/Text/HCStringContains.m rename to Sources/OCHamcrest/Library/Text/HCStringContains.m diff --git a/Source/Library/Text/HCStringContainsInOrder.h b/Sources/OCHamcrest/Library/Text/HCStringContainsInOrder.h similarity index 100% rename from Source/Library/Text/HCStringContainsInOrder.h rename to Sources/OCHamcrest/Library/Text/HCStringContainsInOrder.h diff --git a/Source/Library/Text/HCStringContainsInOrder.m b/Sources/OCHamcrest/Library/Text/HCStringContainsInOrder.m similarity index 100% rename from Source/Library/Text/HCStringContainsInOrder.m rename to Sources/OCHamcrest/Library/Text/HCStringContainsInOrder.m diff --git a/Source/Library/Text/HCStringEndsWith.h b/Sources/OCHamcrest/Library/Text/HCStringEndsWith.h similarity index 100% rename from Source/Library/Text/HCStringEndsWith.h rename to Sources/OCHamcrest/Library/Text/HCStringEndsWith.h diff --git a/Source/Library/Text/HCStringEndsWith.m b/Sources/OCHamcrest/Library/Text/HCStringEndsWith.m similarity index 100% rename from Source/Library/Text/HCStringEndsWith.m rename to Sources/OCHamcrest/Library/Text/HCStringEndsWith.m diff --git a/Source/Library/Text/HCStringStartsWith.h b/Sources/OCHamcrest/Library/Text/HCStringStartsWith.h similarity index 100% rename from Source/Library/Text/HCStringStartsWith.h rename to Sources/OCHamcrest/Library/Text/HCStringStartsWith.h diff --git a/Source/Library/Text/HCStringStartsWith.m b/Sources/OCHamcrest/Library/Text/HCStringStartsWith.m similarity index 100% rename from Source/Library/Text/HCStringStartsWith.m rename to Sources/OCHamcrest/Library/Text/HCStringStartsWith.m diff --git a/Source/Library/Text/HCSubstringMatcher.h b/Sources/OCHamcrest/Library/Text/HCSubstringMatcher.h similarity index 100% rename from Source/Library/Text/HCSubstringMatcher.h rename to Sources/OCHamcrest/Library/Text/HCSubstringMatcher.h diff --git a/Source/Library/Text/HCSubstringMatcher.m b/Sources/OCHamcrest/Library/Text/HCSubstringMatcher.m similarity index 100% rename from Source/Library/Text/HCSubstringMatcher.m rename to Sources/OCHamcrest/Library/Text/HCSubstringMatcher.m diff --git a/Source/OCHamcrest.h b/Sources/OCHamcrest/OCHamcrest.h similarity index 100% rename from Source/OCHamcrest.h rename to Sources/OCHamcrest/OCHamcrest.h diff --git a/Source/include/OCHamcrest/HCAllOf.h b/Sources/OCHamcrest/include/OCHamcrest/HCAllOf.h similarity index 100% rename from Source/include/OCHamcrest/HCAllOf.h rename to Sources/OCHamcrest/include/OCHamcrest/HCAllOf.h diff --git a/Source/include/OCHamcrest/HCAnyOf.h b/Sources/OCHamcrest/include/OCHamcrest/HCAnyOf.h similarity index 100% rename from Source/include/OCHamcrest/HCAnyOf.h rename to Sources/OCHamcrest/include/OCHamcrest/HCAnyOf.h diff --git a/Source/include/OCHamcrest/HCArgumentCaptor.h b/Sources/OCHamcrest/include/OCHamcrest/HCArgumentCaptor.h similarity index 100% rename from Source/include/OCHamcrest/HCArgumentCaptor.h rename to Sources/OCHamcrest/include/OCHamcrest/HCArgumentCaptor.h diff --git a/Source/include/OCHamcrest/HCAssertThat.h b/Sources/OCHamcrest/include/OCHamcrest/HCAssertThat.h similarity index 100% rename from Source/include/OCHamcrest/HCAssertThat.h rename to Sources/OCHamcrest/include/OCHamcrest/HCAssertThat.h diff --git a/Source/include/OCHamcrest/HCBaseDescription.h b/Sources/OCHamcrest/include/OCHamcrest/HCBaseDescription.h similarity index 100% rename from Source/include/OCHamcrest/HCBaseDescription.h rename to Sources/OCHamcrest/include/OCHamcrest/HCBaseDescription.h diff --git a/Source/include/OCHamcrest/HCBaseMatcher.h b/Sources/OCHamcrest/include/OCHamcrest/HCBaseMatcher.h similarity index 100% rename from Source/include/OCHamcrest/HCBaseMatcher.h rename to Sources/OCHamcrest/include/OCHamcrest/HCBaseMatcher.h diff --git a/Source/include/OCHamcrest/HCClassMatcher.h b/Sources/OCHamcrest/include/OCHamcrest/HCClassMatcher.h similarity index 100% rename from Source/include/OCHamcrest/HCClassMatcher.h rename to Sources/OCHamcrest/include/OCHamcrest/HCClassMatcher.h diff --git a/Source/include/OCHamcrest/HCCollect.h b/Sources/OCHamcrest/include/OCHamcrest/HCCollect.h similarity index 100% rename from Source/include/OCHamcrest/HCCollect.h rename to Sources/OCHamcrest/include/OCHamcrest/HCCollect.h diff --git a/Source/include/OCHamcrest/HCConformsToProtocol.h b/Sources/OCHamcrest/include/OCHamcrest/HCConformsToProtocol.h similarity index 100% rename from Source/include/OCHamcrest/HCConformsToProtocol.h rename to Sources/OCHamcrest/include/OCHamcrest/HCConformsToProtocol.h diff --git a/Source/include/OCHamcrest/HCDescribedAs.h b/Sources/OCHamcrest/include/OCHamcrest/HCDescribedAs.h similarity index 100% rename from Source/include/OCHamcrest/HCDescribedAs.h rename to Sources/OCHamcrest/include/OCHamcrest/HCDescribedAs.h diff --git a/Source/include/OCHamcrest/HCDescription.h b/Sources/OCHamcrest/include/OCHamcrest/HCDescription.h similarity index 100% rename from Source/include/OCHamcrest/HCDescription.h rename to Sources/OCHamcrest/include/OCHamcrest/HCDescription.h diff --git a/Source/include/OCHamcrest/HCDiagnosingMatcher.h b/Sources/OCHamcrest/include/OCHamcrest/HCDiagnosingMatcher.h similarity index 100% rename from Source/include/OCHamcrest/HCDiagnosingMatcher.h rename to Sources/OCHamcrest/include/OCHamcrest/HCDiagnosingMatcher.h diff --git a/Source/include/OCHamcrest/HCEvery.h b/Sources/OCHamcrest/include/OCHamcrest/HCEvery.h similarity index 100% rename from Source/include/OCHamcrest/HCEvery.h rename to Sources/OCHamcrest/include/OCHamcrest/HCEvery.h diff --git a/Source/include/OCHamcrest/HCHasCount.h b/Sources/OCHamcrest/include/OCHamcrest/HCHasCount.h similarity index 100% rename from Source/include/OCHamcrest/HCHasCount.h rename to Sources/OCHamcrest/include/OCHamcrest/HCHasCount.h diff --git a/Source/include/OCHamcrest/HCHasDescription.h b/Sources/OCHamcrest/include/OCHamcrest/HCHasDescription.h similarity index 100% rename from Source/include/OCHamcrest/HCHasDescription.h rename to Sources/OCHamcrest/include/OCHamcrest/HCHasDescription.h diff --git a/Source/include/OCHamcrest/HCHasProperty.h b/Sources/OCHamcrest/include/OCHamcrest/HCHasProperty.h similarity index 100% rename from Source/include/OCHamcrest/HCHasProperty.h rename to Sources/OCHamcrest/include/OCHamcrest/HCHasProperty.h diff --git a/Source/include/OCHamcrest/HCInvocationMatcher.h b/Sources/OCHamcrest/include/OCHamcrest/HCInvocationMatcher.h similarity index 100% rename from Source/include/OCHamcrest/HCInvocationMatcher.h rename to Sources/OCHamcrest/include/OCHamcrest/HCInvocationMatcher.h diff --git a/Source/include/OCHamcrest/HCIs.h b/Sources/OCHamcrest/include/OCHamcrest/HCIs.h similarity index 100% rename from Source/include/OCHamcrest/HCIs.h rename to Sources/OCHamcrest/include/OCHamcrest/HCIs.h diff --git a/Source/include/OCHamcrest/HCIsAnything.h b/Sources/OCHamcrest/include/OCHamcrest/HCIsAnything.h similarity index 100% rename from Source/include/OCHamcrest/HCIsAnything.h rename to Sources/OCHamcrest/include/OCHamcrest/HCIsAnything.h diff --git a/Source/include/OCHamcrest/HCIsCloseTo.h b/Sources/OCHamcrest/include/OCHamcrest/HCIsCloseTo.h similarity index 100% rename from Source/include/OCHamcrest/HCIsCloseTo.h rename to Sources/OCHamcrest/include/OCHamcrest/HCIsCloseTo.h diff --git a/Source/include/OCHamcrest/HCIsCollectionContaining.h b/Sources/OCHamcrest/include/OCHamcrest/HCIsCollectionContaining.h similarity index 100% rename from Source/include/OCHamcrest/HCIsCollectionContaining.h rename to Sources/OCHamcrest/include/OCHamcrest/HCIsCollectionContaining.h diff --git a/Source/include/OCHamcrest/HCIsCollectionContainingInAnyOrder.h b/Sources/OCHamcrest/include/OCHamcrest/HCIsCollectionContainingInAnyOrder.h similarity index 100% rename from Source/include/OCHamcrest/HCIsCollectionContainingInAnyOrder.h rename to Sources/OCHamcrest/include/OCHamcrest/HCIsCollectionContainingInAnyOrder.h diff --git a/Source/include/OCHamcrest/HCIsCollectionContainingInOrder.h b/Sources/OCHamcrest/include/OCHamcrest/HCIsCollectionContainingInOrder.h similarity index 100% rename from Source/include/OCHamcrest/HCIsCollectionContainingInOrder.h rename to Sources/OCHamcrest/include/OCHamcrest/HCIsCollectionContainingInOrder.h diff --git a/Source/include/OCHamcrest/HCIsCollectionContainingInRelativeOrder.h b/Sources/OCHamcrest/include/OCHamcrest/HCIsCollectionContainingInRelativeOrder.h similarity index 100% rename from Source/include/OCHamcrest/HCIsCollectionContainingInRelativeOrder.h rename to Sources/OCHamcrest/include/OCHamcrest/HCIsCollectionContainingInRelativeOrder.h diff --git a/Source/include/OCHamcrest/HCIsCollectionOnlyContaining.h b/Sources/OCHamcrest/include/OCHamcrest/HCIsCollectionOnlyContaining.h similarity index 100% rename from Source/include/OCHamcrest/HCIsCollectionOnlyContaining.h rename to Sources/OCHamcrest/include/OCHamcrest/HCIsCollectionOnlyContaining.h diff --git a/Source/include/OCHamcrest/HCIsDictionaryContaining.h b/Sources/OCHamcrest/include/OCHamcrest/HCIsDictionaryContaining.h similarity index 100% rename from Source/include/OCHamcrest/HCIsDictionaryContaining.h rename to Sources/OCHamcrest/include/OCHamcrest/HCIsDictionaryContaining.h diff --git a/Source/include/OCHamcrest/HCIsDictionaryContainingEntries.h b/Sources/OCHamcrest/include/OCHamcrest/HCIsDictionaryContainingEntries.h similarity index 100% rename from Source/include/OCHamcrest/HCIsDictionaryContainingEntries.h rename to Sources/OCHamcrest/include/OCHamcrest/HCIsDictionaryContainingEntries.h diff --git a/Source/include/OCHamcrest/HCIsDictionaryContainingKey.h b/Sources/OCHamcrest/include/OCHamcrest/HCIsDictionaryContainingKey.h similarity index 100% rename from Source/include/OCHamcrest/HCIsDictionaryContainingKey.h rename to Sources/OCHamcrest/include/OCHamcrest/HCIsDictionaryContainingKey.h diff --git a/Source/include/OCHamcrest/HCIsDictionaryContainingValue.h b/Sources/OCHamcrest/include/OCHamcrest/HCIsDictionaryContainingValue.h similarity index 100% rename from Source/include/OCHamcrest/HCIsDictionaryContainingValue.h rename to Sources/OCHamcrest/include/OCHamcrest/HCIsDictionaryContainingValue.h diff --git a/Source/include/OCHamcrest/HCIsEmptyCollection.h b/Sources/OCHamcrest/include/OCHamcrest/HCIsEmptyCollection.h similarity index 100% rename from Source/include/OCHamcrest/HCIsEmptyCollection.h rename to Sources/OCHamcrest/include/OCHamcrest/HCIsEmptyCollection.h diff --git a/Source/include/OCHamcrest/HCIsEqual.h b/Sources/OCHamcrest/include/OCHamcrest/HCIsEqual.h similarity index 100% rename from Source/include/OCHamcrest/HCIsEqual.h rename to Sources/OCHamcrest/include/OCHamcrest/HCIsEqual.h diff --git a/Source/include/OCHamcrest/HCIsEqualCompressingWhiteSpace.h b/Sources/OCHamcrest/include/OCHamcrest/HCIsEqualCompressingWhiteSpace.h similarity index 100% rename from Source/include/OCHamcrest/HCIsEqualCompressingWhiteSpace.h rename to Sources/OCHamcrest/include/OCHamcrest/HCIsEqualCompressingWhiteSpace.h diff --git a/Source/include/OCHamcrest/HCIsEqualIgnoringCase.h b/Sources/OCHamcrest/include/OCHamcrest/HCIsEqualIgnoringCase.h similarity index 100% rename from Source/include/OCHamcrest/HCIsEqualIgnoringCase.h rename to Sources/OCHamcrest/include/OCHamcrest/HCIsEqualIgnoringCase.h diff --git a/Source/include/OCHamcrest/HCIsEqualToNumber.h b/Sources/OCHamcrest/include/OCHamcrest/HCIsEqualToNumber.h similarity index 100% rename from Source/include/OCHamcrest/HCIsEqualToNumber.h rename to Sources/OCHamcrest/include/OCHamcrest/HCIsEqualToNumber.h diff --git a/Source/include/OCHamcrest/HCIsIn.h b/Sources/OCHamcrest/include/OCHamcrest/HCIsIn.h similarity index 100% rename from Source/include/OCHamcrest/HCIsIn.h rename to Sources/OCHamcrest/include/OCHamcrest/HCIsIn.h diff --git a/Source/include/OCHamcrest/HCIsInstanceOf.h b/Sources/OCHamcrest/include/OCHamcrest/HCIsInstanceOf.h similarity index 100% rename from Source/include/OCHamcrest/HCIsInstanceOf.h rename to Sources/OCHamcrest/include/OCHamcrest/HCIsInstanceOf.h diff --git a/Source/include/OCHamcrest/HCIsNil.h b/Sources/OCHamcrest/include/OCHamcrest/HCIsNil.h similarity index 100% rename from Source/include/OCHamcrest/HCIsNil.h rename to Sources/OCHamcrest/include/OCHamcrest/HCIsNil.h diff --git a/Source/include/OCHamcrest/HCIsNot.h b/Sources/OCHamcrest/include/OCHamcrest/HCIsNot.h similarity index 100% rename from Source/include/OCHamcrest/HCIsNot.h rename to Sources/OCHamcrest/include/OCHamcrest/HCIsNot.h diff --git a/Source/include/OCHamcrest/HCIsSame.h b/Sources/OCHamcrest/include/OCHamcrest/HCIsSame.h similarity index 100% rename from Source/include/OCHamcrest/HCIsSame.h rename to Sources/OCHamcrest/include/OCHamcrest/HCIsSame.h diff --git a/Source/include/OCHamcrest/HCIsTrueFalse.h b/Sources/OCHamcrest/include/OCHamcrest/HCIsTrueFalse.h similarity index 100% rename from Source/include/OCHamcrest/HCIsTrueFalse.h rename to Sources/OCHamcrest/include/OCHamcrest/HCIsTrueFalse.h diff --git a/Source/include/OCHamcrest/HCIsTypeOf.h b/Sources/OCHamcrest/include/OCHamcrest/HCIsTypeOf.h similarity index 100% rename from Source/include/OCHamcrest/HCIsTypeOf.h rename to Sources/OCHamcrest/include/OCHamcrest/HCIsTypeOf.h diff --git a/Source/include/OCHamcrest/HCMatcher.h b/Sources/OCHamcrest/include/OCHamcrest/HCMatcher.h similarity index 100% rename from Source/include/OCHamcrest/HCMatcher.h rename to Sources/OCHamcrest/include/OCHamcrest/HCMatcher.h diff --git a/Source/include/OCHamcrest/HCNumberAssert.h b/Sources/OCHamcrest/include/OCHamcrest/HCNumberAssert.h similarity index 100% rename from Source/include/OCHamcrest/HCNumberAssert.h rename to Sources/OCHamcrest/include/OCHamcrest/HCNumberAssert.h diff --git a/Source/include/OCHamcrest/HCOrderingComparison.h b/Sources/OCHamcrest/include/OCHamcrest/HCOrderingComparison.h similarity index 100% rename from Source/include/OCHamcrest/HCOrderingComparison.h rename to Sources/OCHamcrest/include/OCHamcrest/HCOrderingComparison.h diff --git a/Source/include/OCHamcrest/HCRequireNonNilObject.h b/Sources/OCHamcrest/include/OCHamcrest/HCRequireNonNilObject.h similarity index 100% rename from Source/include/OCHamcrest/HCRequireNonNilObject.h rename to Sources/OCHamcrest/include/OCHamcrest/HCRequireNonNilObject.h diff --git a/Source/include/OCHamcrest/HCSelfDescribing.h b/Sources/OCHamcrest/include/OCHamcrest/HCSelfDescribing.h similarity index 100% rename from Source/include/OCHamcrest/HCSelfDescribing.h rename to Sources/OCHamcrest/include/OCHamcrest/HCSelfDescribing.h diff --git a/Source/include/OCHamcrest/HCStringContains.h b/Sources/OCHamcrest/include/OCHamcrest/HCStringContains.h similarity index 100% rename from Source/include/OCHamcrest/HCStringContains.h rename to Sources/OCHamcrest/include/OCHamcrest/HCStringContains.h diff --git a/Source/include/OCHamcrest/HCStringContainsInOrder.h b/Sources/OCHamcrest/include/OCHamcrest/HCStringContainsInOrder.h similarity index 100% rename from Source/include/OCHamcrest/HCStringContainsInOrder.h rename to Sources/OCHamcrest/include/OCHamcrest/HCStringContainsInOrder.h diff --git a/Source/include/OCHamcrest/HCStringDescription.h b/Sources/OCHamcrest/include/OCHamcrest/HCStringDescription.h similarity index 100% rename from Source/include/OCHamcrest/HCStringDescription.h rename to Sources/OCHamcrest/include/OCHamcrest/HCStringDescription.h diff --git a/Source/include/OCHamcrest/HCStringEndsWith.h b/Sources/OCHamcrest/include/OCHamcrest/HCStringEndsWith.h similarity index 100% rename from Source/include/OCHamcrest/HCStringEndsWith.h rename to Sources/OCHamcrest/include/OCHamcrest/HCStringEndsWith.h diff --git a/Source/include/OCHamcrest/HCStringStartsWith.h b/Sources/OCHamcrest/include/OCHamcrest/HCStringStartsWith.h similarity index 100% rename from Source/include/OCHamcrest/HCStringStartsWith.h rename to Sources/OCHamcrest/include/OCHamcrest/HCStringStartsWith.h diff --git a/Source/include/OCHamcrest/HCSubstringMatcher.h b/Sources/OCHamcrest/include/OCHamcrest/HCSubstringMatcher.h similarity index 100% rename from Source/include/OCHamcrest/HCSubstringMatcher.h rename to Sources/OCHamcrest/include/OCHamcrest/HCSubstringMatcher.h diff --git a/Source/include/OCHamcrest/HCTestFailure.h b/Sources/OCHamcrest/include/OCHamcrest/HCTestFailure.h similarity index 100% rename from Source/include/OCHamcrest/HCTestFailure.h rename to Sources/OCHamcrest/include/OCHamcrest/HCTestFailure.h diff --git a/Source/include/OCHamcrest/HCTestFailureReporter.h b/Sources/OCHamcrest/include/OCHamcrest/HCTestFailureReporter.h similarity index 100% rename from Source/include/OCHamcrest/HCTestFailureReporter.h rename to Sources/OCHamcrest/include/OCHamcrest/HCTestFailureReporter.h diff --git a/Source/include/OCHamcrest/HCTestFailureReporterChain.h b/Sources/OCHamcrest/include/OCHamcrest/HCTestFailureReporterChain.h similarity index 100% rename from Source/include/OCHamcrest/HCTestFailureReporterChain.h rename to Sources/OCHamcrest/include/OCHamcrest/HCTestFailureReporterChain.h diff --git a/Source/include/OCHamcrest/HCThrowsException.h b/Sources/OCHamcrest/include/OCHamcrest/HCThrowsException.h similarity index 100% rename from Source/include/OCHamcrest/HCThrowsException.h rename to Sources/OCHamcrest/include/OCHamcrest/HCThrowsException.h diff --git a/Source/include/OCHamcrest/HCWrapInMatcher.h b/Sources/OCHamcrest/include/OCHamcrest/HCWrapInMatcher.h similarity index 100% rename from Source/include/OCHamcrest/HCWrapInMatcher.h rename to Sources/OCHamcrest/include/OCHamcrest/HCWrapInMatcher.h diff --git a/Source/include/OCHamcrest/OCHamcrest.h b/Sources/OCHamcrest/include/OCHamcrest/OCHamcrest.h similarity index 100% rename from Source/include/OCHamcrest/OCHamcrest.h rename to Sources/OCHamcrest/include/OCHamcrest/OCHamcrest.h From feb1b954ea35813cd61af47951d35938d94f0faa Mon Sep 17 00:00:00 2001 From: Jens Nerup Date: Thu, 23 Jan 2025 21:14:37 +0100 Subject: [PATCH 3/4] Update slather configuration Updated slather configuration to use the new Xcode project path --- .slather.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.slather.yml b/.slather.yml index 0a856dcb..2dcc0219 100644 --- a/.slather.yml +++ b/.slather.yml @@ -1,6 +1,6 @@ ci_service: github coverage_service: coveralls -xcodeproj: ./Source/OCHamcrest.xcodeproj +xcodeproj: ./Resources/OCHamcrest.xcodeproj scheme: OCHamcrest ignore: - Tests/* From 274360f0c5d0b16e452d58f27d241f747710f07d Mon Sep 17 00:00:00 2001 From: Jens Nerup Date: Fri, 24 Jan 2025 07:59:50 +0100 Subject: [PATCH 4/4] Move xcodeproj Moved xcodeproj to the root of the project and updated files that depend on the location of the project file. --- .github/workflows/build.yml | 2 +- .slather.yml | 2 +- Cartfile.project | 2 +- .../project.pbxproj | 22 ++++++++++--------- .../xcschemes/OCHamcrest.xcscheme | 0 5 files changed, 15 insertions(+), 13 deletions(-) rename {Resources/OCHamcrest.xcodeproj => OCHamcrest.xcodeproj}/project.pbxproj (99%) rename {Resources/OCHamcrest.xcodeproj => OCHamcrest.xcodeproj}/xcshareddata/xcschemes/OCHamcrest.xcscheme (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4c6acfaa..91659d5f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ concurrency: cancel-in-progress: true env: - project: Resources/OCHamcrest.xcodeproj + project: OCHamcrest.xcodeproj jobs: build: diff --git a/.slather.yml b/.slather.yml index 2dcc0219..e8314224 100644 --- a/.slather.yml +++ b/.slather.yml @@ -1,6 +1,6 @@ ci_service: github coverage_service: coveralls -xcodeproj: ./Resources/OCHamcrest.xcodeproj +xcodeproj: ./OCHamcrest.xcodeproj scheme: OCHamcrest ignore: - Tests/* diff --git a/Cartfile.project b/Cartfile.project index 2dd222a9..32c3a72b 100644 --- a/Cartfile.project +++ b/Cartfile.project @@ -1,5 +1,5 @@ OCHamcrest: - project: Resources/OCHamcrest.xcodeproj + project: OCHamcrest.xcodeproj sdks: - macosx - iphonesimulator diff --git a/Resources/OCHamcrest.xcodeproj/project.pbxproj b/OCHamcrest.xcodeproj/project.pbxproj similarity index 99% rename from Resources/OCHamcrest.xcodeproj/project.pbxproj rename to OCHamcrest.xcodeproj/project.pbxproj index 97451693..5eb9db4e 100644 --- a/Resources/OCHamcrest.xcodeproj/project.pbxproj +++ b/OCHamcrest.xcodeproj/project.pbxproj @@ -280,10 +280,10 @@ 0876035D13440AD8001B439B /* HCStringContainsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCStringContainsTests.m; sourceTree = ""; }; 0876035E13440AD8001B439B /* HCStringEndsWithTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCStringEndsWithTests.m; sourceTree = ""; }; 0876035F13440AD8001B439B /* HCStringStartsWithTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCStringStartsWithTests.m; sourceTree = ""; }; - 0876038D13440B80001B439B /* OCHamcrest-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "OCHamcrest-Info.plist"; sourceTree = ""; }; - 0876039113440BB0001B439B /* Tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Tests-Info.plist"; sourceTree = ""; }; + 0876038D13440B80001B439B /* OCHamcrest-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "OCHamcrest-Info.plist"; path = "Resources/OCHamcrest-Info.plist"; sourceTree = ""; }; + 0876039113440BB0001B439B /* Tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Tests-Info.plist"; path = "Resources/Tests-Info.plist"; sourceTree = ""; }; 088FB0AA136A6DEA00C191E1 /* HCStringContainsInOrderTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCStringContainsInOrderTests.m; sourceTree = ""; }; - 0E49BBDB1C47498C00418A3C /* XcodeWarnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = XcodeWarnings.xcconfig; sourceTree = ""; }; + 0E49BBDB1C47498C00418A3C /* XcodeWarnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = XcodeWarnings.xcconfig; path = Resources/XcodeWarnings.xcconfig; sourceTree = ""; }; 0E5ECE6B1BC20C3300C15D2A /* HCIsCollectionContainingInRelativeOrder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HCIsCollectionContainingInRelativeOrder.h; sourceTree = ""; }; 0E5ECE6C1BC20C3300C15D2A /* HCIsCollectionContainingInRelativeOrder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCIsCollectionContainingInRelativeOrder.m; sourceTree = ""; }; 31DDCB570769099D33C22810 /* HCDiagnosingMatcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCDiagnosingMatcher.m; sourceTree = ""; }; @@ -320,7 +320,7 @@ 74FDDD131A3FF39900177999 /* HCThrowsException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HCThrowsException.h; sourceTree = ""; }; 74FDDD141A3FF39900177999 /* HCThrowsException.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCThrowsException.m; sourceTree = ""; }; 77C7B8761429361200DE60CC /* HCHasPropertyTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCHasPropertyTests.m; sourceTree = ""; }; - B4E6AC952D2696DB0011C8E2 /* XcodeTargets.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = XcodeTargets.xcconfig; sourceTree = ""; }; + B4E6AC952D2696DB0011C8E2 /* XcodeTargets.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = XcodeTargets.xcconfig; path = Resources/XcodeTargets.xcconfig; sourceTree = ""; }; BB333034CD6A38647E176A9A /* HCAnyOf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HCAnyOf.h; sourceTree = ""; }; BB33303898210A59268030C8 /* HCDoubleReturnGetter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCDoubleReturnGetter.m; sourceTree = ""; }; BB333049BE335209B4207B2A /* HCIsDictionaryContaining.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCIsDictionaryContaining.m; sourceTree = ""; }; @@ -372,7 +372,7 @@ BB333522A78D6A7D1A8414B3 /* HCIsIn.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCIsIn.m; sourceTree = ""; }; BB333528C8E2ED8489ACB161 /* HCTestFailureReporter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCTestFailureReporter.m; sourceTree = ""; }; BB33355AD08369793188986F /* HCObjectReturnGetter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCObjectReturnGetter.m; sourceTree = ""; }; - BB33356A6185FA4F1B6E240F /* OCHamcrest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OCHamcrest.h; path = ../Sources/OCHamcrest/OCHamcrest.h; sourceTree = ""; }; + BB33356A6185FA4F1B6E240F /* OCHamcrest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OCHamcrest.h; path = Sources/OCHamcrest/OCHamcrest.h; sourceTree = ""; }; BB33359133039118AE88E2A8 /* HCIsNil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HCIsNil.h; sourceTree = ""; }; BB333594FB0AC2DAC3B73077 /* HCIsSame.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCIsSame.m; sourceTree = ""; }; BB3335974ADA5C5408FE0F69 /* HCStringEndsWith.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCStringEndsWith.m; sourceTree = ""; }; @@ -563,7 +563,7 @@ 609E91D3F5F10354528F7FF8 /* MatcherTestCase.m */, ); name = UnitTests; - path = ../Tests/OCHamcrestTests; + path = Tests/OCHamcrestTests; sourceTree = ""; }; 0876033413440AD8001B439B /* Collection */ = { @@ -716,7 +716,7 @@ BB33378F4CD8AE4C7EFC1CF0 /* Helpers */, ); name = Core; - path = ../Sources/OCHamcrest/Core; + path = Sources/OCHamcrest/Core; sourceTree = ""; }; BB33378F4CD8AE4C7EFC1CF0 /* Helpers */ = { @@ -833,7 +833,7 @@ BB333EA5543B2EAB4E34B3CF /* Text */, ); name = Library; - path = ../Sources/OCHamcrest/Library; + path = Sources/OCHamcrest/Library; sourceTree = ""; }; BB333EA5543B2EAB4E34B3CF /* Text */ = { @@ -1305,6 +1305,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_VERSION = A; + INFOPLIST_FILE = "$(SOURCE_ROOT)/Resources/OCHamcrest-Info.plist"; SDKROOT = macosx; SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx watchos watchsimulator xros xrsimulator"; SUPPORTS_MACCATALYST = YES; @@ -1325,6 +1326,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_VERSION = A; + INFOPLIST_FILE = "$(SOURCE_ROOT)/Resources/OCHamcrest-Info.plist"; SDKROOT = macosx; SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx watchos watchsimulator xros xrsimulator"; SUPPORTS_MACCATALYST = YES; @@ -1338,7 +1340,7 @@ baseConfigurationReference = 0E49BBDB1C47498C00418A3C /* XcodeWarnings.xcconfig */; buildSettings = { FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; - INFOPLIST_FILE = "Tests-Info.plist"; + INFOPLIST_FILE = "$(SOURCE_ROOT)/Resources/Tests-Info.plist"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; }; @@ -1349,7 +1351,7 @@ baseConfigurationReference = 0E49BBDB1C47498C00418A3C /* XcodeWarnings.xcconfig */; buildSettings = { FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; - INFOPLIST_FILE = "Tests-Info.plist"; + INFOPLIST_FILE = "$(SOURCE_ROOT)/Resources/Tests-Info.plist"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; }; diff --git a/Resources/OCHamcrest.xcodeproj/xcshareddata/xcschemes/OCHamcrest.xcscheme b/OCHamcrest.xcodeproj/xcshareddata/xcschemes/OCHamcrest.xcscheme similarity index 100% rename from Resources/OCHamcrest.xcodeproj/xcshareddata/xcschemes/OCHamcrest.xcscheme rename to OCHamcrest.xcodeproj/xcshareddata/xcschemes/OCHamcrest.xcscheme