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

17 files changed, 139 insertions, 139 deletions

diff --git a/Firestore/Source/API/FIRCollectionReference.m b/Firestore/Source/API/FIRCollectionReference.m
index 1ded4d2..f90bff5 100644
--- a/Firestore/Source/API/FIRCollectionReference.m
+++ b/Firestore/Source/API/FIRCollectionReference.m
@@ -16,15 +16,15 @@
 
 #import "FIRCollectionReference.h"
 
-#import "FIRDocumentReference+Internal.h"
-#import "FIRQuery+Internal.h"
-#import "FIRQuery_Init.h"
-#import "FSTAssert.h"
-#import "FSTDocumentKey.h"
-#import "FSTPath.h"
-#import "FSTQuery.h"
-#import "FSTUsageValidation.h"
-#import "FSTUtil.h"
+#import "Firestore/Source/API/FIRDocumentReference+Internal.h"
+#import "Firestore/Source/API/FIRQuery+Internal.h"
+#import "Firestore/Source/API/FIRQuery_Init.h"
+#import "Firestore/Source/Core/FSTQuery.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Model/FSTPath.h"
+#import "Firestore/Source/Util/FSTAssert.h"
+#import "Firestore/Source/Util/FSTUsageValidation.h"
+#import "Firestore/Source/Util/FSTUtil.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/API/FIRDocumentChange.m b/Firestore/Source/API/FIRDocumentChange.m
index f284bfe..970dc90 100644
--- a/Firestore/Source/API/FIRDocumentChange.m
+++ b/Firestore/Source/API/FIRDocumentChange.m
@@ -16,12 +16,12 @@
 
 #import "FIRDocumentChange.h"
 
-#import "FIRDocumentSnapshot+Internal.h"
-#import "FSTAssert.h"
-#import "FSTDocument.h"
-#import "FSTDocumentSet.h"
-#import "FSTQuery.h"
-#import "FSTViewSnapshot.h"
+#import "Firestore/Source/API/FIRDocumentSnapshot+Internal.h"
+#import "Firestore/Source/Core/FSTQuery.h"
+#import "Firestore/Source/Core/FSTViewSnapshot.h"
+#import "Firestore/Source/Model/FSTDocument.h"
+#import "Firestore/Source/Model/FSTDocumentSet.h"
+#import "Firestore/Source/Util/FSTAssert.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/API/FIRDocumentReference.m b/Firestore/Source/API/FIRDocumentReference.m
index 5fa6cf7..1c80ea9 100644
--- a/Firestore/Source/API/FIRDocumentReference.m
+++ b/Firestore/Source/API/FIRDocumentReference.m
@@ -16,28 +16,28 @@
 
 #import "FIRDocumentReference.h"
 
-#import "FIRCollectionReference+Internal.h"
-#import "FIRDocumentReference+Internal.h"
-#import "FIRDocumentSnapshot+Internal.h"
-#import "FIRFirestore+Internal.h"
+#import <GRPCClient/GRPCCall.h>
+
 #import "FIRFirestoreErrors.h"
-#import "FIRListenerRegistration+Internal.h"
-#import "FIRSetOptions+Internal.h"
 #import "FIRSnapshotMetadata.h"
