Revisit how the WKTs are bundled with ObjC. 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 (#6464)" This reverts commit 479ba8226bed9c0986693f240c4d6f72dc2d0368. - 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 #6803
diff --git a/Protobuf.podspec b/Protobuf.podspec index 6de36e0..0371b7b 100644 --- a/Protobuf.podspec +++ b/Protobuf.podspec
@@ -12,21 +12,20 @@ s.authors = { 'The Protocol Buffers contributors' => 'protobuf@googlegroups.com' } s.cocoapods_version = '>= 1.0' - s.module_name = 'protobuf' s.source = { :git => 'https://github.com/protocolbuffers/protobuf.git', :tag => "v#{s.version}" } s.source_files = 'objectivec/*.{h,m}', - 'objectivec/google/protobuf/Any.pbobjc.{h,m}', - 'objectivec/google/protobuf/Api.pbobjc.{h,m}', - 'objectivec/google/protobuf/Duration.pbobjc.{h,m}', - 'objectivec/google/protobuf/Empty.pbobjc.{h,m}', - 'objectivec/google/protobuf/FieldMask.pbobjc.{h,m}', - 'objectivec/google/protobuf/SourceContext.pbobjc.{h,m}', - 'objectivec/google/protobuf/Struct.pbobjc.{h,m}', - 'objectivec/google/protobuf/Timestamp.pbobjc.{h,m}', - 'objectivec/google/protobuf/Type.pbobjc.{h,m}', - 'objectivec/google/protobuf/Wrappers.pbobjc.{h,m}' + 'objectivec/google/protobuf/Any.pbobjc.h', + 'objectivec/google/protobuf/Api.pbobjc.h', + 'objectivec/google/protobuf/Duration.pbobjc.h', + 'objectivec/google/protobuf/Empty.pbobjc.h', + 'objectivec/google/protobuf/FieldMask.pbobjc.h', + 'objectivec/google/protobuf/SourceContext.pbobjc.h', + 'objectivec/google/protobuf/Struct.pbobjc.h', + 'objectivec/google/protobuf/Timestamp.pbobjc.h', + 'objectivec/google/protobuf/Type.pbobjc.h', + 'objectivec/google/protobuf/Wrappers.pbobjc.h' # The following would cause duplicate symbol definitions. GPBProtocolBuffers is expected to be # left out, as it's an umbrella implementation file. s.exclude_files = 'objectivec/GPBProtocolBuffers.m'