Skip to content

Commit 479ba82

Browse files
paulb777thomasvl
authored andcommitted
Override CocoaPods module to lowercase (protocolbuffers#6464)
Fix protocolbuffers#3218
1 parent a450e13 commit 479ba82

24 files changed

+70
-69
lines changed

Protobuf.podspec

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
# dependent projects use the :git notation to refer to the library.
66
Pod::Spec.new do |s|
77
s.name = 'Protobuf'
8-
s.version = '3.9.0-rc1'
8+
s.version = '3.9.0-rc2'
99
s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.'
1010
s.homepage = 'https://github.com/protocolbuffers/protobuf'
1111
s.license = '3-Clause BSD License'
1212
s.authors = { 'The Protocol Buffers contributors' => '[email protected]' }
1313
s.cocoapods_version = '>= 1.0'
1414

15+
s.module_name = 'protobuf'
1516
s.source = { :git => 'https://github.com/protocolbuffers/protobuf.git',
1617
:tag => "v#{s.version}" }
1718

objectivec/GPBProtocolBuffers.h

+10-10
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,16 @@
5252

5353
// Well-known proto types
5454
#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
55-
#import <Protobuf/Any.pbobjc.h>
56-
#import <Protobuf/Api.pbobjc.h>
57-
#import <Protobuf/Duration.pbobjc.h>
58-
#import <Protobuf/Empty.pbobjc.h>
59-
#import <Protobuf/FieldMask.pbobjc.h>
60-
#import <Protobuf/SourceContext.pbobjc.h>
61-
#import <Protobuf/Struct.pbobjc.h>
62-
#import <Protobuf/Timestamp.pbobjc.h>
63-
#import <Protobuf/Type.pbobjc.h>
64-
#import <Protobuf/Wrappers.pbobjc.h>
55+
#import <protobuf/Any.pbobjc.h>
56+
#import <protobuf/Api.pbobjc.h>
57+
#import <protobuf/Duration.pbobjc.h>
58+
#import <protobuf/Empty.pbobjc.h>
59+
#import <protobuf/FieldMask.pbobjc.h>
60+
#import <protobuf/SourceContext.pbobjc.h>
61+
#import <protobuf/Struct.pbobjc.h>
62+
#import <protobuf/Timestamp.pbobjc.h>
63+
#import <protobuf/Type.pbobjc.h>
64+
#import <protobuf/Wrappers.pbobjc.h>
6565
#else
6666
#import "google/protobuf/Any.pbobjc.h"
6767
#import "google/protobuf/Api.pbobjc.h"

objectivec/GPBWellKnownTypes.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
#endif
3838

3939
#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
40-
#import <Protobuf/Any.pbobjc.h>
41-
#import <Protobuf/Duration.pbobjc.h>
42-
#import <Protobuf/Timestamp.pbobjc.h>
40+
#import <protobuf/Any.pbobjc.h>
41+
#import <protobuf/Duration.pbobjc.h>
42+
#import <protobuf/Timestamp.pbobjc.h>
4343
#else
4444
#import "google/protobuf/Any.pbobjc.h"
4545
#import "google/protobuf/Duration.pbobjc.h"

objectivec/google/protobuf/Any.pbobjc.h

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

objectivec/google/protobuf/Any.pbobjc.m

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

objectivec/google/protobuf/Api.pbobjc.h

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

objectivec/google/protobuf/Api.pbobjc.m

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

objectivec/google/protobuf/Duration.pbobjc.h

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

objectivec/google/protobuf/Duration.pbobjc.m

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

objectivec/google/protobuf/Empty.pbobjc.h

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

objectivec/google/protobuf/Empty.pbobjc.m

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

objectivec/google/protobuf/FieldMask.pbobjc.h

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

objectivec/google/protobuf/FieldMask.pbobjc.m

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

objectivec/google/protobuf/SourceContext.pbobjc.h

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

objectivec/google/protobuf/SourceContext.pbobjc.m

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

objectivec/google/protobuf/Struct.pbobjc.h

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

objectivec/google/protobuf/Struct.pbobjc.m

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

objectivec/google/protobuf/Timestamp.pbobjc.h

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

objectivec/google/protobuf/Timestamp.pbobjc.m

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

objectivec/google/protobuf/Type.pbobjc.h

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

objectivec/google/protobuf/Type.pbobjc.m

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

objectivec/google/protobuf/Wrappers.pbobjc.h

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

objectivec/google/protobuf/Wrappers.pbobjc.m

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

src/google/protobuf/compiler/objectivec/objectivec_helpers.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -981,7 +981,7 @@ string BuildCommentsString(const SourceLocation& location,
981981
// want to put the library in a framework is an interesting question. The
982982
// problem is it means changing sources shipped with the library to actually
983983
// use a different value; so it isn't as simple as a option.
984-
const char* const ProtobufLibraryFrameworkName = "Protobuf";
984+
const char* const ProtobufLibraryFrameworkName = "protobuf";
985985

986986
string ProtobufFrameworkImportSymbol(const string& framework_name) {
987987
// GPB_USE_[framework_name]_FRAMEWORK_IMPORTS

0 commit comments

Comments
 (0)