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.

Author: barkoded

.github/workflows/build.yml

@@ -12,7 +12,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  project: Source/OCHamcrest.xcodeproj
+  project: Resources/OCHamcrest.xcodeproj
 
 jobs:
   build:

Cartfile.project

@@ -1,5 +1,5 @@
 OCHamcrest:
-  project: Source/OCHamcrest.xcodeproj
+  project: Resources/OCHamcrest.xcodeproj
   sdks:
   - macosx
   - iphonesimulator

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("."),
             ]

Source/MakeDistribution.sh renamed to Resources/MakeDistribution.sh

@@ -281,7 +281,7 @@
 		0876035E13440AD8001B439B /* HCStringEndsWithTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCStringEndsWithTests.m; sourceTree = "<group>"; };
 		0876035F13440AD8001B439B /* HCStringStartsWithTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCStringStartsWithTests.m; sourceTree = "<group>"; };
 		0876038D13440B80001B439B /* OCHamcrest-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "OCHamcrest-Info.plist"; sourceTree = "<group>"; };
-		0876039113440BB0001B439B /* Tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Tests-Info.plist"; path = "../Tests/OCHamcrestTests/Resources/Tests-Info.plist"; sourceTree = "<group>"; };
+		0876039113440BB0001B439B /* Tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Tests-Info.plist"; sourceTree = "<group>"; };
 		088FB0AA136A6DEA00C191E1 /* HCStringContainsInOrderTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCStringContainsInOrderTests.m; sourceTree = "<group>"; };
 		0E49BBDB1C47498C00418A3C /* XcodeWarnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = XcodeWarnings.xcconfig; sourceTree = "<group>"; };
 		0E5ECE6B1BC20C3300C15D2A /* HCIsCollectionContainingInRelativeOrder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HCIsCollectionContainingInRelativeOrder.h; sourceTree = "<group>"; };
@@ -372,7 +372,7 @@
 		BB333522A78D6A7D1A8414B3 /* HCIsIn.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCIsIn.m; sourceTree = "<group>"; };
 		BB333528C8E2ED8489ACB161 /* HCTestFailureReporter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCTestFailureReporter.m; sourceTree = "<group>"; };
 		BB33355AD08369793188986F /* HCObjectReturnGetter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCObjectReturnGetter.m; sourceTree = "<group>"; };
-		BB33356A6185FA4F1B6E240F /* OCHamcrest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCHamcrest.h; sourceTree = "<group>"; };
+		BB33356A6185FA4F1B6E240F /* OCHamcrest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OCHamcrest.h; path = ../Source/OCHamcrest.h; sourceTree = "<group>"; };
 		BB33359133039118AE88E2A8 /* HCIsNil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HCIsNil.h; sourceTree = "<group>"; };
 		BB333594FB0AC2DAC3B73077 /* HCIsSame.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCIsSame.m; sourceTree = "<group>"; };
 		BB3335974ADA5C5408FE0F69 /* HCStringEndsWith.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HCStringEndsWith.m; sourceTree = "<group>"; };
@@ -715,7 +715,8 @@
 				BB333D43717AD7243D63A4AB /* HCStringDescription.m */,
 				BB33378F4CD8AE4C7EFC1CF0 /* Helpers */,
 			);
-			path = Core;
+			name = Core;
+			path = ../Source/Core;
 			sourceTree = "<group>";
 		};
 		BB33378F4CD8AE4C7EFC1CF0 /* Helpers */ = {
@@ -831,7 +832,8 @@
 				BB333072EBF64C385754421B /* Object */,
 				BB333EA5543B2EAB4E34B3CF /* Text */,
 			);
-			path = Library;
+			name = Library;
+			path = ../Source/Library;
 			sourceTree = "<group>";
 		};
 		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;
 			};

Source/OCHamcrest-Info.plist renamed to Resources/OCHamcrest-Info.plist

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1420"
-   version = "1.3">
+   LastUpgradeVersion = "1600"
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
@@ -24,19 +25,10 @@
    </BuildAction>
    <TestAction
       buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = ""
-      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "087601E113440806001B439B"
-            BuildableName = "OCHamcrest.framework"
-            BlueprintName = "OCHamcrest"
-            ReferencedContainer = "container:OCHamcrest.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
+      shouldAutocreateTestPlan = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -60,15 +52,6 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "087601E113440806001B439B"
-            BuildableName = "OCHamcrest.framework"
-            BlueprintName = "OCHamcrest"
-            ReferencedContainer = "container:OCHamcrest.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"