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

CBL-4648 : Use Swift Private Module Map for ObjC headers #3214

Merged
merged 1 commit into from
Jan 22, 2024
Merged

Conversation

pasin
Copy link
Contributor

@pasin pasin commented Jan 20, 2024

  • Used Swift Private Module Map for the ObjC headers instead of using a hack by putting the ObjC headers which are supposed to be private in the main module map file and using the post-processing script (remote_private_headers.sh) to remove them after build. (Ref : https://clang.llvm.org/docs/Modules.html#private-module-map-files)

  • Removed the main handcrafted CouchbaseLiteSwift.modulemap and CouchbaseLiteSwift-EE.modulemap and let XCode generates them instead.

  • Removed remove_private_headers.sh and also the build phrase step that calls the script from the project.

  • Fixed build_xcframework.sh when running the script with relative out directory path (xcodebuild -create-xcframework requires absolute paths for the dSYM directory).

  • Changed file mode of all scripts in Scripts to be executable.

  • Companion PR : https://github.com/couchbaselabs/couchbase-lite-ios-ee/pull/194

* Used Swift Private Module Map for the ObjC headers instead of putting the ObjC headers that are supposed to be private in the main module map file and use the post-processing script (remote_private_headers.sh) to remove the headers after build.

* Removed the main handcrafted CouchbaseLiteSwift.modulemap and CouchbaseLiteSwift-EE.modulemap and let XCode generates them instead.

* Removed remove_private_headers.sh and also the build phrase step that calls the script from the project.

* Fixed build_xcframework.sh when running the script with relative out directory path (xcodebuild -create-xcframework requires absolute paths for the dSYM directory).

* Changed file mode of all scripts in Scripts to be executable.
@pasin pasin requested a review from velicuvlad January 20, 2024 07:44
@pasin pasin merged commit fe1fa57 into master Jan 22, 2024
9 checks passed
@pasin pasin deleted the task/CBL-4648 branch January 22, 2024 18:33
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.

2 participants