Revert "Fully qualify protoc-generated outputs (#626)" (#653)

This reverts commit bc74670afec651c3f912cb6b7e54f5b68bd507f5.

13 files changed, 56 insertions, 101 deletions

diff --git a/Firestore/Protos/objc/firestore/local/MaybeDocument.pbobjc.m b/Firestore/Protos/objc/firestore/local/MaybeDocument.pbobjc.m
index a0db337..1d4404d 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 <Protobuf/Timestamp.pbobjc.h>
 #else
- #import "Firestore/Protos/objc/google/protobuf/Timestamp.pbobjc.h"
+ #import "Timestamp.pbobjc.h"
 #endif
 
- #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"
+ #import "MaybeDocument.pbobjc.h"
+ #import "Document.pbobjc.h"
+ #import "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 aaefa00..8034143 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 <Protobuf/Timestamp.pbobjc.h>
 #else
- #import "Firestore/Protos/objc/google/protobuf/Timestamp.pbobjc.h"
+ #import "Timestamp.pbobjc.h"
 #endif
 
- #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"
+ #import "Mutation.pbobjc.h"
+ #import "Write.pbobjc.h"
+ #import "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 ad03465..6f6ccf2 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 <Protobuf/Timestamp.pbobjc.h>
 #else
- #import "Firestore/Protos/objc/google/protobuf/Timestamp.pbobjc.h"
+ #import "Timestamp.pbobjc.h"
 #endif
 
- #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"
+ #import "Target.pbobjc.h"
+ #import "Firestore.pbobjc.h"
+ #import "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 007d039..5adf41c 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 "Firestore/Protos/objc/google/api/HTTP.pbobjc.h"
+ #import "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 3775d73..118f56e 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 <Protobuf/Timestamp.pbobjc.h>
 #else
- #import "Firestore/Protos/objc/google/protobuf/Timestamp.pbobjc.h"
+ #import "Timestamp.pbobjc.h"
 #endif
 
- #import "Firestore/Protos/objc/google/firestore/v1beta1/Common.pbobjc.h"
- #import "Firestore/Protos/objc/google/api/Annotations.pbobjc.h"
+ #import "Common.pbobjc.h"
+ #import "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 86007f0..2c805c3 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 <Protobuf/Struct.pbobjc.h>
  #import <Protobuf/Timestamp.pbobjc.h>
 #else
- #import "Firestore/Protos/objc/google/protobuf/Struct.pbobjc.h"
- #import "Firestore/Protos/objc/google/protobuf/Timestamp.pbobjc.h"
+ #import "Struct.pbobjc.h"
+ #import "Timestamp.pbobjc.h"
 #endif
 
- #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"
+ #import "Document.pbobjc.h"
+ #import "Annotations.pbobjc.h"
+ #import "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 4ed59a0..4bdee01 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 <Protobuf/Empty.pbobjc.h>
  #import <Protobuf/Timestamp.pbobjc.h>
 #else
- #import "Firestore/Protos/objc/google/protobuf/Empty.pbobjc.h"
- #import "Firestore/Protos/objc/google/protobuf/Timestamp.pbobjc.h"
+ #import "Empty.pbobjc.h"
+ #import "Timestamp.pbobjc.h"
 #endif
 
- #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"
+ #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"
 // @@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 c8bc39d..d7f127b 100644
--- a/Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbrpc.h
+++ b/Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbrpc.h
@@ -14,57 +14,29 @@
  * limitations under the License.
  */
 
-#if !GPB_GRPC_FORWARD_DECLARE_MESSAGE_PROTO
 #import "Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbobjc.h"
-#endif
 
 #import <ProtoRPC/ProtoService.h>
 #import <ProtoRPC/ProtoRPC.h>
 #import <RxLibrary/GRXWriteable.h>
 #import <RxLibrary/GRXWriter.h>
 
-#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;
+#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
+  #import "Empty.pbobjc.h"
+#endif
+#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
+  #import <Protobuf/Timestamp.pbobjc.h>
 #else
-  #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
-    #import "Firestore/Protos/objc/google/protobuf/Empty.pbobjc.h"
-  #endif
-  #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
-    #import <Protobuf/Timestamp.pbobjc.h>
-  #else
-    #import "Firestore/Protos/objc/google/protobuf/Timestamp.pbobjc.h"
-  #endif
-  #import "Firestore/Protos/objc/google/rpc/Status.pbobjc.h"
+  #import "Timestamp.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 d2e2be1..eec4c9a 100644
--- a/Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbrpc.m
+++ b/Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbrpc.m
@@ -15,26 +15,9 @@
  */
 
 #import "Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbrpc.h"
-#import "Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbobjc.h"
 
 #import <ProtoRPC/ProtoRPC.h>
 #import <RxLibrary/GRXWriter+Immediate.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
-  #import "Firestore/Protos/objc/google/protobuf/Empty.pbobjc.h"
-#endif
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS
-  #import <Protobuf/Timestamp.pbobjc.h>
-#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 b29dcfe..804a5d0 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 <Protobuf/Wrappers.pbobjc.h>
 #else
- #import "Firestore/Protos/objc/google/protobuf/Wrappers.pbobjc.h"
+ #import "Wrappers.pbobjc.h"
 #endif
 
- #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"
+ #import "Query.pbobjc.h"
+ #import "Annotations.pbobjc.h"
+ #import "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 fc5db9a..e6fd0f4 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 <Protobuf/Timestamp.pbobjc.h>
 #else
- #import "Firestore/Protos/objc/google/protobuf/Timestamp.pbobjc.h"
+ #import "Timestamp.pbobjc.h"
 #endif
 
- #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"
+ #import "Write.pbobjc.h"
+ #import "Annotations.pbobjc.h"
+ #import "Common.pbobjc.h"
+ #import "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 416095b..831073c 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 <Protobuf/Any.pbobjc.h>
 #else
- #import "Firestore/Protos/objc/google/protobuf/Any.pbobjc.h"
+ #import "Any.pbobjc.h"
 #endif
 
- #import "Firestore/Protos/objc/google/rpc/Status.pbobjc.h"
+ #import "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 b9272da..9bb37ab 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 "Firestore/Protos/objc/google/type/Latlng.pbobjc.h"
+ #import "Latlng.pbobjc.h"
 // @@protoc_insertion_point(imports)
 
 #pragma clang diagnostic push