-#import "FSTAssert.h"
-#import "FSTAsyncQueryListener.h"
-#import "FSTDocumentKey.h"
-#import "FSTDocumentSet.h"
-#import "FSTEventManager.h"
-#import "FSTFieldValue.h"
-#import "FSTFirestoreClient.h"
-#import "FSTMutation.h"
-#import "FSTPath.h"
-#import "FSTQuery.h"
-#import "FSTUsageValidation.h"
-#import "FSTUserDataConverter.h"
-
-#import <GRPCClient/GRPCCall.h>
+#import "Firestore/Source/API/FIRCollectionReference+Internal.h"
+#import "Firestore/Source/API/FIRDocumentReference+Internal.h"
+#import "Firestore/Source/API/FIRDocumentSnapshot+Internal.h"
+#import "Firestore/Source/API/FIRFirestore+Internal.h"
+#import "Firestore/Source/API/FIRListenerRegistration+Internal.h"
+#import "Firestore/Source/API/FIRSetOptions+Internal.h"
+#import "Firestore/Source/API/FSTUserDataConverter.h"
+#import "Firestore/Source/Core/FSTEventManager.h"
+#import "Firestore/Source/Core/FSTFirestoreClient.h"
+#import "Firestore/Source/Core/FSTQuery.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Model/FSTDocumentSet.h"
+#import "Firestore/Source/Model/FSTFieldValue.h"
+#import "Firestore/Source/Model/FSTMutation.h"
+#import "Firestore/Source/Model/FSTPath.h"
+#import "Firestore/Source/Util/FSTAssert.h"
+#import "Firestore/Source/Util/FSTAsyncQueryListener.h"
+#import "Firestore/Source/Util/FSTUsageValidation.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/API/FIRDocumentSnapshot.m b/Firestore/Source/API/FIRDocumentSnapshot.m
index b5f61ba..b78472e 100644
--- a/Firestore/Source/API/FIRDocumentSnapshot.m
+++ b/Firestore/Source/API/FIRDocumentSnapshot.m
@@ -16,16 +16,16 @@
 
 #import "FIRDocumentSnapshot.h"
 
-#import "FIRDocumentReference+Internal.h"
-#import "FIRFieldPath+Internal.h"
-#import "FIRFirestore+Internal.h"
-#import "FIRSnapshotMetadata+Internal.h"
-#import "FSTDatabaseID.h"
-#import "FSTDocument.h"
-#import "FSTDocumentKey.h"
-#import "FSTFieldValue.h"
-#import "FSTPath.h"
-#import "FSTUsageValidation.h"
+#import "Firestore/Source/API/FIRDocumentReference+Internal.h"
+#import "Firestore/Source/API/FIRFieldPath+Internal.h"
+#import "Firestore/Source/API/FIRFirestore+Internal.h"
+#import "Firestore/Source/API/FIRSnapshotMetadata+Internal.h"
+#import "Firestore/Source/Model/FSTDatabaseID.h"
+#import "Firestore/Source/Model/FSTDocument.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Model/FSTFieldValue.h"
+#import "Firestore/Source/Model/FSTPath.h"
+#import "Firestore/Source/Util/FSTUsageValidation.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/API/FIRFieldPath.m b/Firestore/Source/API/FIRFieldPath.m
index b3c919c..d0a70c0 100644
--- a/Firestore/Source/API/FIRFieldPath.m
+++ b/Firestore/Source/API/FIRFieldPath.m
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#import "FIRFieldPath+Internal.h"
+#import "Firestore/Source/API/FIRFieldPath+Internal.h"
 
-#import "FSTPath.h"
-#import "FSTUsageValidation.h"
+#import "Firestore/Source/Model/FSTPath.h"
+#import "Firestore/Source/Util/FSTUsageValidation.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/API/FIRFieldValue.m b/Firestore/Source/API/FIRFieldValue.m
index a44d8fa..7ae4fb0 100644
--- a/Firestore/Source/API/FIRFieldValue.m
+++ b/Firestore/Source/API/FIRFieldValue.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FIRFieldValue+Internal.h"
+#import "Firestore/Source/API/FIRFieldValue+Internal.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/API/FIRFirestore.m b/Firestore/Source/API/FIRFirestore.m
index 1b53e83..8287284 100644
--- a/Firestore/Source/API/FIRFirestore.m
+++ b/Firestore/Source/API/FIRFirestore.m
@@ -20,24 +20,24 @@
 #import <FirebaseCommunity/FIRLogger.h>
 #import <FirebaseCommunity/FIROptions.h>
 
-#import "FIRCollectionReference+Internal.h"
-#import "FIRDocumentReference+Internal.h"
-#import "FIRFirestore+Internal.h"
 #import "FIRFirestoreSettings.h"
