Revisit how the WKTs are bundled with ObjC. #7173
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
thomasvl
force-pushed
the
objc_flatten_wkt_paths
branch
from
3bfa36f to
a305224
Compare
dmaclach
approved these changes
Feb 6, 2020
There are have been a few issues around people using case sensitive file systems what Xcode/clang does when looking at the paths. In attempts to solve one set of warnings, new warnings/errors happened in different setup. So, to hopefully put these problem away for got, move the WKTs to be at the same level as the other headers. - Revert "Override CocoaPods module to lowercase (protocolbuffers#6464)" This reverts commit 479ba82. - Move WKTs to the objectivec directory and make the old headers shim back to the new locations. - Update objectivec/generate_well_known_types.sh to check them one at a time and to deal with the new locations for them. Fixes protocolbuffers#6803
thomasvl
force-pushed
the
objc_flatten_wkt_paths
branch
from
a305224 to
6b4b28c
Compare
This was referenced May 20, 2020
thomasvl
added a commit
to thomasvl/protobuf
that referenced
this pull request
Mar 1, 2022
Overdue followup to protocolbuffers#7173 Since all the files are at the same level as the runtime headers, there is no need for things to be framework based imports, they should all just work like the other headers do. - Directly generate the bundled header imports into the preamble section when generating for a bundled proto. - Update the preamble generation to skip the CPP wrapper when generating for a bundled proto file. - Regenerate the WKTs. - Update GPBProtocolBuffer.h to also skip the CPP wrapping.
thomasvl
added a commit
to thomasvl/protobuf
that referenced
this pull request
Mar 1, 2022
Overdue followup to protocolbuffers#7173 Since all the files are at the same level as the runtime headers, there is no need for things to be framework based imports, they should all just work like the other headers do. - Directly generate the bundled header imports into the preamble section when generating for a bundled proto. - Update the preamble generation to skip the CPP wrapper when generating for a bundled proto file. - Regenerate the WKTs. - Update GPBProtocolBuffer.h to also skip the CPP wrapping. GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS in the podspec and non bundled files still has to exist because that comes into play for those files to find the runtime headers.
thomasvl
added a commit
to thomasvl/protobuf
that referenced
this pull request
Mar 1, 2022
Overdue followup to protocolbuffers#7173 Since all the files are at the same level as the runtime headers, there is no need for things to be framework based imports, they should all just work like the other headers do. - Directly generate the bundled header imports into the preamble section when generating for a bundled proto. - Update the preamble generation to skip the CPP wrapper when generating for a bundled proto file. - Regenerate the WKTs. - Update GPBProtocolBuffer.h/GPBWellKnownTypes.h to also skip the CPP wrapping. GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS in the podspec and non bundled files still has to exist because that comes into play for those files to find the runtime headers.
thomasvl
added a commit
to thomasvl/protobuf
that referenced
this pull request
Mar 1, 2022
Overdue followup to protocolbuffers#7173 Since all the files are at the same level as the runtime headers, there is no need for things to be framework based imports, they should all just work like the other headers do. - Directly generate the bundled header imports into the preamble section when generating for a bundled proto. - Update the preamble generation to skip the CPP wrapper when generating for a bundled proto file. - Regenerate the WKTs. - Update GPBProtocolBuffer.h/GPBWellKnownTypes.h to also skip the CPP wrapping. GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS in the podspec and non bundled files still has to exist because that comes into play for those files to find the runtime headers.
thomasvl
added a commit
to thomasvl/protobuf
that referenced
this pull request
Mar 1, 2022
Overdue followup to protocolbuffers#7173 Since all the files are at the same level as the runtime headers, there is no need for things to be framework based imports, they should all just work like the other headers do. - Directly generate the bundled header imports into the preamble section when generating for a bundled proto. - Update the preamble generation to skip the CPP wrapper when generating for a bundled proto file. - Regenerate the WKTs. - Update GPBProtocolBuffer.h/GPBWellKnownTypes.h to also skip the CPP wrapping. GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS in the podspec and non bundled files still has to exist because that comes into play for those files to find the runtime headers.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There are have been a few issues around people using case sensitive file systems
what Xcode/clang does when looking at the paths. In attempts to solve one set of
warnings, new warnings/errors happened in different setup. So, to hopefully put
these problem away for got, move the WKTs to be at the same level as the other
headers.
This reverts commit 479ba82.
the new locations.
and to deal with the new locations for them.