From bc74670afec651c3f912cb6b7e54f5b68bd507f5 Mon Sep 17 00:00:00 2001 From: Gil Date: Mon, 8 Jan 2018 08:52:37 -0800 Subject: Fully qualify protoc-generated outputs (#626) * Fully-qualify imports in the protocol compiler output * pbxproj updates from running pod update * New checked-in proto outputs --- .../FrameworkMaker.xcodeproj/project.pbxproj | 2 +- Firestore/Protos/build-protos.sh | 47 ++++++++++++++++-- .../objc/firestore/local/MaybeDocument.pbobjc.m | 8 ++-- .../Protos/objc/firestore/local/Mutation.pbobjc.m | 8 ++-- .../Protos/objc/firestore/local/Target.pbobjc.m | 8 ++-- Firestore/Protos/objc/google/api/HTTP.pbobjc.m | 2 +- .../objc/google/firestore/v1beta1/Common.pbobjc.m | 6 +-- .../google/firestore/v1beta1/Document.pbobjc.m | 10 ++-- .../google/firestore/v1beta1/Firestore.pbobjc.m | 18 +++---- .../google/firestore/v1beta1/Firestore.pbrpc.h | 56 ++++++++++++++++------ .../google/firestore/v1beta1/Firestore.pbrpc.m | 17 +++++++ .../objc/google/firestore/v1beta1/Query.pbobjc.m | 8 ++-- .../objc/google/firestore/v1beta1/Write.pbobjc.m | 10 ++-- Firestore/Protos/objc/google/rpc/Status.pbobjc.m | 4 +- Firestore/Protos/objc/google/type/Latlng.pbobjc.m | 2 +- 15 files changed, 145 insertions(+), 61 deletions(-) (limited to 'Firestore/Protos') diff --git a/Firestore/Protos/FrameworkMaker.xcodeproj/project.pbxproj b/Firestore/Protos/FrameworkMaker.xcodeproj/project.pbxproj index 51a61b8..2efcb21 100644 --- a/Firestore/Protos/FrameworkMaker.xcodeproj/project.pbxproj +++ b/Firestore/Protos/FrameworkMaker.xcodeproj/project.pbxproj @@ -201,7 +201,7 @@ ); inputPaths = ( "${SRCROOT}/Pods/Target Support Files/Pods-FrameworkMaker_iOS/Pods-FrameworkMaker_iOS-resources.sh", - "$PODS_CONFIGURATION_BUILD_DIR/gRPC/gRPCCertificates.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/gRPC/gRPCCertificates.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( diff --git a/Firestore/Protos/build-protos.sh b/Firestore/Protos/build-protos.sh index 4cfb12e..f5570cb 100755 --- a/Firestore/Protos/build-protos.sh +++ b/Firestore/Protos/build-protos.sh @@ -1,10 +1,13 @@ #!/bin/bash # Copyright 2017 Google +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at +# # http://www.apache.org/licenses/LICENSE-2.0 +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -14,6 +17,31 @@ # Run this script from firebase-ios-sdk/Firestore/Protos to regnenerate the # Objective C files from the protos. +set -euo pipefail + +function StartCopyright() { + local filename="$1" + + cat > $filename <> $i.tmp + + mv $i.tmp $i done # Remove the unnecessary extensionRegistry functions. @@ -36,5 +72,8 @@ done # Remove non-buildable code from Annotations.pbobjc.*. -echo "static int annotations_stub __attribute__((unused,used)) = 0;" > objc/google/api/Annotations.pbobjc.m -echo "// Empty stub file" > objc/google/api/Annotations.pbobjc.h +StartCopyright objc/google/api/Annotations.pbobjc.m +echo "static int annotations_stub __attribute__((unused,used)) = 0;" >> objc/google/api/Annotations.pbobjc.m + +StartCopyright objc/google/api/Annotations.pbobjc.h +echo "// Empty stub file" >> objc/google/api/Annotations.pbobjc.h diff --git a/Firestore/Protos/objc/firestore/local/MaybeDocument.pbobjc.m b/Firestore/Protos/objc/firestore/local/MaybeDocument.pbobjc.m index 1d4404d..a0db337 100644 --- a/Firestore/Protos/objc/firestore/local/MaybeDocument.pbobjc.m +++ b/Firestore/Protos/objc/firestore/local/MaybeDocument.pbobjc.m @@ -32,12 +32,12 @@ #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS #import #else - #import "Timestamp.pbobjc.h" + #import "Firestore/Protos/objc/google/protobuf/Timestamp.pbobjc.h" #endif - #import "MaybeDocument.pbobjc.h" - #import "Document.pbobjc.h" - #import "Annotations.pbobjc.h" + #import "Firestore/Protos/objc/firestore/local/MaybeDocument.pbobjc.h" + #import "Firestore/Protos/objc/google/firestore/v1beta1/Document.pbobjc.h" + #import "Firestore/Protos/objc/google/api/Annotations.pbobjc.h" // @@protoc_insertion_point(imports) #pragma clang diagnostic push diff --git a/Firestore/Protos/objc/firestore/local/Mutation.pbobjc.m b/Firestore/Protos/objc/firestore/local/Mutation.pbobjc.m index 8034143..aaefa00 100644 --- a/Firestore/Protos/objc/firestore/local/Mutation.pbobjc.m +++ b/Firestore/Protos/objc/firestore/local/Mutation.pbobjc.m @@ -32,12 +32,12 @@ #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS #import #else - #import "Timestamp.pbobjc.h" + #import "Firestore/Protos/objc/google/protobuf/Timestamp.pbobjc.h" #endif - #import "Mutation.pbobjc.h" - #import "Write.pbobjc.h" - #import "Annotations.pbobjc.h" + #import "Firestore/Protos/objc/firestore/local/Mutation.pbobjc.h" + #import "Firestore/Protos/objc/google/firestore/v1beta1/Write.pbobjc.h" + #import "Firestore/Protos/objc/google/api/Annotations.pbobjc.h" // @@protoc_insertion_point(imports) #pragma clang diagnostic push diff --git a/Firestore/Protos/objc/firestore/local/Target.pbobjc.m b/Firestore/Protos/objc/firestore/local/Target.pbobjc.m index 6f6ccf2..ad03465 100644 --- a/Firestore/Protos/objc/firestore/local/Target.pbobjc.m +++ b/Firestore/Protos/objc/firestore/local/Target.pbobjc.m @@ -32,12 +32,12 @@ #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS #import #else - #import "Timestamp.pbobjc.h" + #import "Firestore/Protos/objc/google/protobuf/Timestamp.pbobjc.h" #endif - #import "Target.pbobjc.h" - #import "Firestore.pbobjc.h" - #import "Annotations.pbobjc.h" + #import "Firestore/Protos/objc/firestore/local/Target.pbobjc.h" + #import "Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbobjc.h" + #import "Firestore/Protos/objc/google/api/Annotations.pbobjc.h" // @@protoc_insertion_point(imports) #pragma clang diagnostic push diff --git a/Firestore/Protos/objc/google/api/HTTP.pbobjc.m b/Firestore/Protos/objc/google/api/HTTP.pbobjc.m index 5adf41c..007d039 100644 --- a/Firestore/Protos/objc/google/api/HTTP.pbobjc.m +++ b/Firestore/Protos/objc/google/api/HTTP.pbobjc.m @@ -29,7 +29,7 @@ #import "GPBProtocolBuffers_RuntimeSupport.h" #endif - #import "HTTP.pbobjc.h" + #import "Firestore/Protos/objc/google/api/HTTP.pbobjc.h" // @@protoc_insertion_point(imports) #pragma clang diagnostic push diff --git a/Firestore/Protos/objc/google/firestore/v1beta1/Common.pbobjc.m b/Firestore/Protos/objc/google/firestore/v1beta1/Common.pbobjc.m index 118f56e..3775d73 100644 --- a/Firestore/Protos/objc/google/firestore/v1beta1/Common.pbobjc.m +++ b/Firestore/Protos/objc/google/firestore/v1beta1/Common.pbobjc.m @@ -32,11 +32,11 @@ #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS #import #else - #import "Timestamp.pbobjc.h" + #import "Firestore/Protos/objc/google/protobuf/Timestamp.pbobjc.h" #endif - #import "Common.pbobjc.h" - #import "Annotations.pbobjc.h" + #import "Firestore/Protos/objc/google/firestore/v1beta1/Common.pbobjc.h" + #import "Firestore/Protos/objc/google/api/Annotations.pbobjc.h" // @@protoc_insertion_point(imports) #pragma clang diagnostic push diff --git a/Firestore/Protos/objc/google/firestore/v1beta1/Document.pbobjc.m b/Firestore/Protos/objc/google/firestore/v1beta1/Document.pbobjc.m index 2c805c3..86007f0 100644 --- a/Firestore/Protos/objc/google/firestore/v1beta1/Document.pbobjc.m +++ b/Firestore/Protos/objc/google/firestore/v1beta1/Document.pbobjc.m @@ -33,13 +33,13 @@ #import #import #else - #import "Struct.pbobjc.h" - #import "Timestamp.pbobjc.h" + #import "Firestore/Protos/objc/google/protobuf/Struct.pbobjc.h" + #import "Firestore/Protos/objc/google/protobuf/Timestamp.pbobjc.h" #endif - #import "Document.pbobjc.h" - #import "Annotations.pbobjc.h" - #import "Latlng.pbobjc.h" + #import "Firestore/Protos/objc/google/firestore/v1beta1/Document.pbobjc.h" + #import "Firestore/Protos/objc/google/api/Annotations.pbobjc.h" + #import "Firestore/Protos/objc/google/type/Latlng.pbobjc.h" // @@protoc_insertion_point(imports) #pragma clang diagnostic push diff --git a/Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbobjc.m b/Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbobjc.m index 4bdee01..4ed59a0 100644 --- a/Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbobjc.m +++ b/Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbobjc.m @@ -33,17 +33,17 @@ #import #import #else - #import "Empty.pbobjc.h" - #import "Timestamp.pbobjc.h" + #import "Firestore/Protos/objc/google/protobuf/Empty.pbobjc.h" + #import "Firestore/Protos/objc/google/protobuf/Timestamp.pbobjc.h" #endif - #import "Firestore.pbobjc.h" - #import "Annotations.pbobjc.h" - #import "Common.pbobjc.h" - #import "Document.pbobjc.h" - #import "Query.pbobjc.h" - #import "Write.pbobjc.h" - #import "Status.pbobjc.h" + #import "Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbobjc.h" + #import "Firestore/Protos/objc/google/api/Annotations.pbobjc.h" + #import "Firestore/Protos/objc/google/firestore/v1beta1/Common.pbobjc.h" + #import "Firestore/Protos/objc/google/firestore/v1beta1/Document.pbobjc.h" + #import "Firestore/Protos/objc/google/firestore/v1beta1/Query.pbobjc.h" + #import "Firestore/Protos/objc/google/firestore/v1beta1/Write.pbobjc.h" + #import "Firestore/Protos/objc/google/rpc/Status.pbobjc.h" // @@protoc_insertion_point(imports) #pragma clang diagnostic push diff --git a/Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbrpc.h b/Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbrpc.h index d7f127b..c8bc39d 100644 --- a/Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbrpc.h +++ b/Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbrpc.h @@ -14,29 +14,57 @@ * limitations under the License. */ +#if !GPB_GRPC_FORWARD_DECLARE_MESSAGE_PROTO #import "Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbobjc.h" +#endif #import #import #import #import -#import "Firestore/Protos/objc/google/api/Annotations.pbobjc.h" -#import "Firestore/Protos/objc/google/firestore/v1beta1/Common.pbobjc.h" -#import "Firestore/Protos/objc/google/firestore/v1beta1/Document.pbobjc.h" -#import "Firestore/Protos/objc/google/firestore/v1beta1/Query.pbobjc.h" -#import "Firestore/Protos/objc/google/firestore/v1beta1/Write.pbobjc.h" -#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS - #import -#else - #import "Empty.pbobjc.h" -#endif -#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS - #import +#if GPB_GRPC_FORWARD_DECLARE_MESSAGE_PROTO + @class GCFSBatchGetDocumentsRequest; + @class GCFSBatchGetDocumentsResponse; + @class GCFSBeginTransactionRequest; + @class GCFSBeginTransactionResponse; + @class GCFSCommitRequest; + @class GCFSCommitResponse; + @class GCFSCreateDocumentRequest; + @class GCFSDeleteDocumentRequest; + @class GCFSDocument; + @class GCFSGetDocumentRequest; + @class GCFSListCollectionIdsRequest; + @class GCFSListCollectionIdsResponse; + @class GCFSListDocumentsRequest; + @class GCFSListDocumentsResponse; + @class GCFSListenRequest; + @class GCFSListenResponse; + @class GCFSRollbackRequest; + @class GCFSRunQueryRequest; + @class GCFSRunQueryResponse; + @class GCFSUpdateDocumentRequest; + @class GCFSWriteRequest; + @class GCFSWriteResponse; + @class GPBEmpty; #else - #import "Timestamp.pbobjc.h" + #import "Firestore/Protos/objc/google/api/Annotations.pbobjc.h" + #import "Firestore/Protos/objc/google/firestore/v1beta1/Common.pbobjc.h" + #import "Firestore/Protos/objc/google/firestore/v1beta1/Document.pbobjc.h" + #import "Firestore/Protos/objc/google/firestore/v1beta1/Query.pbobjc.h" + #import "Firestore/Protos/objc/google/firestore/v1beta1/Write.pbobjc.h" + #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS + #import + #else + #import "Firestore/Protos/objc/google/protobuf/Empty.pbobjc.h" + #endif + #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS + #import + #else + #import "Firestore/Protos/objc/google/protobuf/Timestamp.pbobjc.h" + #endif + #import "Firestore/Protos/objc/google/rpc/Status.pbobjc.h" #endif -#import "Firestore/Protos/objc/google/rpc/Status.pbobjc.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbrpc.m b/Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbrpc.m index eec4c9a..d2e2be1 100644 --- a/Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbrpc.m +++ b/Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbrpc.m @@ -15,9 +15,26 @@ */ #import "Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbrpc.h" +#import "Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbobjc.h" #import #import +#import "Firestore/Protos/objc/google/api/Annotations.pbobjc.h" +#import "Firestore/Protos/objc/google/firestore/v1beta1/Common.pbobjc.h" +#import "Firestore/Protos/objc/google/firestore/v1beta1/Document.pbobjc.h" +#import "Firestore/Protos/objc/google/firestore/v1beta1/Query.pbobjc.h" +#import "Firestore/Protos/objc/google/firestore/v1beta1/Write.pbobjc.h" +#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS + #import +#else + #import "Firestore/Protos/objc/google/protobuf/Empty.pbobjc.h" +#endif +#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS + #import +#else + #import "Firestore/Protos/objc/google/protobuf/Timestamp.pbobjc.h" +#endif +#import "Firestore/Protos/objc/google/rpc/Status.pbobjc.h" @implementation GCFSFirestore diff --git a/Firestore/Protos/objc/google/firestore/v1beta1/Query.pbobjc.m b/Firestore/Protos/objc/google/firestore/v1beta1/Query.pbobjc.m index 804a5d0..b29dcfe 100644 --- a/Firestore/Protos/objc/google/firestore/v1beta1/Query.pbobjc.m +++ b/Firestore/Protos/objc/google/firestore/v1beta1/Query.pbobjc.m @@ -32,12 +32,12 @@ #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS #import #else - #import "Wrappers.pbobjc.h" + #import "Firestore/Protos/objc/google/protobuf/Wrappers.pbobjc.h" #endif - #import "Query.pbobjc.h" - #import "Annotations.pbobjc.h" - #import "Document.pbobjc.h" + #import "Firestore/Protos/objc/google/firestore/v1beta1/Query.pbobjc.h" + #import "Firestore/Protos/objc/google/api/Annotations.pbobjc.h" + #import "Firestore/Protos/objc/google/firestore/v1beta1/Document.pbobjc.h" // @@protoc_insertion_point(imports) #pragma clang diagnostic push diff --git a/Firestore/Protos/objc/google/firestore/v1beta1/Write.pbobjc.m b/Firestore/Protos/objc/google/firestore/v1beta1/Write.pbobjc.m index e6fd0f4..fc5db9a 100644 --- a/Firestore/Protos/objc/google/firestore/v1beta1/Write.pbobjc.m +++ b/Firestore/Protos/objc/google/firestore/v1beta1/Write.pbobjc.m @@ -32,13 +32,13 @@ #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS #import #else - #import "Timestamp.pbobjc.h" + #import "Firestore/Protos/objc/google/protobuf/Timestamp.pbobjc.h" #endif - #import "Write.pbobjc.h" - #import "Annotations.pbobjc.h" - #import "Common.pbobjc.h" - #import "Document.pbobjc.h" + #import "Firestore/Protos/objc/google/firestore/v1beta1/Write.pbobjc.h" + #import "Firestore/Protos/objc/google/api/Annotations.pbobjc.h" + #import "Firestore/Protos/objc/google/firestore/v1beta1/Common.pbobjc.h" + #import "Firestore/Protos/objc/google/firestore/v1beta1/Document.pbobjc.h" // @@protoc_insertion_point(imports) #pragma clang diagnostic push diff --git a/Firestore/Protos/objc/google/rpc/Status.pbobjc.m b/Firestore/Protos/objc/google/rpc/Status.pbobjc.m index 831073c..416095b 100644 --- a/Firestore/Protos/objc/google/rpc/Status.pbobjc.m +++ b/Firestore/Protos/objc/google/rpc/Status.pbobjc.m @@ -32,10 +32,10 @@ #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS #import #else - #import "Any.pbobjc.h" + #import "Firestore/Protos/objc/google/protobuf/Any.pbobjc.h" #endif - #import "Status.pbobjc.h" + #import "Firestore/Protos/objc/google/rpc/Status.pbobjc.h" // @@protoc_insertion_point(imports) #pragma clang diagnostic push diff --git a/Firestore/Protos/objc/google/type/Latlng.pbobjc.m b/Firestore/Protos/objc/google/type/Latlng.pbobjc.m index 9bb37ab..b9272da 100644 --- a/Firestore/Protos/objc/google/type/Latlng.pbobjc.m +++ b/Firestore/Protos/objc/google/type/Latlng.pbobjc.m @@ -29,7 +29,7 @@ #import "GPBProtocolBuffers_RuntimeSupport.h" #endif - #import "Latlng.pbobjc.h" + #import "Firestore/Protos/objc/google/type/Latlng.pbobjc.h" // @@protoc_insertion_point(imports) #pragma clang diagnostic push -- cgit v1.2.3