-#import "FIRTransaction+Internal.h"
-#import "FIRWriteBatch+Internal.h"
-#import "FSTUserDataConverter.h"
-
-#import "FSTAssert.h"
-#import "FSTCredentialsProvider.h"
-#import "FSTDatabaseID.h"
-#import "FSTDatabaseInfo.h"
-#import "FSTDispatchQueue.h"
-#import "FSTDocumentKey.h"
-#import "FSTFirestoreClient.h"
-#import "FSTLogger.h"
-#import "FSTPath.h"
-#import "FSTUsageValidation.h"
+#import "Firestore/Source/API/FIRCollectionReference+Internal.h"
+#import "Firestore/Source/API/FIRDocumentReference+Internal.h"
+#import "Firestore/Source/API/FIRFirestore+Internal.h"
+#import "Firestore/Source/API/FIRTransaction+Internal.h"
+#import "Firestore/Source/API/FIRWriteBatch+Internal.h"
+#import "Firestore/Source/API/FSTUserDataConverter.h"
+
+#import "Firestore/Source/Auth/FSTCredentialsProvider.h"
+#import "Firestore/Source/Core/FSTDatabaseInfo.h"
+#import "Firestore/Source/Core/FSTFirestoreClient.h"
+#import "Firestore/Source/Model/FSTDatabaseID.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Model/FSTPath.h"
+#import "Firestore/Source/Util/FSTAssert.h"
+#import "Firestore/Source/Util/FSTDispatchQueue.h"
+#import "Firestore/Source/Util/FSTLogger.h"
+#import "Firestore/Source/Util/FSTUsageValidation.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/API/FIRFirestoreSettings.m b/Firestore/Source/API/FIRFirestoreSettings.m
index 106a0b5..9677ff6 100644
--- a/Firestore/Source/API/FIRFirestoreSettings.m
+++ b/Firestore/Source/API/FIRFirestoreSettings.m
@@ -16,7 +16,7 @@
 
 #import "FIRFirestoreSettings.h"
 
-#import "FSTUsageValidation.h"
+#import "Firestore/Source/Util/FSTUsageValidation.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/API/FIRGeoPoint.m b/Firestore/Source/API/FIRGeoPoint.m
index a50cf37..72e9e7d 100644
--- a/Firestore/Source/API/FIRGeoPoint.m
+++ b/Firestore/Source/API/FIRGeoPoint.m
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#import "FIRGeoPoint+Internal.h"
+#import "Firestore/Source/API/FIRGeoPoint+Internal.h"
 
-#import "FSTComparison.h"
-#import "FSTUsageValidation.h"
+#import "Firestore/Source/Util/FSTComparison.h"
+#import "Firestore/Source/Util/FSTUsageValidation.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/API/FIRListenerRegistration.m b/Firestore/Source/API/FIRListenerRegistration.m
index 5d3ea8e..9f4ddd5 100644
--- a/Firestore/Source/API/FIRListenerRegistration.m
+++ b/Firestore/Source/API/FIRListenerRegistration.m
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#import "FIRListenerRegistration+Internal.h"
+#import "Firestore/Source/API/FIRListenerRegistration+Internal.h"
 
-#import "FSTAsyncQueryListener.h"
-#import "FSTFirestoreClient.h"
+#import "Firestore/Source/Core/FSTFirestoreClient.h"
+#import "Firestore/Source/Util/FSTAsyncQueryListener.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/API/FIRQuery.m b/Firestore/Source/API/FIRQuery.m
index be64bf5..12e79c5 100644
--- a/Firestore/Source/API/FIRQuery.m
+++ b/Firestore/Source/API/FIRQuery.m
@@ -16,27 +16,27 @@
 
 #import "FIRQuery.h"
 
-#import "FIRDocumentReference+Internal.h"
 #import "FIRDocumentReference.h"
