From 3c3b374267dff352e5580799b38150c7806a0cca Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Fri, 2 Aug 2019 09:03:59 -0700 Subject: [PATCH 1/3] Override CocoaPods module to lowercase --- Protobuf.podspec | 3 ++- objectivec/GPBProtocolBuffers.h | 20 +++++++++---------- objectivec/GPBWellKnownTypes.h | 6 +++--- objectivec/google/protobuf/Any.pbobjc.h | 6 +++--- objectivec/google/protobuf/Any.pbobjc.m | 4 ++-- objectivec/google/protobuf/Api.pbobjc.h | 6 +++--- objectivec/google/protobuf/Api.pbobjc.m | 8 ++++---- objectivec/google/protobuf/Duration.pbobjc.h | 6 +++--- objectivec/google/protobuf/Duration.pbobjc.m | 4 ++-- objectivec/google/protobuf/Empty.pbobjc.h | 6 +++--- objectivec/google/protobuf/Empty.pbobjc.m | 4 ++-- objectivec/google/protobuf/FieldMask.pbobjc.h | 6 +++--- objectivec/google/protobuf/FieldMask.pbobjc.m | 4 ++-- .../google/protobuf/SourceContext.pbobjc.h | 6 +++--- .../google/protobuf/SourceContext.pbobjc.m | 4 ++-- objectivec/google/protobuf/Struct.pbobjc.h | 6 +++--- objectivec/google/protobuf/Struct.pbobjc.m | 4 ++-- objectivec/google/protobuf/Timestamp.pbobjc.h | 6 +++--- objectivec/google/protobuf/Timestamp.pbobjc.m | 4 ++-- objectivec/google/protobuf/Type.pbobjc.h | 6 +++--- objectivec/google/protobuf/Type.pbobjc.m | 8 ++++---- objectivec/google/protobuf/Wrappers.pbobjc.h | 6 +++--- objectivec/google/protobuf/Wrappers.pbobjc.m | 4 ++-- 23 files changed, 69 insertions(+), 68 deletions(-) diff --git a/Protobuf.podspec b/Protobuf.podspec index 3881007dae92..c36cf0063b8f 100644 --- a/Protobuf.podspec +++ b/Protobuf.podspec @@ -5,13 +5,14 @@ # dependent projects use the :git notation to refer to the library. Pod::Spec.new do |s| s.name = 'Protobuf' - s.version = '3.9.0-rc1' + s.version = '3.9.0-rc2' s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.' s.homepage = 'https://github.com/protocolbuffers/protobuf' s.license = '3-Clause BSD License' 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}" } diff --git a/objectivec/GPBProtocolBuffers.h b/objectivec/GPBProtocolBuffers.h index 68d8854eb8e7..32f9f5de221c 100644 --- a/objectivec/GPBProtocolBuffers.h +++ b/objectivec/GPBProtocolBuffers.h @@ -52,16 +52,16 @@ // Well-known proto types #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS - #import - #import - #import - #import - #import - #import - #import - #import - #import - #import + #import + #import + #import + #import + #import + #import + #import + #import + #import + #import #else #import "google/protobuf/Any.pbobjc.h" #import "google/protobuf/Api.pbobjc.h" diff --git a/objectivec/GPBWellKnownTypes.h b/objectivec/GPBWellKnownTypes.h index 04df41788922..bb6c780a7d89 100644 --- a/objectivec/GPBWellKnownTypes.h +++ b/objectivec/GPBWellKnownTypes.h @@ -37,9 +37,9 @@ #endif #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS - #import - #import - #import + #import + #import + #import #else #import "google/protobuf/Any.pbobjc.h" #import "google/protobuf/Duration.pbobjc.h" diff --git a/objectivec/google/protobuf/Any.pbobjc.h b/objectivec/google/protobuf/Any.pbobjc.h index 2091d72df40d..f22c8c5d8efe 100644 --- a/objectivec/google/protobuf/Any.pbobjc.h +++ b/objectivec/google/protobuf/Any.pbobjc.h @@ -8,9 +8,9 @@ #endif #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS - #import - #import - #import + #import + #import + #import #else #import "GPBDescriptor.h" #import "GPBMessage.h" diff --git a/objectivec/google/protobuf/Any.pbobjc.m b/objectivec/google/protobuf/Any.pbobjc.m index 7ca84ff40a48..f1e815fd120f 100644 --- a/objectivec/google/protobuf/Any.pbobjc.m +++ b/objectivec/google/protobuf/Any.pbobjc.m @@ -8,13 +8,13 @@ #endif #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS - #import + #import #else #import "GPBProtocolBuffers_RuntimeSupport.h" #endif #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS - #import + #import #else #import "google/protobuf/Any.pbobjc.h" #endif diff --git a/objectivec/google/protobuf/Api.pbobjc.h b/objectivec/google/protobuf/Api.pbobjc.h index c93f3f15d7bf..99acd04dd930 100644 --- a/objectivec/google/protobuf/Api.pbobjc.h +++ b/objectivec/google/protobuf/Api.pbobjc.h @@ -8,9 +8,9 @@ #endif #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS - #import - #import - #import + #import + #import + #import #else #import "GPBDescriptor.h" #import "GPBMessage.h" diff --git a/objectivec/google/protobuf/Api.pbobjc.m b/objectivec/google/protobuf/Api.pbobjc.m index d63a3e696ad8..410239996174 100644 --- a/objectivec/google/protobuf/Api.pbobjc.m +++ b/objectivec/google/protobuf/Api.pbobjc.m @@ -8,15 +8,15 @@ #endif #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS - #import + #import #else #import "GPBProtocolBuffers_RuntimeSupport.h" #endif #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS - #import - #import - #import + #import + #import + #import #else #import "google/protobuf/Api.pbobjc.h" #import "google/protobuf/SourceContext.pbobjc.h" diff --git a/objectivec/google/protobuf/Duration.pbobjc.h b/objectivec/google/protobuf/Duration.pbobjc.h index 561b09341959..111a91042c26 100644 --- a/objectivec/google/protobuf/Duration.pbobjc.h +++ b/objectivec/google/protobuf/Duration.pbobjc.h @@ -8,9 +8,9 @@ #endif #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS - #import - #import - #import + #import + #import + #import #else #import "GPBDescriptor.h" #import "GPBMessage.h" diff --git a/objectivec/google/protobuf/Duration.pbobjc.m b/objectivec/google/protobuf/Duration.pbobjc.m index 3fa702435f64..4c7b23da7350 100644 --- a/objectivec/google/protobuf/Duration.pbobjc.m +++ b/objectivec/google/protobuf/Duration.pbobjc.m @@ -8,13 +8,13 @@ #endif #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS - #import + #import #else #import "GPBProtocolBuffers_RuntimeSupport.h" #endif #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS - #import +#import #else #import "google/protobuf/Duration.pbobjc.h" #endif diff --git a/objectivec/google/protobuf/Empty.pbobjc.h b/objectivec/google/protobuf/Empty.pbobjc.h index fdc247ae4b9f..5b1e7b4b678d 100644 --- a/objectivec/google/protobuf/Empty.pbobjc.h +++ b/objectivec/google/protobuf/Empty.pbobjc.h @@ -8,9 +8,9 @@ #endif #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS - #import - #import - #import + #import + #import + #import #else #import "GPBDescriptor.h" #import "GPBMessage.h" diff --git a/objectivec/google/protobuf/Empty.pbobjc.m b/objectivec/google/protobuf/Empty.pbobjc.m index 51f15f365c31..4cb0f12c353d 100644 --- a/objectivec/google/protobuf/Empty.pbobjc.m +++ b/objectivec/google/protobuf/Empty.pbobjc.m @@ -8,13 +8,13 @@ #endif #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS - #import + #import #else #import "GPBProtocolBuffers_RuntimeSupport.h" #endif #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS - #import + #import #else #import "google/protobuf/Empty.pbobjc.h" #endif diff --git a/objectivec/google/protobuf/FieldMask.pbobjc.h b/objectivec/google/protobuf/FieldMask.pbobjc.h index 72cac9aa38bf..61fdd259fe7c 100644 --- a/objectivec/google/protobuf/FieldMask.pbobjc.h +++ b/objectivec/google/protobuf/FieldMask.pbobjc.h @@ -8,9 +8,9 @@ #endif #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS - #import - #import - #import + #import + #import + #import #else #import "GPBDescriptor.h" #import "GPBMessage.h" diff --git a/objectivec/google/protobuf/FieldMask.pbobjc.m b/objectivec/google/protobuf/FieldMask.pbobjc.m index ff27318a21d7..2e6b2eef7c75 100644 --- a/objectivec/google/protobuf/FieldMask.pbobjc.m +++ b/objectivec/google/protobuf/FieldMask.pbobjc.m @@ -8,13 +8,13 @@ #endif #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS - #import + #import #else #import "GPBProtocolBuffers_RuntimeSupport.h" #endif #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS - #import + #import #else #import "google/protobuf/FieldMask.pbobjc.h" #endif diff --git a/objectivec/google/protobuf/SourceContext.pbobjc.h b/objectivec/google/protobuf/SourceContext.pbobjc.h index e4923959ea6a..b2cdbba3c6c4 100644 --- a/objectivec/google/protobuf/SourceContext.pbobjc.h +++ b/objectivec/google/protobuf/SourceContext.pbobjc.h @@ -8,9 +8,9 @@ #endif #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS - #import - #import - #import + #import + #import + #import #else #import "GPBDescriptor.h" #import "GPBMessage.h" diff --git a/objectivec/google/protobuf/SourceContext.pbobjc.m b/objectivec/google/protobuf/SourceContext.pbobjc.m index c93871ed3e0d..c955f2b4fae6 100644 --- a/objectivec/google/protobuf/SourceContext.pbobjc.m +++ b/objectivec/google/protobuf/SourceContext.pbobjc.m @@ -8,13 +8,13 @@ #endif #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS - #import + #import #else #import "GPBProtocolBuffers_RuntimeSupport.h" #endif #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS - #import + #import #else #import "google/protobuf/SourceContext.pbobjc.h" #endif diff --git a/objectivec/google/protobuf/Struct.pbobjc.h b/objectivec/google/protobuf/Struct.pbobjc.h index fb2042519999..8a06de4d54d3 100644 --- a/objectivec/google/protobuf/Struct.pbobjc.h +++ b/objectivec/google/protobuf/Struct.pbobjc.h @@ -8,9 +8,9 @@ #endif #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS - #import - #import - #import + #import + #import + #import #else #import "GPBDescriptor.h" #import "GPBMessage.h" diff --git a/objectivec/google/protobuf/Struct.pbobjc.m b/objectivec/google/protobuf/Struct.pbobjc.m index 169a27581323..3873f5a0338c 100644 --- a/objectivec/google/protobuf/Struct.pbobjc.m +++ b/objectivec/google/protobuf/Struct.pbobjc.m @@ -8,7 +8,7 @@ #endif #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS - #import + #import #else #import "GPBProtocolBuffers_RuntimeSupport.h" #endif @@ -16,7 +16,7 @@ #import #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS - #import + #import #else #import "google/protobuf/Struct.pbobjc.h" #endif diff --git a/objectivec/google/protobuf/Timestamp.pbobjc.h b/objectivec/google/protobuf/Timestamp.pbobjc.h index 591dbe386d75..d351f2771258 100644 --- a/objectivec/google/protobuf/Timestamp.pbobjc.h +++ b/objectivec/google/protobuf/Timestamp.pbobjc.h @@ -8,9 +8,9 @@ #endif #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS - #import - #import - #import + #import + #import + #import #else #import "GPBDescriptor.h" #import "GPBMessage.h" diff --git a/objectivec/google/protobuf/Timestamp.pbobjc.m b/objectivec/google/protobuf/Timestamp.pbobjc.m index b6393e37aa74..05eb3a5d295d 100644 --- a/objectivec/google/protobuf/Timestamp.pbobjc.m +++ b/objectivec/google/protobuf/Timestamp.pbobjc.m @@ -8,13 +8,13 @@ #endif #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS - #import + #import #else #import "GPBProtocolBuffers_RuntimeSupport.h" #endif #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS - #import + #import #else #import "google/protobuf/Timestamp.pbobjc.h" #endif diff --git a/objectivec/google/protobuf/Type.pbobjc.h b/objectivec/google/protobuf/Type.pbobjc.h index e14d15df61b9..5a5486364e0e 100644 --- a/objectivec/google/protobuf/Type.pbobjc.h +++ b/objectivec/google/protobuf/Type.pbobjc.h @@ -8,9 +8,9 @@ #endif #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS - #import - #import - #import + #import + #import + #import #else #import "GPBDescriptor.h" #import "GPBMessage.h" diff --git a/objectivec/google/protobuf/Type.pbobjc.m b/objectivec/google/protobuf/Type.pbobjc.m index 6b88a4b5c64f..7451edc6e21d 100644 --- a/objectivec/google/protobuf/Type.pbobjc.m +++ b/objectivec/google/protobuf/Type.pbobjc.m @@ -8,7 +8,7 @@ #endif #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS - #import + #import #else #import "GPBProtocolBuffers_RuntimeSupport.h" #endif @@ -16,9 +16,9 @@ #import #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS - #import - #import - #import + #import + #import + #import #else #import "google/protobuf/Type.pbobjc.h" #import "google/protobuf/Any.pbobjc.h" diff --git a/objectivec/google/protobuf/Wrappers.pbobjc.h b/objectivec/google/protobuf/Wrappers.pbobjc.h index 0411e1ec0d7c..a9d3646e3169 100644 --- a/objectivec/google/protobuf/Wrappers.pbobjc.h +++ b/objectivec/google/protobuf/Wrappers.pbobjc.h @@ -8,9 +8,9 @@ #endif #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS - #import - #import - #import + #import + #import + #import #else #import "GPBDescriptor.h" #import "GPBMessage.h" diff --git a/objectivec/google/protobuf/Wrappers.pbobjc.m b/objectivec/google/protobuf/Wrappers.pbobjc.m index 0a163fa8ff50..f91d345041ea 100644 --- a/objectivec/google/protobuf/Wrappers.pbobjc.m +++ b/objectivec/google/protobuf/Wrappers.pbobjc.m @@ -8,13 +8,13 @@ #endif #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS - #import + #import #else #import "GPBProtocolBuffers_RuntimeSupport.h" #endif #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS - #import + #import #else #import "google/protobuf/Wrappers.pbobjc.h" #endif From f3d97334abd56603f4b750d72627e148a3fe21ab Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Mon, 5 Aug 2019 09:16:43 -0700 Subject: [PATCH 2/3] Generate lowercase --- src/google/protobuf/compiler/objectivec/objectivec_helpers.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/google/protobuf/compiler/objectivec/objectivec_helpers.cc b/src/google/protobuf/compiler/objectivec/objectivec_helpers.cc index 206739fdf871..724e94654e4d 100644 --- a/src/google/protobuf/compiler/objectivec/objectivec_helpers.cc +++ b/src/google/protobuf/compiler/objectivec/objectivec_helpers.cc @@ -981,7 +981,7 @@ string BuildCommentsString(const SourceLocation& location, // want to put the library in a framework is an interesting question. The // problem is it means changing sources shipped with the library to actually // use a different value; so it isn't as simple as a option. -const char* const ProtobufLibraryFrameworkName = "Protobuf"; +const char* const ProtobufLibraryFrameworkName = "protobuf"; string ProtobufFrameworkImportSymbol(const string& framework_name) { // GPB_USE_[framework_name]_FRAMEWORK_IMPORTS From cedc9b91e5d711b5fe8cd37a5d73babe2c92661f Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Mon, 5 Aug 2019 09:39:38 -0700 Subject: [PATCH 3/3] Run objectivec/generate_well_known_types.sh --- objectivec/google/protobuf/Duration.pbobjc.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/objectivec/google/protobuf/Duration.pbobjc.m b/objectivec/google/protobuf/Duration.pbobjc.m index 4c7b23da7350..1b718a12e7a6 100644 --- a/objectivec/google/protobuf/Duration.pbobjc.m +++ b/objectivec/google/protobuf/Duration.pbobjc.m @@ -14,7 +14,7 @@ #endif #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS -#import + #import #else #import "google/protobuf/Duration.pbobjc.h" #endif