Skip to content
Permalink
Browse files

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 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 #6803
  • Loading branch information
thomasvl committed Jan 22, 2020
1 parent 7e0a081 commit 56c48ae59267d27cee5cfacd732b8a706993fea0
Showing with 2,449 additions and 2,408 deletions.
  1. +20 −10 Makefile.am
  2. +10 −11 Protobuf.podspec
  3. +183 −0 objectivec/GPBAny.pbobjc.h
  4. +3 −3 objectivec/{google/protobuf/Any.pbobjc.m → GPBAny.pbobjc.m}
  5. +311 −0 objectivec/GPBApi.pbobjc.h
  6. +7 −7 objectivec/{google/protobuf/Api.pbobjc.m → GPBApi.pbobjc.m}
  7. +145 −0 objectivec/GPBDuration.pbobjc.h
  8. +3 −3 objectivec/{google/protobuf/Duration.pbobjc.m → GPBDuration.pbobjc.m}
  9. +74 −0 objectivec/GPBEmpty.pbobjc.h
  10. +3 −3 objectivec/{google/protobuf/Empty.pbobjc.m → GPBEmpty.pbobjc.m}
  11. +273 −0 objectivec/GPBFieldMask.pbobjc.h
  12. +3 −3 objectivec/{google/protobuf/FieldMask.pbobjc.m → GPBFieldMask.pbobjc.m}
  13. +20 −20 objectivec/GPBProtocolBuffers.h
  14. +10 −10 objectivec/GPBProtocolBuffers.m
  15. +77 −0 objectivec/GPBSourceContext.pbobjc.h
  16. +3 −3 objectivec/{google/protobuf/SourceContext.pbobjc.m → GPBSourceContext.pbobjc.m}
  17. +204 −0 objectivec/GPBStruct.pbobjc.h
  18. +3 −3 objectivec/{google/protobuf/Struct.pbobjc.m → GPBStruct.pbobjc.m}
  19. +167 −0 objectivec/GPBTimestamp.pbobjc.h
  20. +3 −3 objectivec/{google/protobuf/Timestamp.pbobjc.m → GPBTimestamp.pbobjc.m}
  21. +444 −0 objectivec/GPBType.pbobjc.h
  22. +7 −7 objectivec/{google/protobuf/Type.pbobjc.m → GPBType.pbobjc.m}
  23. +6 −6 objectivec/GPBWellKnownTypes.h
  24. +219 −0 objectivec/GPBWrappers.pbobjc.h
  25. +3 −3 objectivec/{google/protobuf/Wrappers.pbobjc.m → GPBWrappers.pbobjc.m}
  26. +60 −60 objectivec/ProtocolBuffers_OSX.xcodeproj/project.pbxproj
  27. +60 −60 objectivec/ProtocolBuffers_iOS.xcodeproj/project.pbxproj
  28. +60 −60 objectivec/ProtocolBuffers_tvOS.xcodeproj/project.pbxproj
  29. +1 −1 objectivec/Tests/GPBCompileTest14.m
  30. +1 −1 objectivec/Tests/GPBCompileTest15.m
  31. +1 −1 objectivec/Tests/GPBCompileTest16.m
  32. +1 −1 objectivec/Tests/GPBCompileTest17.m
  33. +1 −1 objectivec/Tests/GPBCompileTest18.m
  34. +1 −1 objectivec/Tests/GPBCompileTest19.m
  35. +1 −1 objectivec/Tests/GPBCompileTest20.m
  36. +1 −1 objectivec/Tests/GPBCompileTest21.m
  37. +1 −1 objectivec/Tests/GPBCompileTest22.m
  38. +1 −1 objectivec/Tests/GPBCompileTest23.m
  39. +32 −19 objectivec/generate_well_known_types.sh
  40. +2 −183 objectivec/google/protobuf/Any.pbobjc.h
  41. +2 −311 objectivec/google/protobuf/Api.pbobjc.h
  42. +2 −145 objectivec/google/protobuf/Duration.pbobjc.h
  43. +2 −74 objectivec/google/protobuf/Empty.pbobjc.h
  44. +2 −273 objectivec/google/protobuf/FieldMask.pbobjc.h
  45. +2 −77 objectivec/google/protobuf/SourceContext.pbobjc.h
  46. +2 −204 objectivec/google/protobuf/Struct.pbobjc.h
  47. +2 −167 objectivec/google/protobuf/Timestamp.pbobjc.h
  48. +2 −444 objectivec/google/protobuf/Type.pbobjc.h
  49. +2 −219 objectivec/google/protobuf/Wrappers.pbobjc.h
  50. +6 −7 src/google/protobuf/compiler/objectivec/objectivec_helpers.cc
@@ -538,25 +538,19 @@ objectivec_EXTRA_DIST= \
objectivec/DevTools/pddm_tests.py \
objectivec/generate_well_known_types.sh \
objectivec/google/protobuf/Any.pbobjc.h \
objectivec/google/protobuf/Any.pbobjc.m \
objectivec/google/protobuf/Api.pbobjc.h \
objectivec/google/protobuf/Api.pbobjc.m \
objectivec/google/protobuf/Duration.pbobjc.h \
objectivec/google/protobuf/Duration.pbobjc.m \
objectivec/google/protobuf/Empty.pbobjc.h \
objectivec/google/protobuf/Empty.pbobjc.m \
objectivec/google/protobuf/FieldMask.pbobjc.h \
objectivec/google/protobuf/FieldMask.pbobjc.m \
objectivec/google/protobuf/SourceContext.pbobjc.h \
objectivec/google/protobuf/SourceContext.pbobjc.m \
objectivec/google/protobuf/Struct.pbobjc.h \
objectivec/google/protobuf/Struct.pbobjc.m \
objectivec/google/protobuf/Timestamp.pbobjc.h \
objectivec/google/protobuf/Timestamp.pbobjc.m \
objectivec/google/protobuf/Type.pbobjc.h \
objectivec/google/protobuf/Type.pbobjc.m \
objectivec/google/protobuf/Wrappers.pbobjc.h \
objectivec/google/protobuf/Wrappers.pbobjc.m \
objectivec/GPBAny.pbobjc.h \
objectivec/GPBAny.pbobjc.m \
objectivec/GPBApi.pbobjc.h \
objectivec/GPBApi.pbobjc.m \
objectivec/GPBArray.h \
objectivec/GPBArray.m \
objectivec/GPBArray_PackagePrivate.h \
@@ -573,10 +567,16 @@ objectivec_EXTRA_DIST= \
objectivec/GPBDictionary.h \
objectivec/GPBDictionary.m \
objectivec/GPBDictionary_PackagePrivate.h \
objectivec/GPBDuration.pbobjc.h \
objectivec/GPBDuration.pbobjc.m \
objectivec/GPBEmpty.pbobjc.h \
objectivec/GPBEmpty.pbobjc.m \
objectivec/GPBExtensionInternals.h \
objectivec/GPBExtensionInternals.m \
objectivec/GPBExtensionRegistry.h \
objectivec/GPBExtensionRegistry.m \
objectivec/GPBFieldMask.pbobjc.h \
objectivec/GPBFieldMask.pbobjc.m \
objectivec/GPBMessage.h \
objectivec/GPBMessage.m \
objectivec/GPBMessage_PackagePrivate.h \
@@ -587,6 +587,14 @@ objectivec_EXTRA_DIST= \
objectivec/GPBRootObject.m \
objectivec/GPBRootObject_PackagePrivate.h \
objectivec/GPBRuntimeTypes.h \
objectivec/GPBSourceContext.pbobjc.h \
objectivec/GPBSourceContext.pbobjc.m \
objectivec/GPBStruct.pbobjc.h \
objectivec/GPBStruct.pbobjc.m \
objectivec/GPBTimestamp.pbobjc.h \
objectivec/GPBTimestamp.pbobjc.m \
objectivec/GPBType.pbobjc.h \
objectivec/GPBType.pbobjc.m \
objectivec/GPBUnknownField.h \
objectivec/GPBUnknownField.m \
objectivec/GPBUnknownField_PackagePrivate.h \
@@ -600,6 +608,8 @@ objectivec_EXTRA_DIST= \
objectivec/GPBWellKnownTypes.m \
objectivec/GPBWireFormat.h \
objectivec/GPBWireFormat.m \
objectivec/GPBWrappers.pbobjc.h \
objectivec/GPBWrappers.pbobjc.m \
objectivec/ProtocolBuffers_iOS.xcodeproj/project.pbxproj \
objectivec/ProtocolBuffers_iOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata \
objectivec/ProtocolBuffers_iOS.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist \
@@ -12,21 +12,20 @@ Pod::Spec.new do |s|
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'

Some generated files are not rendered by default. Learn more.

Some generated files are not rendered by default. Learn more.

0 comments on commit 56c48ae

Please sign in to comment.
You can’t perform that action at this time.