Skip to content

Commit 274360f

Browse files
committed
Move xcodeproj
Moved xcodeproj to the root of the project and updated files that depend on the location of the project file.
1 parent feb1b95 commit 274360f

File tree

5 files changed

+15
-13
lines changed

5 files changed

+15
-13
lines changed

.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ concurrency:
1212
cancel-in-progress: true
1313

1414
env:
15-
project: Resources/OCHamcrest.xcodeproj
15+
project: OCHamcrest.xcodeproj
1616

1717
jobs:
1818
build:

.slather.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ci_service: github
22
coverage_service: coveralls
3-
xcodeproj: ./Resources/OCHamcrest.xcodeproj
3+
xcodeproj: ./OCHamcrest.xcodeproj
44
scheme: OCHamcrest
55
ignore:
66
- Tests/*

Cartfile.project

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
OCHamcrest:
2-
project: Resources/OCHamcrest.xcodeproj
2+
project: OCHamcrest.xcodeproj
33
sdks:
44
- macosx
55
- iphonesimulator

Resources/OCHamcrest.xcodeproj/project.pbxproj renamed to OCHamcrest.xcodeproj/project.pbxproj

+12-10
Original file line numberDiff line numberDiff line change
@@ -280,10 +280,10 @@
280280
0876035D13440AD8001B439B /* HCStringContainsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCStringContainsTests.m; sourceTree = "<group>"; };
281281
0876035E13440AD8001B439B /* HCStringEndsWithTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCStringEndsWithTests.m; sourceTree = "<group>"; };
282282
0876035F13440AD8001B439B /* HCStringStartsWithTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCStringStartsWithTests.m; sourceTree = "<group>"; };
283-
0876038D13440B80001B439B /* OCHamcrest-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "OCHamcrest-Info.plist"; sourceTree = "<group>"; };
284-
0876039113440BB0001B439B /* Tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Tests-Info.plist"; sourceTree = "<group>"; };
283+
0876038D13440B80001B439B /* OCHamcrest-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "OCHamcrest-Info.plist"; path = "Resources/OCHamcrest-Info.plist"; sourceTree = "<group>"; };
284+
0876039113440BB0001B439B /* Tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Tests-Info.plist"; path = "Resources/Tests-Info.plist"; sourceTree = "<group>"; };
285285
088FB0AA136A6DEA00C191E1 /* HCStringContainsInOrderTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCStringContainsInOrderTests.m; sourceTree = "<group>"; };
286-
0E49BBDB1C47498C00418A3C /* XcodeWarnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = XcodeWarnings.xcconfig; sourceTree = "<group>"; };
286+
0E49BBDB1C47498C00418A3C /* XcodeWarnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = XcodeWarnings.xcconfig; path = Resources/XcodeWarnings.xcconfig; sourceTree = "<group>"; };
287287
0E5ECE6B1BC20C3300C15D2A /* HCIsCollectionContainingInRelativeOrder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HCIsCollectionContainingInRelativeOrder.h; sourceTree = "<group>"; };
288288
0E5ECE6C1BC20C3300C15D2A /* HCIsCollectionContainingInRelativeOrder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCIsCollectionContainingInRelativeOrder.m; sourceTree = "<group>"; };
289289
31DDCB570769099D33C22810 /* HCDiagnosingMatcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCDiagnosingMatcher.m; sourceTree = "<group>"; };
@@ -320,7 +320,7 @@
320320
74FDDD131A3FF39900177999 /* HCThrowsException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HCThrowsException.h; sourceTree = "<group>"; };
321321
74FDDD141A3FF39900177999 /* HCThrowsException.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCThrowsException.m; sourceTree = "<group>"; };
322322
77C7B8761429361200DE60CC /* HCHasPropertyTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCHasPropertyTests.m; sourceTree = "<group>"; };
323-
B4E6AC952D2696DB0011C8E2 /* XcodeTargets.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = XcodeTargets.xcconfig; sourceTree = "<group>"; };
323+
B4E6AC952D2696DB0011C8E2 /* XcodeTargets.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = XcodeTargets.xcconfig; path = Resources/XcodeTargets.xcconfig; sourceTree = "<group>"; };
324324
BB333034CD6A38647E176A9A /* HCAnyOf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HCAnyOf.h; sourceTree = "<group>"; };
325325
BB33303898210A59268030C8 /* HCDoubleReturnGetter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCDoubleReturnGetter.m; sourceTree = "<group>"; };
326326
BB333049BE335209B4207B2A /* HCIsDictionaryContaining.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCIsDictionaryContaining.m; sourceTree = "<group>"; };
@@ -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 = ../Sources/OCHamcrest/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>"; };
@@ -563,7 +563,7 @@
563563
609E91D3F5F10354528F7FF8 /* MatcherTestCase.m */,
564564
);
565565
name = UnitTests;
566-
path = ../Tests/OCHamcrestTests;
566+
path = Tests/OCHamcrestTests;
567567
sourceTree = "<group>";
568568
};
569569
0876033413440AD8001B439B /* Collection */ = {
@@ -716,7 +716,7 @@
716716
BB33378F4CD8AE4C7EFC1CF0 /* Helpers */,
717717
);
718718
name = Core;
719-
path = ../Sources/OCHamcrest/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 = ../Sources/OCHamcrest/Library;
836+
path = Sources/OCHamcrest/Library;
837837
sourceTree = "<group>";
838838
};
839839
BB333EA5543B2EAB4E34B3CF /* Text */ = {
@@ -1305,6 +1305,7 @@
13051305
DYLIB_COMPATIBILITY_VERSION = 1;
13061306
DYLIB_CURRENT_VERSION = 1;
13071307
FRAMEWORK_VERSION = A;
1308+
INFOPLIST_FILE = "$(SOURCE_ROOT)/Resources/OCHamcrest-Info.plist";
13081309
SDKROOT = macosx;
13091310
SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx watchos watchsimulator xros xrsimulator";
13101311
SUPPORTS_MACCATALYST = YES;
@@ -1325,6 +1326,7 @@
13251326
DYLIB_COMPATIBILITY_VERSION = 1;
13261327
DYLIB_CURRENT_VERSION = 1;
13271328
FRAMEWORK_VERSION = A;
1329+
INFOPLIST_FILE = "$(SOURCE_ROOT)/Resources/OCHamcrest-Info.plist";
13281330
SDKROOT = macosx;
13291331
SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx watchos watchsimulator xros xrsimulator";
13301332
SUPPORTS_MACCATALYST = YES;
@@ -1338,7 +1340,7 @@
13381340
baseConfigurationReference = 0E49BBDB1C47498C00418A3C /* XcodeWarnings.xcconfig */;
13391341
buildSettings = {
13401342
FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
1341-
INFOPLIST_FILE = "Tests-Info.plist";
1343+
INFOPLIST_FILE = "$(SOURCE_ROOT)/Resources/Tests-Info.plist";
13421344
PRODUCT_NAME = "$(TARGET_NAME)";
13431345
SDKROOT = macosx;
13441346
};
@@ -1349,7 +1351,7 @@
13491351
baseConfigurationReference = 0E49BBDB1C47498C00418A3C /* XcodeWarnings.xcconfig */;
13501352
buildSettings = {
13511353
FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
1352-
INFOPLIST_FILE = "Tests-Info.plist";
1354+
INFOPLIST_FILE = "$(SOURCE_ROOT)/Resources/Tests-Info.plist";
13531355
PRODUCT_NAME = "$(TARGET_NAME)";
13541356
SDKROOT = macosx;
13551357
};

0 commit comments

Comments
 (0)