-#import "FIRDocumentSnapshot+Internal.h"
-#import "FIRFieldPath+Internal.h"
-#import "FIRFirestore+Internal.h"
-#import "FIRListenerRegistration+Internal.h"
-#import "FIRQuery+Internal.h"
-#import "FIRQuerySnapshot+Internal.h"
-#import "FIRQuery_Init.h"
-#import "FIRSnapshotMetadata+Internal.h"
-#import "FSTAssert.h"
-#import "FSTAsyncQueryListener.h"
-#import "FSTDocument.h"
-#import "FSTDocumentKey.h"
-#import "FSTEventManager.h"
-#import "FSTFieldValue.h"
-#import "FSTFirestoreClient.h"
-#import "FSTPath.h"
-#import "FSTQuery.h"
-#import "FSTUsageValidation.h"
-#import "FSTUserDataConverter.h"
+#import "Firestore/Source/API/FIRDocumentReference+Internal.h"
+#import "Firestore/Source/API/FIRDocumentSnapshot+Internal.h"
+#import "Firestore/Source/API/FIRFieldPath+Internal.h"
+#import "Firestore/Source/API/FIRFirestore+Internal.h"
+#import "Firestore/Source/API/FIRListenerRegistration+Internal.h"
+#import "Firestore/Source/API/FIRQuery+Internal.h"
+#import "Firestore/Source/API/FIRQuerySnapshot+Internal.h"
+#import "Firestore/Source/API/FIRQuery_Init.h"
+#import "Firestore/Source/API/FIRSnapshotMetadata+Internal.h"
+#import "Firestore/Source/API/FSTUserDataConverter.h"
+#import "Firestore/Source/Core/FSTEventManager.h"
+#import "Firestore/Source/Core/FSTFirestoreClient.h"
+#import "Firestore/Source/Core/FSTQuery.h"
+#import "Firestore/Source/Model/FSTDocument.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Model/FSTFieldValue.h"
+#import "Firestore/Source/Model/FSTPath.h"
+#import "Firestore/Source/Util/FSTAssert.h"
+#import "Firestore/Source/Util/FSTAsyncQueryListener.h"
+#import "Firestore/Source/Util/FSTUsageValidation.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/API/FIRQuerySnapshot.m b/Firestore/Source/API/FIRQuerySnapshot.m
index 4bf4edf..6bc6761 100644
--- a/Firestore/Source/API/FIRQuerySnapshot.m
+++ b/Firestore/Source/API/FIRQuerySnapshot.m
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-#import "FIRQuerySnapshot+Internal.h"
+#import "Firestore/Source/API/FIRQuerySnapshot+Internal.h"
 
-#import "FIRDocumentChange+Internal.h"
-#import "FIRDocumentSnapshot+Internal.h"
-#import "FIRQuery+Internal.h"
 #import "FIRSnapshotMetadata.h"
-#import "FSTAssert.h"
-#import "FSTDocument.h"
-#import "FSTDocumentSet.h"
-#import "FSTQuery.h"
-#import "FSTViewSnapshot.h"
+#import "Firestore/Source/API/FIRDocumentChange+Internal.h"
+#import "Firestore/Source/API/FIRDocumentSnapshot+Internal.h"
+#import "Firestore/Source/API/FIRQuery+Internal.h"
+#import "Firestore/Source/Core/FSTQuery.h"
+#import "Firestore/Source/Core/FSTViewSnapshot.h"
+#import "Firestore/Source/Model/FSTDocument.h"
+#import "Firestore/Source/Model/FSTDocumentSet.h"
+#import "Firestore/Source/Util/FSTAssert.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/API/FIRSetOptions.m b/Firestore/Source/API/FIRSetOptions.m
index ea68c63..623deaa 100644
--- a/Firestore/Source/API/FIRSetOptions.m
+++ b/Firestore/Source/API/FIRSetOptions.m
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#import "FIRSetOptions+Internal.h"
-#import "FSTMutation.h"
+#import "Firestore/Source/API/FIRSetOptions+Internal.h"
+#import "Firestore/Source/Model/FSTMutation.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/API/FIRSnapshotMetadata.m b/Firestore/Source/API/FIRSnapshotMetadata.m
index ff49d8f..224015f 100644
--- a/Firestore/Source/API/FIRSnapshotMetadata.m
+++ b/Firestore/Source/API/FIRSnapshotMetadata.m
@@ -16,7 +16,7 @@
 
 #import "FIRSnapshotMetadata.h"
 
