diff options
| author |  Gil <mcg@google.com> | 2017-11-16 20:52:01 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-11-16 20:52:01 -0800 |
| commit | 4fbc96904fe86b3a0cdb91bfa6d96491221eb6b9 (patch) | |
| tree | b1737ee79405b7c80c2a03f6598c3ba71df2d05f /Firestore/Protos | |
| parent | 88b7e74e3102fc8de453f22a44fd5cb4c91472e3 (diff) | |
Use fully qualified imports in Firestore (#467)
This simplifies the import process back into google3 and allows us to add additional directories to the project without needing to update the project files for each directory we add. This shows up most clearly in the change to Firestore/Example/Firestore.xcodeproj/project.pbxproj: this no longer needs to list essentially every directory in the project as a header search path.
* Clang-format configuration for C++ files
* Add support C++-only sources to the podspec
* Podspec support for fully qualified imports
* xcodeproj changes for fully-qualified imports
* Use fully-qualified imports in Firestore sources
Diffstat (limited to 'Firestore/Protos')
| -rw-r--r-- | Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbrpc.h | 14 | ||||
| -rw-r--r-- | Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbrpc.m | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbrpc.h b/Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbrpc.h index 5704c2b..d7f127b 100644 --- a/Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbrpc.h +++ b/Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbrpc.h @@ -14,18 +14,18 @@ * limitations under the License. */ -#import "Firestore.pbobjc.h" +#import "Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbobjc.h" #import <ProtoRPC/ProtoService.h> #import <ProtoRPC/ProtoRPC.h> #import <RxLibrary/GRXWriteable.h> #import <RxLibrary/GRXWriter.h> -#import "Annotations.pbobjc.h" -#import "Common.pbobjc.h" -#import "Document.pbobjc.h" -#import "Query.pbobjc.h" -#import "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" +#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 <Protobuf/Empty.pbobjc.h> #else @@ -36,7 +36,7 @@ #else #import "Timestamp.pbobjc.h" #endif -#import "Status.pbobjc.h" +#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 a3e338d..eec4c9a 100644 --- a/Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbrpc.m +++ b/Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbrpc.m @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "Firestore.pbrpc.h" +#import "Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbrpc.h" #import <ProtoRPC/ProtoRPC.h> #import <RxLibrary/GRXWriter+Immediate.h> |