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

Do not symlink headers that belong to test specs #7762

Merged
merged 1 commit into from May 22, 2018

Conversation

dnkoutso
Copy link
Contributor

@dnkoutso dnkoutso commented May 21, 2018

  • make sure there is an integration spec for test specs, there might be one already but I want to double check

@dnkoutso dnkoutso added this to the 1.6.0 milestone May 21, 2018
@dnkoutso dnkoutso requested a review from segiddins May 21, 2018 16:57
@dnkoutso
Copy link
Contributor Author

Talked offline, need to remove from private folder too and rely on header maps instead to make the "magic" work.

/cc @paulb777 if you have any suggestions about this.

@dnkoutso
Copy link
Contributor Author

relying on header maps slightly scares me...but its a high cost to move the test headers under different folders etc.

@dnkoutso dnkoutso force-pushed the no_symlink_public_test_headers branch from eea4b5e to 053c916 Compare May 21, 2018 17:38
@dnkoutso dnkoutso changed the title Do not symlink public headers that belong to test specs Do not symlink headers that belong to test specs May 21, 2018
Copy link
Member

@segiddins segiddins left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CHANGELOG

coconut_test_spec = coconut_spec.test_specs.first
coconut_pod_target = fixture_pod_target_with_specs([coconut_spec, coconut_test_spec], false)
public_headers_root = config.sandbox.public_headers.root
private_headers_root = @pod_target.build_headers.root
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

whoops this should coconut_pod_target still worked though cause its the same path.

@dnkoutso dnkoutso force-pushed the no_symlink_public_test_headers branch 2 times, most recently from 82c06c3 to 12e13ff Compare May 21, 2018 23:34
@dnkoutso dnkoutso force-pushed the no_symlink_public_test_headers branch from 12e13ff to ca6e928 Compare May 21, 2018 23:51
@dnkoutso
Copy link
Contributor Author

p.s this change only affects static libs and test specs.

@dnkoutso
Copy link
Contributor Author

There is an integration spec but does not have headers...will update that first before merging this.

@dnkoutso
Copy link
Contributor Author

Actually this is OK to land. Test xcconfigs still receive the header search paths for their library anyway. This continues to work as expected and removes the symlinks from test specs. Makes it even better because other libraries cannot accidentally import these headers!

@dnkoutso dnkoutso merged commit 4f8ffc7 into CocoaPods:master May 22, 2018
@dnkoutso dnkoutso deleted the no_symlink_public_test_headers branch May 22, 2018 18:17
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.

None yet

2 participants