-#import "FIRSnapshotMetadata+Internal.h"
+#import "Firestore/Source/API/FIRSnapshotMetadata+Internal.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/API/FIRTransaction.m b/Firestore/Source/API/FIRTransaction.m
index 69e7b12..5edff19 100644
--- a/Firestore/Source/API/FIRTransaction.m
+++ b/Firestore/Source/API/FIRTransaction.m
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-#import "FIRTransaction+Internal.h"
-
-#import "FIRDocumentReference+Internal.h"
-#import "FIRDocumentSnapshot+Internal.h"
-#import "FIRFirestore+Internal.h"
-#import "FIRSetOptions+Internal.h"
-#import "FSTAssert.h"
-#import "FSTDocument.h"
-#import "FSTTransaction.h"
-#import "FSTUsageValidation.h"
-#import "FSTUserDataConverter.h"
+#import "Firestore/Source/API/FIRTransaction+Internal.h"
+
+#import "Firestore/Source/API/FIRDocumentReference+Internal.h"
+#import "Firestore/Source/API/FIRDocumentSnapshot+Internal.h"
+#import "Firestore/Source/API/FIRFirestore+Internal.h"
+#import "Firestore/Source/API/FIRSetOptions+Internal.h"
+#import "Firestore/Source/API/FSTUserDataConverter.h"
+#import "Firestore/Source/Core/FSTTransaction.h"
+#import "Firestore/Source/Model/FSTDocument.h"
+#import "Firestore/Source/Util/FSTAssert.h"
+#import "Firestore/Source/Util/FSTUsageValidation.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/API/FIRWriteBatch.m b/Firestore/Source/API/FIRWriteBatch.m
index 20559b8..b918a9a 100644
--- a/Firestore/Source/API/FIRWriteBatch.m
+++ b/Firestore/Source/API/FIRWriteBatch.m
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-#import "FIRWriteBatch+Internal.h"
-
-#import "FIRDocumentReference+Internal.h"
-#import "FIRFirestore+Internal.h"
-#import "FIRSetOptions+Internal.h"
-#import "FSTFirestoreClient.h"
-#import "FSTMutation.h"
-#import "FSTUsageValidation.h"
-#import "FSTUserDataConverter.h"
+#import "Firestore/Source/API/FIRWriteBatch+Internal.h"
+
+#import "Firestore/Source/API/FIRDocumentReference+Internal.h"
+#import "Firestore/Source/API/FIRFirestore+Internal.h"
+#import "Firestore/Source/API/FIRSetOptions+Internal.h"
+#import "Firestore/Source/API/FSTUserDataConverter.h"
+#import "Firestore/Source/Core/FSTFirestoreClient.h"
+#import "Firestore/Source/Model/FSTMutation.h"
+#import "Firestore/Source/Util/FSTUsageValidation.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Source/API/FSTUserDataConverter.m b/Firestore/Source/API/FSTUserDataConverter.m
index aa79a51..414aadb 100644
--- a/Firestore/Source/API/FSTUserDataConverter.m
+++ b/Firestore/Source/API/FSTUserDataConverter.m
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-#import "FSTUserDataConverter.h"
+#import "Firestore/Source/API/FSTUserDataConverter.h"
 
-#import "FIRDocumentReference+Internal.h"
-#import "FIRFieldPath+Internal.h"
-#import "FIRFieldValue+Internal.h"
-#import "FIRFirestore+Internal.h"
 #import "FIRGeoPoint.h"
-#import "FIRSetOptions+Internal.h"
-#import "FSTAssert.h"
-#import "FSTDatabaseID.h"
-#import "FSTDocumentKey.h"
-#import "FSTFieldValue.h"
-#import "FSTMutation.h"
-#import "FSTPath.h"
-#import "FSTTimestamp.h"
-#import "FSTUsageValidation.h"
+#import "Firestore/Source/API/FIRDocumentReference+Internal.h"
+#import "Firestore/Source/API/FIRFieldPath+Internal.h"
+#import "Firestore/Source/API/FIRFieldValue+Internal.h"
+#import "Firestore/Source/API/FIRFirestore+Internal.h"
+#import "Firestore/Source/API/FIRSetOptions+Internal.h"
+#import "Firestore/Source/Core/FSTTimestamp.h"
+#import "Firestore/Source/Model/FSTDatabaseID.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Model/FSTFieldValue.h"
+#import "Firestore/Source/Model/FSTMutation.h"
+#import "Firestore/Source/Model/FSTPath.h"
+#import "Firestore/Source/Util/FSTAssert.h"
+#import "Firestore/Source/Util/FSTUsageValidation.h"
 
 NS_ASSUME_NONNULL_BEGIN