Skip to content

Commit 86b9c95

Browse files
committed
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.
1 parent 032f0ed commit 86b9c95

File tree

217 files changed

+8
-10
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

217 files changed

+8
-10
lines changed

OCHamcrest.podspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Pod::Spec.new do |s|
3535
s.watchos.deployment_target = '4.0'
3636
s.visionos.deployment_target = '1.0'
3737
s.source = { :git => 'https://github.com/hamcrest/OCHamcrest.git', :tag => 'v9.0.3' }
38-
s.source_files = 'Source/OCHamcrest.h', 'Source/Core/**/*.{h,m}', 'Source/Library/**/*.{h,m}'
39-
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'
38+
s.source_files = 'Sources/OCHamcrest/OCHamcrest.h', 'Sources/OCHamcrest/Core/**/*.{h,m}', 'Sources/OCHamcrest/Library/**/*.{h,m}'
39+
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'
4040
s.requires_arc = true
4141
end

Package.swift

+3-5
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,10 @@ let package = Package(
1818
targets: [
1919
.target(
2020
name: "OCHamcrest",
21-
path: "Source",
22-
publicHeadersPath: "include",
2321
cSettings: [
24-
CSetting.headerSearchPath("./Core/Helpers"),
25-
CSetting.headerSearchPath("./Core/Helpers/ReturnValueGetters"),
26-
CSetting.headerSearchPath("./Core/Helpers/TestFailureReporters"),
22+
.headerSearchPath("./Core/Helpers"),
23+
.headerSearchPath("./Core/Helpers/ReturnValueGetters"),
24+
.headerSearchPath("./Core/Helpers/TestFailureReporters"),
2725
]
2826
),
2927
.testTarget(

Resources/OCHamcrest.xcodeproj/project.pbxproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@
372372
BB333522A78D6A7D1A8414B3 /* HCIsIn.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCIsIn.m; sourceTree = "<group>"; };
373373
BB333528C8E2ED8489ACB161 /* HCTestFailureReporter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCTestFailureReporter.m; sourceTree = "<group>"; };
374374
BB33355AD08369793188986F /* HCObjectReturnGetter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCObjectReturnGetter.m; sourceTree = "<group>"; };
375-
BB33356A6185FA4F1B6E240F /* OCHamcrest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OCHamcrest.h; path = ../Source/OCHamcrest.h; sourceTree = "<group>"; };
375+
BB33356A6185FA4F1B6E240F /* OCHamcrest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OCHamcrest.h; path = ../Sources/OCHamcrest/OCHamcrest.h; sourceTree = "<group>"; };
376376
BB33359133039118AE88E2A8 /* HCIsNil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HCIsNil.h; sourceTree = "<group>"; };
377377
BB333594FB0AC2DAC3B73077 /* HCIsSame.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCIsSame.m; sourceTree = "<group>"; };
378378
BB3335974ADA5C5408FE0F69 /* HCStringEndsWith.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCStringEndsWith.m; sourceTree = "<group>"; };
@@ -716,7 +716,7 @@
716716
BB33378F4CD8AE4C7EFC1CF0 /* Helpers */,
717717
);
718718
name = Core;
719-
path = ../Source/Core;
719+
path = ../Sources/OCHamcrest/Core;
720720
sourceTree = "<group>";
721721
};
722722
BB33378F4CD8AE4C7EFC1CF0 /* Helpers */ = {
@@ -833,7 +833,7 @@
833833
BB333EA5543B2EAB4E34B3CF /* Text */,
834834
);
835835
name = Library;
836-
path = ../Source/Library;
836+
path = ../Sources/OCHamcrest/Library;
837837
sourceTree = "<group>";
838838
};
839839
BB333EA5543B2EAB4E34B3CF /* Text */ = {
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)