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

Simplify imports of the WKTs within the library itself. #9565

Merged
merged 1 commit into from Mar 1, 2022

Commits on Mar 1, 2022

  1. Simplify imports of the WKTs within the library itself.

    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 committed Mar 1, 2022
    Configuration menu
    Copy the full SHA
    9e58bb3 View commit details
    Browse the repository at this point in the history