Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move source code #99

Open
wants to merge 4 commits into
base: main
Choose a base branch
from

Conversation

barkoded
Copy link
Contributor

@barkoded barkoded commented Jan 23, 2025

This pull request completes the transition to the default SPM folder layout. All files related to Xcode have been moved into the Resources folder which is located in the root of the project. We could consider deleting all the symlinks in the include folder and then move the actual header files to the include folder (but we can keep it as is for now).

The end-result will look like:

image

BTW Is there something we need to do for Carthage? I was looking at the OCHamcrest.h file and noticed this:

// Carthage workaround: Include transitive public headers
#import <OCHamcrest/HCBaseDescription.h>
#import <OCHamcrest/HCCollect.h>
#import <OCHamcrest/HCRequireNonNilObject.h>
#import <OCHamcrest/HCStringDescription.h>
#import <OCHamcrest/HCWrapInMatcher.h>

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.
Moved all source code from the Source folder to Sources/OCHamcrest. Updated Package.swift and Xcode to reflect the folder change.
Updated slather configuration to use the new Xcode project path
@coveralls
Copy link

coveralls commented Jan 23, 2025

Coverage Status

coverage: 99.158%. remained the same
when pulling 274360f on barkoded:feature/move-source-folder
into a30e456 on hamcrest:main.

@jonreid
Copy link
Member

jonreid commented Jan 24, 2025

Hmm. I like everything in Resources except for the xcodeproj. What do you think about moving that to the root?

@barkoded
Copy link
Contributor Author

I was actually considering the same. I'll move the xcodeproj to the root.

@barkoded barkoded force-pushed the feature/move-source-folder branch from f15376c to b4d0c98 Compare January 24, 2025 07:01
Moved xcodeproj to the root of the project and updated files that depend on the location of the project file.
@barkoded barkoded force-pushed the feature/move-source-folder branch from b4d0c98 to 274360f Compare January 24, 2025 07:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants