Skip to content

Commit 56c48ae

Browse files
thomasvlthomasvl
committed
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
1 parent 7e0a081 commit 56c48ae

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+2449
-2408
lines changed

‎Makefile.am

+20-10
Original file line numberDiff line numberDiff line change
@@ -538,25 +538,19 @@ objectivec_EXTRA_DIST= \
538538
objectivec/DevTools/pddm_tests.py \
539539
objectivec/generate_well_known_types.sh \
540540
objectivec/google/protobuf/Any.pbobjc.h \
541-
objectivec/google/protobuf/Any.pbobjc.m \
542541
objectivec/google/protobuf/Api.pbobjc.h \
543-
objectivec/google/protobuf/Api.pbobjc.m \
544542
objectivec/google/protobuf/Duration.pbobjc.h \
545-
objectivec/google/protobuf/Duration.pbobjc.m \
546543
objectivec/google/protobuf/Empty.pbobjc.h \
547-
objectivec/google/protobuf/Empty.pbobjc.m \
548544
objectivec/google/protobuf/FieldMask.pbobjc.h \
549-
objectivec/google/protobuf/FieldMask.pbobjc.m \
550545
objectivec/google/protobuf/SourceContext.pbobjc.h \
551-
objectivec/google/protobuf/SourceContext.pbobjc.m \
552546
objectivec/google/protobuf/Struct.pbobjc.h \
553-
objectivec/google/protobuf/Struct.pbobjc.m \
554547
objectivec/google/protobuf/Timestamp.pbobjc.h \
555-
objectivec/google/protobuf/Timestamp.pbobjc.m \
556548
objectivec/google/protobuf/Type.pbobjc.h \
557-
objectivec/google/protobuf/Type.pbobjc.m \
558549
objectivec/google/protobuf/Wrappers.pbobjc.h \
559-
objectivec/google/protobuf/Wrappers.pbobjc.m \
550+
objectivec/GPBAny.pbobjc.h \
551+
objectivec/GPBAny.pbobjc.m \
552+
objectivec/GPBApi.pbobjc.h \
553+
objectivec/GPBApi.pbobjc.m \
560554
objectivec/GPBArray.h \
561555
objectivec/GPBArray.m \
562556
objectivec/GPBArray_PackagePrivate.h \
@@ -573,10 +567,16 @@ objectivec_EXTRA_DIST= \
573567
objectivec/GPBDictionary.h \
574568
objectivec/GPBDictionary.m \
575569
objectivec/GPBDictionary_PackagePrivate.h \
570+
objectivec/GPBDuration.pbobjc.h \
571+
objectivec/GPBDuration.pbobjc.m \
572+
objectivec/GPBEmpty.pbobjc.h \
573+
objectivec/GPBEmpty.pbobjc.m \
576574
objectivec/GPBExtensionInternals.h \
577575
objectivec/GPBExtensionInternals.m \
578576
objectivec/GPBExtensionRegistry.h \
579577
objectivec/GPBExtensionRegistry.m \
578+
objectivec/GPBFieldMask.pbobjc.h \
579+
objectivec/GPBFieldMask.pbobjc.m \
580580
objectivec/GPBMessage.h \
581581
objectivec/GPBMessage.m \
582582
objectivec/GPBMessage_PackagePrivate.h \
@@ -587,6 +587,14 @@ objectivec_EXTRA_DIST= \
587587
objectivec/GPBRootObject.m \
588588
objectivec/GPBRootObject_PackagePrivate.h \
589589
objectivec/GPBRuntimeTypes.h \
590+
objectivec/GPBSourceContext.pbobjc.h \
591+
objectivec/GPBSourceContext.pbobjc.m \
592+
objectivec/GPBStruct.pbobjc.h \
593+
objectivec/GPBStruct.pbobjc.m \
594+
objectivec/GPBTimestamp.pbobjc.h \
595+
objectivec/GPBTimestamp.pbobjc.m \
596+
objectivec/GPBType.pbobjc.h \
597+
objectivec/GPBType.pbobjc.m \
590598
objectivec/GPBUnknownField.h \
591599
objectivec/GPBUnknownField.m \
592600
objectivec/GPBUnknownField_PackagePrivate.h \
@@ -600,6 +608,8 @@ objectivec_EXTRA_DIST= \
600608
objectivec/GPBWellKnownTypes.m \
601609
objectivec/GPBWireFormat.h \
602610
objectivec/GPBWireFormat.m \
611+
objectivec/GPBWrappers.pbobjc.h \
612+
objectivec/GPBWrappers.pbobjc.m \
603613
objectivec/ProtocolBuffers_iOS.xcodeproj/project.pbxproj \
604614
objectivec/ProtocolBuffers_iOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata \
605615
objectivec/ProtocolBuffers_iOS.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist \

‎Protobuf.podspec

+10-11
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,20 @@ Pod::Spec.new do |s|
1212
s.authors = { 'The Protocol Buffers contributors' => '[email protected]' }
1313
s.cocoapods_version = '>= 1.0'
1414

15-
s.module_name = 'protobuf'
1615
s.source = { :git => 'https://github.com/protocolbuffers/protobuf.git',
1716
:tag => "v#{s.version}" }
1817

1918
s.source_files = 'objectivec/*.{h,m}',
20-
'objectivec/google/protobuf/Any.pbobjc.{h,m}',
21-
'objectivec/google/protobuf/Api.pbobjc.{h,m}',
22-
'objectivec/google/protobuf/Duration.pbobjc.{h,m}',
23-
'objectivec/google/protobuf/Empty.pbobjc.{h,m}',
24-
'objectivec/google/protobuf/FieldMask.pbobjc.{h,m}',
25-
'objectivec/google/protobuf/SourceContext.pbobjc.{h,m}',
26-
'objectivec/google/protobuf/Struct.pbobjc.{h,m}',
27-
'objectivec/google/protobuf/Timestamp.pbobjc.{h,m}',
28-
'objectivec/google/protobuf/Type.pbobjc.{h,m}',
29-
'objectivec/google/protobuf/Wrappers.pbobjc.{h,m}'
19+
'objectivec/google/protobuf/Any.pbobjc.h',
20+
'objectivec/google/protobuf/Api.pbobjc.h',
21+
'objectivec/google/protobuf/Duration.pbobjc.h',
22+
'objectivec/google/protobuf/Empty.pbobjc.h',
23+
'objectivec/google/protobuf/FieldMask.pbobjc.h',
24+
'objectivec/google/protobuf/SourceContext.pbobjc.h',
25+
'objectivec/google/protobuf/Struct.pbobjc.h',
26+
'objectivec/google/protobuf/Timestamp.pbobjc.h',
27+
'objectivec/google/protobuf/Type.pbobjc.h',
28+
'objectivec/google/protobuf/Wrappers.pbobjc.h'
3029
# The following would cause duplicate symbol definitions. GPBProtocolBuffers is expected to be
3130
# left out, as it's an umbrella implementation file.
3231
s.exclude_files = 'objectivec/GPBProtocolBuffers.m'

‎objectivec/GPBAny.pbobjc.h

+183
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎objectivec/google/protobuf/Any.pbobjc.m ‎objectivec/GPBAny.pbobjc.m

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)