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/Source | |
| 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/Source')
119 files changed, 627 insertions, 628 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 diff --git a/Firestore/Source/Auth/FSTCredentialsProvider.m b/Firestore/Source/Auth/FSTCredentialsProvider.m index cec7c2b..94da76d 100644 --- a/Firestore/Source/Auth/FSTCredentialsProvider.m +++ b/Firestore/Source/Auth/FSTCredentialsProvider.m @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "FSTCredentialsProvider.h" +#import "Firestore/Source/Auth/FSTCredentialsProvider.h" #import <FirebaseCommunity/FIRApp.h> #import <FirebaseCommunity/FIRAuth.h> @@ -22,13 +22,13 @@ #import <GRPCClient/GRPCCall.h> // This is not an exported header so it's not visible via FirebaseCommunity -#import "FIRAppInternal.h" +#import "Firebase/Core/Private/FIRAppInternal.h" #import "FIRFirestoreErrors.h" -#import "FSTAssert.h" -#import "FSTClasses.h" -#import "FSTDispatchQueue.h" -#import "FSTUser.h" +#import "Firestore/Source/Util/FSTAssert.h" +#import "Firestore/Source/Util/FSTClasses.h" +#import "Firestore/Source/Util/FSTDispatchQueue.h" +#import "Firestore/Source/Auth/FSTUser.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Auth/FSTEmptyCredentialsProvider.h b/Firestore/Source/Auth/FSTEmptyCredentialsProvider.h index c0074c2..5783bcc 100644 --- a/Firestore/Source/Auth/FSTEmptyCredentialsProvider.h +++ b/Firestore/Source/Auth/FSTEmptyCredentialsProvider.h @@ -16,7 +16,7 @@ #import <Foundation/Foundation.h> -#import "FSTCredentialsProvider.h" +#import "Firestore/Source/Auth/FSTCredentialsProvider.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Auth/FSTEmptyCredentialsProvider.m b/Firestore/Source/Auth/FSTEmptyCredentialsProvider.m index 266e09b..e78452a 100644 --- a/Firestore/Source/Auth/FSTEmptyCredentialsProvider.m +++ b/Firestore/Source/Auth/FSTEmptyCredentialsProvider.m @@ -14,11 +14,11 @@ * limitations under the License. */ -#import "FSTEmptyCredentialsProvider.h" +#import "Firestore/Source/Auth/FSTEmptyCredentialsProvider.h" -#import "FSTUser.h" -#import "FSTAssert.h" -#import "FSTDispatchQueue.h" +#import "Firestore/Source/Auth/FSTUser.h" +#import "Firestore/Source/Util/FSTAssert.h" +#import "Firestore/Source/Util/FSTDispatchQueue.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Auth/FSTUser.m b/Firestore/Source/Auth/FSTUser.m index a7492b2..605b4e6 100644 --- a/Firestore/Source/Auth/FSTUser.m +++ b/Firestore/Source/Auth/FSTUser.m @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "FSTUser.h" +#import "Firestore/Source/Auth/FSTUser.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Core/FSTDatabaseInfo.m b/Firestore/Source/Core/FSTDatabaseInfo.m index d2cd0ed..2dbe61a 100644 --- a/Firestore/Source/Core/FSTDatabaseInfo.m +++ b/Firestore/Source/Core/FSTDatabaseInfo.m @@ -14,9 +14,9 @@ * limitations under the License. */ -#import "FSTDatabaseInfo.h" +#import "Firestore/Source/Core/FSTDatabaseInfo.h" -#import "FSTDatabaseID.h" +#import "Firestore/Source/Model/FSTDatabaseID.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Core/FSTEventManager.h b/Firestore/Source/Core/FSTEventManager.h index 43ada66..edd2a96 100644 --- a/Firestore/Source/Core/FSTEventManager.h +++ b/Firestore/Source/Core/FSTEventManager.h @@ -16,9 +16,9 @@ #import <Foundation/Foundation.h> -#import "FSTRemoteStore.h" -#import "FSTTypes.h" -#import "FSTViewSnapshot.h" +#import "Firestore/Source/Core/FSTTypes.h" +#import "Firestore/Source/Core/FSTViewSnapshot.h" +#import "Firestore/Source/Remote/FSTRemoteStore.h" @class FSTQuery; @class FSTSyncEngine; diff --git a/Firestore/Source/Core/FSTEventManager.m b/Firestore/Source/Core/FSTEventManager.m index 17a0546..3e1b99b 100644 --- a/Firestore/Source/Core/FSTEventManager.m +++ b/Firestore/Source/Core/FSTEventManager.m @@ -14,12 +14,12 @@ * limitations under the License. */ -#import "FSTEventManager.h" +#import "Firestore/Source/Core/FSTEventManager.h" -#import "FSTAssert.h" -#import "FSTDocumentSet.h" -#import "FSTQuery.h" -#import "FSTSyncEngine.h" +#import "Firestore/Source/Core/FSTQuery.h" +#import "Firestore/Source/Core/FSTSyncEngine.h" +#import "Firestore/Source/Model/FSTDocumentSet.h" +#import "Firestore/Source/Util/FSTAssert.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Core/FSTFirestoreClient.h b/Firestore/Source/Core/FSTFirestoreClient.h index 21d61d4..6a1e11b 100644 --- a/Firestore/Source/Core/FSTFirestoreClient.h +++ b/Firestore/Source/Core/FSTFirestoreClient.h @@ -16,9 +16,9 @@ #import <Foundation/Foundation.h> -#import "FSTRemoteStore.h" -#import "FSTTypes.h" -#import "FSTViewSnapshot.h" +#import "Firestore/Source/Core/FSTTypes.h" +#import "Firestore/Source/Core/FSTViewSnapshot.h" +#import "Firestore/Source/Remote/FSTRemoteStore.h" @class FSTDatabaseID; @class FSTDatabaseInfo; diff --git a/Firestore/Source/Core/FSTFirestoreClient.m b/Firestore/Source/Core/FSTFirestoreClient.m index 1a53197..2e0e407 100644 --- a/Firestore/Source/Core/FSTFirestoreClient.m +++ b/Firestore/Source/Core/FSTFirestoreClient.m @@ -14,26 +14,26 @@ * limitations under the License. */ -#import "FSTFirestoreClient.h" - -#import "FSTAssert.h" -#import "FSTClasses.h" -#import "FSTCredentialsProvider.h" -#import "FSTDatabaseInfo.h" -#import "FSTDatastore.h" -#import "FSTDispatchQueue.h" -#import "FSTEagerGarbageCollector.h" -#import "FSTEventManager.h" -#import "FSTLevelDB.h" -#import "FSTLocalSerializer.h" -#import "FSTLocalStore.h" -#import "FSTLogger.h" -#import "FSTMemoryPersistence.h" -#import "FSTNoOpGarbageCollector.h" -#import "FSTRemoteStore.h" -#import "FSTSerializerBeta.h" -#import "FSTSyncEngine.h" -#import "FSTTransaction.h" +#import "Firestore/Source/Core/FSTFirestoreClient.h" + +#import "Firestore/Source/Auth/FSTCredentialsProvider.h" +#import "Firestore/Source/Core/FSTDatabaseInfo.h" +#import "Firestore/Source/Core/FSTEventManager.h" +#import "Firestore/Source/Core/FSTSyncEngine.h" +#import "Firestore/Source/Core/FSTTransaction.h" +#import "Firestore/Source/Local/FSTEagerGarbageCollector.h" +#import "Firestore/Source/Local/FSTLevelDB.h" +#import "Firestore/Source/Local/FSTLocalSerializer.h" +#import "Firestore/Source/Local/FSTLocalStore.h" +#import "Firestore/Source/Local/FSTMemoryPersistence.h" +#import "Firestore/Source/Local/FSTNoOpGarbageCollector.h" +#import "Firestore/Source/Remote/FSTDatastore.h" +#import "Firestore/Source/Remote/FSTRemoteStore.h" +#import "Firestore/Source/Remote/FSTSerializerBeta.h" +#import "Firestore/Source/Util/FSTAssert.h" +#import "Firestore/Source/Util/FSTClasses.h" +#import "Firestore/Source/Util/FSTDispatchQueue.h" +#import "Firestore/Source/Util/FSTLogger.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Core/FSTQuery.m b/Firestore/Source/Core/FSTQuery.m index b220c7c..0bfd917 100644 --- a/Firestore/Source/Core/FSTQuery.m +++ b/Firestore/Source/Core/FSTQuery.m @@ -14,14 +14,14 @@ * limitations under the License. */ -#import "FSTQuery.h" - -#import "FIRFirestore+Internal.h" -#import "FSTAssert.h" -#import "FSTDocument.h" -#import "FSTDocumentKey.h" -#import "FSTFieldValue.h" -#import "FSTPath.h" +#import "Firestore/Source/Core/FSTQuery.h" + +#import "Firestore/Source/API/FIRFirestore+Internal.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" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Core/FSTSnapshotVersion.m b/Firestore/Source/Core/FSTSnapshotVersion.m index 68d5d7f..980ae52 100644 --- a/Firestore/Source/Core/FSTSnapshotVersion.m +++ b/Firestore/Source/Core/FSTSnapshotVersion.m @@ -14,9 +14,9 @@ * limitations under the License. */ -#import "FSTSnapshotVersion.h" +#import "Firestore/Source/Core/FSTSnapshotVersion.h" -#import "FSTTimestamp.h" +#import "Firestore/Source/Core/FSTTimestamp.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Core/FSTSyncEngine.h b/Firestore/Source/Core/FSTSyncEngine.h index 1348ce1..bb45196 100644 --- a/Firestore/Source/Core/FSTSyncEngine.h +++ b/Firestore/Source/Core/FSTSyncEngine.h @@ -16,8 +16,8 @@ #import <Foundation/Foundation.h> -#import "FSTRemoteStore.h" -#import "FSTTypes.h" +#import "Firestore/Source/Core/FSTTypes.h" +#import "Firestore/Source/Remote/FSTRemoteStore.h" @class FSTDispatchQueue; @class FSTLocalStore; diff --git a/Firestore/Source/Core/FSTSyncEngine.m b/Firestore/Source/Core/FSTSyncEngine.m index 8698a97..98658e4 100644 --- a/Firestore/Source/Core/FSTSyncEngine.m +++ b/Firestore/Source/Core/FSTSyncEngine.m @@ -14,32 +14,32 @@ * limitations under the License. */ -#import "FSTSyncEngine.h" +#import "Firestore/Source/Core/FSTSyncEngine.h" #import <GRPCClient/GRPCCall.h> #import "FIRFirestoreErrors.h" -#import "FSTAssert.h" -#import "FSTDispatchQueue.h" -#import "FSTDocument.h" -#import "FSTDocumentKey.h" -#import "FSTDocumentSet.h" -#import "FSTEagerGarbageCollector.h" -#import "FSTLocalStore.h" -#import "FSTLocalViewChanges.h" -#import "FSTLocalWriteResult.h" -#import "FSTLogger.h" -#import "FSTMutationBatch.h" -#import "FSTQuery.h" -#import "FSTQueryData.h" -#import "FSTReferenceSet.h" -#import "FSTRemoteEvent.h" -#import "FSTSnapshotVersion.h" -#import "FSTTargetIDGenerator.h" -#import "FSTTransaction.h" -#import "FSTUser.h" -#import "FSTView.h" -#import "FSTViewSnapshot.h" +#import "Firestore/Source/Auth/FSTUser.h" +#import "Firestore/Source/Core/FSTQuery.h" +#import "Firestore/Source/Core/FSTSnapshotVersion.h" +#import "Firestore/Source/Core/FSTTargetIDGenerator.h" +#import "Firestore/Source/Core/FSTTransaction.h" +#import "Firestore/Source/Core/FSTView.h" +#import "Firestore/Source/Core/FSTViewSnapshot.h" +#import "Firestore/Source/Local/FSTEagerGarbageCollector.h" +#import "Firestore/Source/Local/FSTLocalStore.h" +#import "Firestore/Source/Local/FSTLocalViewChanges.h" +#import "Firestore/Source/Local/FSTLocalWriteResult.h" +#import "Firestore/Source/Local/FSTQueryData.h" +#import "Firestore/Source/Local/FSTReferenceSet.h" +#import "Firestore/Source/Model/FSTDocument.h" +#import "Firestore/Source/Model/FSTDocumentKey.h" +#import "Firestore/Source/Model/FSTDocumentSet.h" +#import "Firestore/Source/Model/FSTMutationBatch.h" +#import "Firestore/Source/Remote/FSTRemoteEvent.h" +#import "Firestore/Source/Util/FSTAssert.h" +#import "Firestore/Source/Util/FSTDispatchQueue.h" +#import "Firestore/Source/Util/FSTLogger.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Core/FSTTargetIDGenerator.h b/Firestore/Source/Core/FSTTargetIDGenerator.h index 5b9db10..0b230ae 100644 --- a/Firestore/Source/Core/FSTTargetIDGenerator.h +++ b/Firestore/Source/Core/FSTTargetIDGenerator.h @@ -16,7 +16,7 @@ #import <Foundation/Foundation.h> -#import "FSTTypes.h" +#import "Firestore/Source/Core/FSTTypes.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Core/FSTTargetIDGenerator.m b/Firestore/Source/Core/FSTTargetIDGenerator.m index 86ded30..58092ec 100644 --- a/Firestore/Source/Core/FSTTargetIDGenerator.m +++ b/Firestore/Source/Core/FSTTargetIDGenerator.m @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "FSTTargetIDGenerator.h" +#import "Firestore/Source/Core/FSTTargetIDGenerator.h" #import <libkern/OSAtomic.h> diff --git a/Firestore/Source/Core/FSTTimestamp.m b/Firestore/Source/Core/FSTTimestamp.m index 941217a..6d9e314 100644 --- a/Firestore/Source/Core/FSTTimestamp.m +++ b/Firestore/Source/Core/FSTTimestamp.m @@ -14,10 +14,10 @@ * limitations under the License. */ -#import "FSTTimestamp.h" +#import "Firestore/Source/Core/FSTTimestamp.h" -#import "FSTAssert.h" -#import "FSTComparison.h" +#import "Firestore/Source/Util/FSTAssert.h" +#import "Firestore/Source/Util/FSTComparison.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Core/FSTTransaction.h b/Firestore/Source/Core/FSTTransaction.h index 7fa3a10..d4f3d8d 100644 --- a/Firestore/Source/Core/FSTTransaction.h +++ b/Firestore/Source/Core/FSTTransaction.h @@ -16,7 +16,7 @@ #import <Foundation/Foundation.h> -#import "FSTTypes.h" +#import "Firestore/Source/Core/FSTTypes.h" @class FIRSetOptions; @class FSTDatastore; diff --git a/Firestore/Source/Core/FSTTransaction.m b/Firestore/Source/Core/FSTTransaction.m index 26c69e0..c4c5f27 100644 --- a/Firestore/Source/Core/FSTTransaction.m +++ b/Firestore/Source/Core/FSTTransaction.m @@ -14,21 +14,21 @@ * limitations under the License. */ -#import "FSTTransaction.h" +#import "Firestore/Source/Core/FSTTransaction.h" #import <GRPCClient/GRPCCall.h> #import "FIRFirestoreErrors.h" #import "FIRSetOptions.h" -#import "FSTAssert.h" -#import "FSTDatastore.h" -#import "FSTDocument.h" -#import "FSTDocumentKey.h" -#import "FSTDocumentKeySet.h" -#import "FSTMutation.h" -#import "FSTSnapshotVersion.h" -#import "FSTUsageValidation.h" -#import "FSTUserDataConverter.h" +#import "Firestore/Source/API/FSTUserDataConverter.h" +#import "Firestore/Source/Core/FSTSnapshotVersion.h" +#import "Firestore/Source/Model/FSTDocument.h" +#import "Firestore/Source/Model/FSTDocumentKey.h" +#import "Firestore/Source/Model/FSTDocumentKeySet.h" +#import "Firestore/Source/Model/FSTMutation.h" +#import "Firestore/Source/Remote/FSTDatastore.h" +#import "Firestore/Source/Util/FSTAssert.h" +#import "Firestore/Source/Util/FSTUsageValidation.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Core/FSTView.h b/Firestore/Source/Core/FSTView.h index 2dbfac2..ed230a3 100644 --- a/Firestore/Source/Core/FSTView.h +++ b/Firestore/Source/Core/FSTView.h @@ -16,8 +16,8 @@ #import <Foundation/Foundation.h> -#import "FSTDocumentDictionary.h" -#import "FSTDocumentKeySet.h" +#import "Firestore/Source/Model/FSTDocumentDictionary.h" +#import "Firestore/Source/Model/FSTDocumentKeySet.h" @class FSTDocumentKey; @class FSTDocumentSet; diff --git a/Firestore/Source/Core/FSTView.m b/Firestore/Source/Core/FSTView.m index 719e303..9b44bf4 100644 --- a/Firestore/Source/Core/FSTView.m +++ b/Firestore/Source/Core/FSTView.m @@ -14,16 +14,16 @@ * limitations under the License. */ -#import "FSTView.h" - -#import "FSTAssert.h" -#import "FSTDocument.h" -#import "FSTDocumentKey.h" -#import "FSTDocumentSet.h" -#import "FSTFieldValue.h" -#import "FSTQuery.h" -#import "FSTRemoteEvent.h" -#import "FSTViewSnapshot.h" +#import "Firestore/Source/Core/FSTView.h" + +#import "Firestore/Source/Core/FSTQuery.h" +#import "Firestore/Source/Core/FSTViewSnapshot.h" +#import "Firestore/Source/Model/FSTDocument.h" +#import "Firestore/Source/Model/FSTDocumentKey.h" +#import "Firestore/Source/Model/FSTDocumentSet.h" +#import "Firestore/Source/Model/FSTFieldValue.h" +#import "Firestore/Source/Remote/FSTRemoteEvent.h" +#import "Firestore/Source/Util/FSTAssert.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Core/FSTViewSnapshot.m b/Firestore/Source/Core/FSTViewSnapshot.m index 016f890..e60b785 100644 --- a/Firestore/Source/Core/FSTViewSnapshot.m +++ b/Firestore/Source/Core/FSTViewSnapshot.m @@ -14,14 +14,14 @@ * limitations under the License. */ -#import "FSTViewSnapshot.h" - -#import "FSTAssert.h" -#import "FSTDocument.h" -#import "FSTDocumentKey.h" -#import "FSTDocumentSet.h" -#import "FSTImmutableSortedDictionary.h" -#import "FSTQuery.h" +#import "Firestore/Source/Core/FSTViewSnapshot.h" + +#import "Firestore/Source/Core/FSTQuery.h" +#import "Firestore/Source/Model/FSTDocument.h" +#import "Firestore/Source/Model/FSTDocumentKey.h" +#import "Firestore/Source/Model/FSTDocumentSet.h" +#import "Firestore/Source/Util/FSTAssert.h" +#import "Firestore/third_party/Immutable/FSTImmutableSortedDictionary.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Local/FSTDocumentReference.m b/Firestore/Source/Local/FSTDocumentReference.m index 7d9e3db..1631789 100644 --- a/Firestore/Source/Local/FSTDocumentReference.m +++ b/Firestore/Source/Local/FSTDocumentReference.m @@ -14,10 +14,10 @@ * limitations under the License. */ -#import "FSTDocumentReference.h" +#import "Firestore/Source/Local/FSTDocumentReference.h" -#import "FSTComparison.h" -#import "FSTDocumentKey.h" +#import "Firestore/Source/Model/FSTDocumentKey.h" +#import "Firestore/Source/Util/FSTComparison.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Local/FSTEagerGarbageCollector.h b/Firestore/Source/Local/FSTEagerGarbageCollector.h index f2f373c..40815b7 100644 --- a/Firestore/Source/Local/FSTEagerGarbageCollector.h +++ b/Firestore/Source/Local/FSTEagerGarbageCollector.h @@ -16,7 +16,7 @@ #import <Foundation/Foundation.h> -#import "FSTGarbageCollector.h" +#import "Firestore/Source/Local/FSTGarbageCollector.h" @class FSTDocumentKey; diff --git a/Firestore/Source/Local/FSTEagerGarbageCollector.m b/Firestore/Source/Local/FSTEagerGarbageCollector.m index 971f368..77a577e 100644 --- a/Firestore/Source/Local/FSTEagerGarbageCollector.m +++ b/Firestore/Source/Local/FSTEagerGarbageCollector.m @@ -14,9 +14,9 @@ * limitations under the License. */ -#import "FSTEagerGarbageCollector.h" +#import "Firestore/Source/Local/FSTEagerGarbageCollector.h" -#import "FSTDocumentKey.h" +#import "Firestore/Source/Model/FSTDocumentKey.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Local/FSTGarbageCollector.h b/Firestore/Source/Local/FSTGarbageCollector.h index c999f66..ff5116b 100644 --- a/Firestore/Source/Local/FSTGarbageCollector.h +++ b/Firestore/Source/Local/FSTGarbageCollector.h @@ -16,7 +16,7 @@ #import <Foundation/Foundation.h> -#import "FSTTypes.h" +#import "Firestore/Source/Core/FSTTypes.h" @class FSTDocumentKey; @class FSTDocumentReference; diff --git a/Firestore/Source/Local/FSTLevelDB.h b/Firestore/Source/Local/FSTLevelDB.h index a2c838d..762054b 100644 --- a/Firestore/Source/Local/FSTLevelDB.h +++ b/Firestore/Source/Local/FSTLevelDB.h @@ -16,7 +16,7 @@ #import <Foundation/Foundation.h> -#import "FSTPersistence.h" +#import "Firestore/Source/Local/FSTPersistence.h" #ifdef __cplusplus #include <memory> diff --git a/Firestore/Source/Local/FSTLevelDB.mm b/Firestore/Source/Local/FSTLevelDB.mm index 81e1064..fb1c81a 100644 --- a/Firestore/Source/Local/FSTLevelDB.mm +++ b/Firestore/Source/Local/FSTLevelDB.mm @@ -14,21 +14,21 @@ * limitations under the License. */ -#import "FSTLevelDB.h" +#import "Firestore/Source/Local/FSTLevelDB.h" #include <leveldb/db.h> #import "FIRFirestoreErrors.h" -#import "FSTAssert.h" -#import "FSTDatabaseID.h" -#import "FSTDatabaseInfo.h" -#import "FSTLevelDBMutationQueue.h" -#import "FSTLevelDBQueryCache.h" -#import "FSTLevelDBRemoteDocumentCache.h" -#import "FSTLogger.h" -#import "FSTSerializerBeta.h" -#import "FSTWriteGroup.h" -#import "FSTWriteGroupTracker.h" +#import "Firestore/Source/Core/FSTDatabaseInfo.h" +#import "Firestore/Source/Local/FSTLevelDBMutationQueue.h" +#import "Firestore/Source/Local/FSTLevelDBQueryCache.h" +#import "Firestore/Source/Local/FSTLevelDBRemoteDocumentCache.h" +#import "Firestore/Source/Local/FSTWriteGroup.h" +#import "Firestore/Source/Local/FSTWriteGroupTracker.h" +#import "Firestore/Source/Model/FSTDatabaseID.h" +#import "Firestore/Source/Remote/FSTSerializerBeta.h" +#import "Firestore/Source/Util/FSTAssert.h" +#import "Firestore/Source/Util/FSTLogger.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Local/FSTLevelDBKey.h b/Firestore/Source/Local/FSTLevelDBKey.h index bad7829..2e9b9b2 100644 --- a/Firestore/Source/Local/FSTLevelDBKey.h +++ b/Firestore/Source/Local/FSTLevelDBKey.h @@ -20,9 +20,8 @@ #import <Foundation/Foundation.h> -#import "FSTTypes.h" - -#import "StringView.h" +#import "Firestore/Source/Core/FSTTypes.h" +#import "Firestore/Source/Local/StringView.h" @class FSTDocumentKey; @class FSTResourcePath; diff --git a/Firestore/Source/Local/FSTLevelDBKey.mm b/Firestore/Source/Local/FSTLevelDBKey.mm index 1c0af45..c6f51b9 100644 --- a/Firestore/Source/Local/FSTLevelDBKey.mm +++ b/Firestore/Source/Local/FSTLevelDBKey.mm @@ -14,14 +14,14 @@ * limitations under the License. */ -#import "FSTLevelDBKey.h" +#import "Firestore/Source/Local/FSTLevelDBKey.h" #include <string> -#import "FSTDocumentKey.h" -#import "FSTPath.h" -#include "ordered_code.h" -#include "string_util.h" +#include "Firestore/Port/ordered_code.h" +#include "Firestore/Port/string_util.h" +#import "Firestore/Source/Model/FSTDocumentKey.h" +#import "Firestore/Source/Model/FSTPath.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Local/FSTLevelDBMutationQueue.h b/Firestore/Source/Local/FSTLevelDBMutationQueue.h index c9b5166..dd2ed4f 100644 --- a/Firestore/Source/Local/FSTLevelDBMutationQueue.h +++ b/Firestore/Source/Local/FSTLevelDBMutationQueue.h @@ -16,7 +16,7 @@ #import <Foundation/Foundation.h> -#import "FSTMutationQueue.h" +#import "Firestore/Source/Local/FSTMutationQueue.h" #ifdef __cplusplus #include <memory> diff --git a/Firestore/Source/Local/FSTLevelDBMutationQueue.mm b/Firestore/Source/Local/FSTLevelDBMutationQueue.mm index 689ea6e..56a22a1 100644 --- a/Firestore/Source/Local/FSTLevelDBMutationQueue.mm +++ b/Firestore/Source/Local/FSTLevelDBMutationQueue.mm @@ -14,28 +14,28 @@ * limitations under the License. */ -#import "FSTLevelDBMutationQueue.h" +#import "Firestore/Source/Local/FSTLevelDBMutationQueue.h" #include <leveldb/db.h> #include <leveldb/write_batch.h> #include <set> #include <string> -#import "FSTAssert.h" -#import "FSTDocumentKey.h" -#import "FSTLevelDB.h" -#import "FSTLevelDBKey.h" -#import "FSTLocalSerializer.h" -#import "FSTMutation.h" -#import "FSTMutationBatch.h" -#import "FSTPath.h" -#import "FSTQuery.h" -#import "FSTUser.h" -#import "FSTWriteGroup.h" -#import "Mutation.pbobjc.h" - -#include "ordered_code.h" -#include "string_util.h" +#import "Firestore/Protos/objc/firestore/local/Mutation.pbobjc.h" +#import "Firestore/Source/Auth/FSTUser.h" +#import "Firestore/Source/Core/FSTQuery.h" +#import "Firestore/Source/Local/FSTLevelDB.h" +#import "Firestore/Source/Local/FSTLevelDBKey.h" +#import "Firestore/Source/Local/FSTLocalSerializer.h" +#import "Firestore/Source/Local/FSTWriteGroup.h" +#import "Firestore/Source/Model/FSTDocumentKey.h" +#import "Firestore/Source/Model/FSTMutation.h" +#import "Firestore/Source/Model/FSTMutationBatch.h" +#import "Firestore/Source/Model/FSTPath.h" +#import "Firestore/Source/Util/FSTAssert.h" + +#include "Firestore/Port/ordered_code.h" +#include "Firestore/Port/string_util.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Local/FSTLevelDBQueryCache.h b/Firestore/Source/Local/FSTLevelDBQueryCache.h index 3f24e6a..6d5cd60 100644 --- a/Firestore/Source/Local/FSTLevelDBQueryCache.h +++ b/Firestore/Source/Local/FSTLevelDBQueryCache.h @@ -16,7 +16,7 @@ #import <Foundation/Foundation.h> -#import "FSTQueryCache.h" +#import "Firestore/Source/Local/FSTQueryCache.h" #ifdef __cplusplus #include <memory> diff --git a/Firestore/Source/Local/FSTLevelDBQueryCache.mm b/Firestore/Source/Local/FSTLevelDBQueryCache.mm index c79014d..13d15ee 100644 --- a/Firestore/Source/Local/FSTLevelDBQueryCache.mm +++ b/Firestore/Source/Local/FSTLevelDBQueryCache.mm @@ -14,23 +14,23 @@ * limitations under the License. */ -#import "FSTLevelDBQueryCache.h" +#import "Firestore/Source/Local/FSTLevelDBQueryCache.h" #include <leveldb/db.h> #include <leveldb/write_batch.h> #include <string> -#import "FSTAssert.h" -#import "FSTDocumentKey.h" -#import "FSTLevelDBKey.h" -#import "FSTLocalSerializer.h" -#import "FSTQuery.h" -#import "FSTQueryData.h" -#import "FSTWriteGroup.h" -#import "Target.pbobjc.h" - -#include "ordered_code.h" -#include "string_util.h" +#import "Firestore/Protos/objc/firestore/local/Target.pbobjc.h" +#import "Firestore/Source/Core/FSTQuery.h" +#import "Firestore/Source/Local/FSTLevelDBKey.h" +#import "Firestore/Source/Local/FSTLocalSerializer.h" +#import "Firestore/Source/Local/FSTQueryData.h" +#import "Firestore/Source/Local/FSTWriteGroup.h" +#import "Firestore/Source/Model/FSTDocumentKey.h" +#import "Firestore/Source/Util/FSTAssert.h" + +#include "Firestore/Port/ordered_code.h" +#include "Firestore/Port/string_util.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Local/FSTLevelDBRemoteDocumentCache.h b/Firestore/Source/Local/FSTLevelDBRemoteDocumentCache.h index f327813..1da3cca 100644 --- a/Firestore/Source/Local/FSTLevelDBRemoteDocumentCache.h +++ b/Firestore/Source/Local/FSTLevelDBRemoteDocumentCache.h @@ -16,7 +16,7 @@ #import <Foundation/Foundation.h> -#import "FSTRemoteDocumentCache.h" +#import "Firestore/Source/Local/FSTRemoteDocumentCache.h" #ifdef __cplusplus #include <memory> diff --git a/Firestore/Source/Local/FSTLevelDBRemoteDocumentCache.mm b/Firestore/Source/Local/FSTLevelDBRemoteDocumentCache.mm index 67c654e..b2df67f 100644 --- a/Firestore/Source/Local/FSTLevelDBRemoteDocumentCache.mm +++ b/Firestore/Source/Local/FSTLevelDBRemoteDocumentCache.mm @@ -14,24 +14,24 @@ * limitations under the License. */ -#import "FSTLevelDBRemoteDocumentCache.h" +#import "Firestore/Source/Local/FSTLevelDBRemoteDocumentCache.h" #include <leveldb/db.h> #include <leveldb/write_batch.h> #include <string> -#import "FSTAssert.h" -#import "FSTDocument.h" -#import "FSTDocumentDictionary.h" -#import "FSTDocumentKey.h" -#import "FSTDocumentSet.h" -#import "FSTLevelDBKey.h" -#import "FSTLocalSerializer.h" -#import "FSTWriteGroup.h" -#import "MaybeDocument.pbobjc.h" - -#include "ordered_code.h" -#include "string_util.h" +#import "Firestore/Protos/objc/firestore/local/MaybeDocument.pbobjc.h" +#import "Firestore/Source/Local/FSTLevelDBKey.h" +#import "Firestore/Source/Local/FSTLocalSerializer.h" +#import "Firestore/Source/Local/FSTWriteGroup.h" +#import "Firestore/Source/Model/FSTDocument.h" +#import "Firestore/Source/Model/FSTDocumentDictionary.h" +#import "Firestore/Source/Model/FSTDocumentKey.h" +#import "Firestore/Source/Model/FSTDocumentSet.h" +#import "Firestore/Source/Util/FSTAssert.h" + +#include "Firestore/Port/ordered_code.h" +#include "Firestore/Port/string_util.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Local/FSTLocalDocumentsView.h b/Firestore/Source/Local/FSTLocalDocumentsView.h index 60571c2..46830e7 100644 --- a/Firestore/Source/Local/FSTLocalDocumentsView.h +++ b/Firestore/Source/Local/FSTLocalDocumentsView.h @@ -16,8 +16,8 @@ #import <Foundation/Foundation.h> -#import "FSTDocumentDictionary.h" -#import "FSTDocumentKeySet.h" +#import "Firestore/Source/Model/FSTDocumentDictionary.h" +#import "Firestore/Source/Model/FSTDocumentKeySet.h" @class FSTDocumentKey; @class FSTMaybeDocument; diff --git a/Firestore/Source/Local/FSTLocalDocumentsView.m b/Firestore/Source/Local/FSTLocalDocumentsView.m index 0cad593..a6734c4 100644 --- a/Firestore/Source/Local/FSTLocalDocumentsView.m +++ b/Firestore/Source/Local/FSTLocalDocumentsView.m @@ -14,18 +14,18 @@ * limitations under the License. */ -#import "FSTLocalDocumentsView.h" - -#import "FSTAssert.h" -#import "FSTDocument.h" -#import "FSTDocumentDictionary.h" -#import "FSTDocumentKey.h" -#import "FSTMutation.h" -#import "FSTMutationBatch.h" -#import "FSTMutationQueue.h" -#import "FSTQuery.h" -#import "FSTRemoteDocumentCache.h" -#import "FSTSnapshotVersion.h" +#import "Firestore/Source/Local/FSTLocalDocumentsView.h" + +#import "Firestore/Source/Core/FSTQuery.h" +#import "Firestore/Source/Core/FSTSnapshotVersion.h" +#import "Firestore/Source/Local/FSTMutationQueue.h" +#import "Firestore/Source/Local/FSTRemoteDocumentCache.h" +#import "Firestore/Source/Model/FSTDocument.h" +#import "Firestore/Source/Model/FSTDocumentDictionary.h" +#import "Firestore/Source/Model/FSTDocumentKey.h" +#import "Firestore/Source/Model/FSTMutation.h" +#import "Firestore/Source/Model/FSTMutationBatch.h" +#import "Firestore/Source/Util/FSTAssert.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Local/FSTLocalSerializer.m b/Firestore/Source/Local/FSTLocalSerializer.m index 58b09af..c71e9dd 100644 --- a/Firestore/Source/Local/FSTLocalSerializer.m +++ b/Firestore/Source/Local/FSTLocalSerializer.m @@ -14,19 +14,19 @@ * limitations under the License. */ -#import "FSTLocalSerializer.h" - -#import "Document.pbobjc.h" -#import "FSTAssert.h" -#import "FSTDocument.h" -#import "FSTFieldValue.h" -#import "FSTMutationBatch.h" -#import "FSTQuery.h" -#import "FSTQueryData.h" -#import "FSTSerializerBeta.h" -#import "MaybeDocument.pbobjc.h" -#import "Mutation.pbobjc.h" -#import "Target.pbobjc.h" +#import "Firestore/Source/Local/FSTLocalSerializer.h" + +#import "Firestore/Protos/objc/firestore/local/MaybeDocument.pbobjc.h" +#import "Firestore/Protos/objc/firestore/local/Mutation.pbobjc.h" +#import "Firestore/Protos/objc/firestore/local/Target.pbobjc.h" +#import "Firestore/Protos/objc/google/firestore/v1beta1/Document.pbobjc.h" +#import "Firestore/Source/Core/FSTQuery.h" +#import "Firestore/Source/Local/FSTQueryData.h" +#import "Firestore/Source/Model/FSTDocument.h" +#import "Firestore/Source/Model/FSTFieldValue.h" +#import "Firestore/Source/Model/FSTMutationBatch.h" +#import "Firestore/Source/Remote/FSTSerializerBeta.h" +#import "Firestore/Source/Util/FSTAssert.h" @interface FSTLocalSerializer () diff --git a/Firestore/Source/Local/FSTLocalStore.h b/Firestore/Source/Local/FSTLocalStore.h index 0fdc08e..19803ac 100644 --- a/Firestore/Source/Local/FSTLocalStore.h +++ b/Firestore/Source/Local/FSTLocalStore.h @@ -16,10 +16,10 @@ #import <Foundation/Foundation.h> -#import "FSTDocumentDictionary.h" -#import "FSTDocumentKeySet.h" -#import "FSTDocumentVersionDictionary.h" -#import "FSTTypes.h" +#import "Firestore/Source/Core/FSTTypes.h" +#import "Firestore/Source/Model/FSTDocumentDictionary.h" +#import "Firestore/Source/Model/FSTDocumentKeySet.h" +#import "Firestore/Source/Model/FSTDocumentVersionDictionary.h" @class FSTLocalViewChanges; @class FSTLocalWriteResult; diff --git a/Firestore/Source/Local/FSTLocalStore.m b/Firestore/Source/Local/FSTLocalStore.m index d31712a..cde7104 100644 --- a/Firestore/Source/Local/FSTLocalStore.m +++ b/Firestore/Source/Local/FSTLocalStore.m @@ -14,32 +14,32 @@ * limitations under the License. */ -#import "FSTLocalStore.h" - -#import "FSTAssert.h" -#import "FSTDocument.h" -#import "FSTDocumentDictionary.h" -#import "FSTDocumentKey.h" -#import "FSTGarbageCollector.h" -#import "FSTLocalDocumentsView.h" -#import "FSTLocalViewChanges.h" -#import "FSTLocalWriteResult.h" -#import "FSTLogger.h" -#import "FSTMutation.h" -#import "FSTMutationBatch.h" -#import "FSTMutationQueue.h" -#import "FSTPersistence.h" -#import "FSTQuery.h" -#import "FSTQueryCache.h" -#import "FSTQueryData.h" -#import "FSTReferenceSet.h" -#import "FSTRemoteDocumentCache.h" -#import "FSTRemoteDocumentChangeBuffer.h" -#import "FSTRemoteEvent.h" -#import "FSTSnapshotVersion.h" -#import "FSTTargetIDGenerator.h" -#import "FSTTimestamp.h" -#import "FSTUser.h" +#import "Firestore/Source/Local/FSTLocalStore.h" + +#import "Firestore/Source/Auth/FSTUser.h" +#import "Firestore/Source/Core/FSTQuery.h" +#import "Firestore/Source/Core/FSTSnapshotVersion.h" +#import "Firestore/Source/Core/FSTTargetIDGenerator.h" +#import "Firestore/Source/Core/FSTTimestamp.h" +#import "Firestore/Source/Local/FSTGarbageCollector.h" +#import "Firestore/Source/Local/FSTLocalDocumentsView.h" +#import "Firestore/Source/Local/FSTLocalViewChanges.h" +#import "Firestore/Source/Local/FSTLocalWriteResult.h" +#import "Firestore/Source/Local/FSTMutationQueue.h" +#import "Firestore/Source/Local/FSTPersistence.h" +#import "Firestore/Source/Local/FSTQueryCache.h" +#import "Firestore/Source/Local/FSTQueryData.h" +#import "Firestore/Source/Local/FSTReferenceSet.h" +#import "Firestore/Source/Local/FSTRemoteDocumentCache.h" +#import "Firestore/Source/Local/FSTRemoteDocumentChangeBuffer.h" +#import "Firestore/Source/Model/FSTDocument.h" +#import "Firestore/Source/Model/FSTDocumentDictionary.h" +#import "Firestore/Source/Model/FSTDocumentKey.h" +#import "Firestore/Source/Model/FSTMutation.h" +#import "Firestore/Source/Model/FSTMutationBatch.h" +#import "Firestore/Source/Remote/FSTRemoteEvent.h" +#import "Firestore/Source/Util/FSTAssert.h" +#import "Firestore/Source/Util/FSTLogger.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Local/FSTLocalViewChanges.h b/Firestore/Source/Local/FSTLocalViewChanges.h index d44959e..e391472 100644 --- a/Firestore/Source/Local/FSTLocalViewChanges.h +++ b/Firestore/Source/Local/FSTLocalViewChanges.h @@ -16,7 +16,7 @@ #import <Foundation/Foundation.h> -#import "FSTDocumentKeySet.h" +#import "Firestore/Source/Model/FSTDocumentKeySet.h" @class FSTDocumentKey; @class FSTDocumentSet; diff --git a/Firestore/Source/Local/FSTLocalViewChanges.m b/Firestore/Source/Local/FSTLocalViewChanges.m index 05407b2..9a7f445 100644 --- a/Firestore/Source/Local/FSTLocalViewChanges.m +++ b/Firestore/Source/Local/FSTLocalViewChanges.m @@ -14,10 +14,10 @@ * limitations under the License. */ -#import "FSTLocalViewChanges.h" +#import "Firestore/Source/Local/FSTLocalViewChanges.h" -#import "FSTDocument.h" -#import "FSTViewSnapshot.h" +#import "Firestore/Source/Core/FSTViewSnapshot.h" +#import "Firestore/Source/Model/FSTDocument.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Local/FSTLocalWriteResult.h b/Firestore/Source/Local/FSTLocalWriteResult.h index 4cd7d34..b6190aa 100644 --- a/Firestore/Source/Local/FSTLocalWriteResult.h +++ b/Firestore/Source/Local/FSTLocalWriteResult.h @@ -16,8 +16,8 @@ #import <Foundation/Foundation.h> -#import "FSTDocumentDictionary.h" -#import "FSTTypes.h" +#import "Firestore/Source/Core/FSTTypes.h" +#import "Firestore/Source/Model/FSTDocumentDictionary.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Local/FSTLocalWriteResult.m b/Firestore/Source/Local/FSTLocalWriteResult.m index 7586686..c1753fe 100644 --- a/Firestore/Source/Local/FSTLocalWriteResult.m +++ b/Firestore/Source/Local/FSTLocalWriteResult.m @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "FSTLocalWriteResult.h" +#import "Firestore/Source/Local/FSTLocalWriteResult.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Local/FSTMemoryMutationQueue.h b/Firestore/Source/Local/FSTMemoryMutationQueue.h index 6d917b7..f0786cc 100644 --- a/Firestore/Source/Local/FSTMemoryMutationQueue.h +++ b/Firestore/Source/Local/FSTMemoryMutationQueue.h @@ -16,7 +16,7 @@ #import <Foundation/Foundation.h> -#import "FSTMutationQueue.h" +#import "Firestore/Source/Local/FSTMutationQueue.h" @protocol FSTGarbageCollector; diff --git a/Firestore/Source/Local/FSTMemoryMutationQueue.m b/Firestore/Source/Local/FSTMemoryMutationQueue.m index 6118ad6..b155264 100644 --- a/Firestore/Source/Local/FSTMemoryMutationQueue.m +++ b/Firestore/Source/Local/FSTMemoryMutationQueue.m @@ -14,16 +14,16 @@ * limitations under the License. */ -#import "FSTMemoryMutationQueue.h" - -#import "FSTAssert.h" -#import "FSTComparison.h" -#import "FSTDocumentKey.h" -#import "FSTDocumentReference.h" -#import "FSTMutation.h" -#import "FSTMutationBatch.h" -#import "FSTPath.h" -#import "FSTQuery.h" +#import "Firestore/Source/Local/FSTMemoryMutationQueue.h" + +#import "Firestore/Source/Core/FSTQuery.h" +#import "Firestore/Source/Local/FSTDocumentReference.h" +#import "Firestore/Source/Model/FSTDocumentKey.h" +#import "Firestore/Source/Model/FSTMutation.h" +#import "Firestore/Source/Model/FSTMutationBatch.h" +#import "Firestore/Source/Model/FSTPath.h" +#import "Firestore/Source/Util/FSTAssert.h" +#import "Firestore/Source/Util/FSTComparison.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Local/FSTMemoryPersistence.h b/Firestore/Source/Local/FSTMemoryPersistence.h index c52962a..a1c4f13 100644 --- a/Firestore/Source/Local/FSTMemoryPersistence.h +++ b/Firestore/Source/Local/FSTMemoryPersistence.h @@ -16,7 +16,7 @@ #import <Foundation/Foundation.h> -#import "FSTPersistence.h" +#import "Firestore/Source/Local/FSTPersistence.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Local/FSTMemoryPersistence.m b/Firestore/Source/Local/FSTMemoryPersistence.m index 9caf3e7..e301820 100644 --- a/Firestore/Source/Local/FSTMemoryPersistence.m +++ b/Firestore/Source/Local/FSTMemoryPersistence.m @@ -14,15 +14,15 @@ * limitations under the License. */ -#import "FSTMemoryPersistence.h" - -#import "FSTAssert.h" -#import "FSTMemoryMutationQueue.h" -#import "FSTMemoryQueryCache.h" -#import "FSTMemoryRemoteDocumentCache.h" -#import "FSTUser.h" -#import "FSTWriteGroup.h" -#import "FSTWriteGroupTracker.h" +#import "Firestore/Source/Local/FSTMemoryPersistence.h" + +#import "Firestore/Source/Auth/FSTUser.h" +#import "Firestore/Source/Local/FSTMemoryMutationQueue.h" +#import "Firestore/Source/Local/FSTMemoryQueryCache.h" +#import "Firestore/Source/Local/FSTMemoryRemoteDocumentCache.h" +#import "Firestore/Source/Local/FSTWriteGroup.h" +#import "Firestore/Source/Local/FSTWriteGroupTracker.h" +#import "Firestore/Source/Util/FSTAssert.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Local/FSTMemoryQueryCache.h b/Firestore/Source/Local/FSTMemoryQueryCache.h index 58e0133..98f0277 100644 --- a/Firestore/Source/Local/FSTMemoryQueryCache.h +++ b/Firestore/Source/Local/FSTMemoryQueryCache.h @@ -16,7 +16,7 @@ #import <Foundation/Foundation.h> -#import "FSTQueryCache.h" +#import "Firestore/Source/Local/FSTQueryCache.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Local/FSTMemoryQueryCache.m b/Firestore/Source/Local/FSTMemoryQueryCache.m index 1466caa..8d37bcb 100644 --- a/Firestore/Source/Local/FSTMemoryQueryCache.m +++ b/Firestore/Source/Local/FSTMemoryQueryCache.m @@ -14,12 +14,12 @@ * limitations under the License. */ -#import "FSTMemoryQueryCache.h" +#import "Firestore/Source/Local/FSTMemoryQueryCache.h" -#import "FSTQuery.h" -#import "FSTQueryData.h" -#import "FSTReferenceSet.h" -#import "FSTSnapshotVersion.h" +#import "Firestore/Source/Core/FSTQuery.h" +#import "Firestore/Source/Core/FSTSnapshotVersion.h" +#import "Firestore/Source/Local/FSTQueryData.h" +#import "Firestore/Source/Local/FSTReferenceSet.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Local/FSTMemoryRemoteDocumentCache.h b/Firestore/Source/Local/FSTMemoryRemoteDocumentCache.h index aca0ca1..d718a04 100644 --- a/Firestore/Source/Local/FSTMemoryRemoteDocumentCache.h +++ b/Firestore/Source/Local/FSTMemoryRemoteDocumentCache.h @@ -16,7 +16,7 @@ #import <Foundation/Foundation.h> -#import "FSTRemoteDocumentCache.h" +#import "Firestore/Source/Local/FSTRemoteDocumentCache.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Local/FSTMemoryRemoteDocumentCache.m b/Firestore/Source/Local/FSTMemoryRemoteDocumentCache.m index 175be43..9bbc047 100644 --- a/Firestore/Source/Local/FSTMemoryRemoteDocumentCache.m +++ b/Firestore/Source/Local/FSTMemoryRemoteDocumentCache.m @@ -14,13 +14,13 @@ * limitations under the License. */ -#import "FSTMemoryRemoteDocumentCache.h" +#import "Firestore/Source/Local/FSTMemoryRemoteDocumentCache.h" -#import "FSTDocument.h" -#import "FSTDocumentDictionary.h" -#import "FSTDocumentKey.h" -#import "FSTPath.h" -#import "FSTQuery.h" +#import "Firestore/Source/Core/FSTQuery.h" +#import "Firestore/Source/Model/FSTDocument.h" +#import "Firestore/Source/Model/FSTDocumentDictionary.h" +#import "Firestore/Source/Model/FSTDocumentKey.h" +#import "Firestore/Source/Model/FSTPath.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Local/FSTMutationQueue.h b/Firestore/Source/Local/FSTMutationQueue.h index c822b96..a1eddd4 100644 --- a/Firestore/Source/Local/FSTMutationQueue.h +++ b/Firestore/Source/Local/FSTMutationQueue.h @@ -16,8 +16,8 @@ #import <Foundation/Foundation.h> -#import "FSTGarbageCollector.h" -#import "FSTTypes.h" +#import "Firestore/Source/Core/FSTTypes.h" +#import "Firestore/Source/Local/FSTGarbageCollector.h" @class FSTDocumentKey; @class FSTMutation; diff --git a/Firestore/Source/Local/FSTNoOpGarbageCollector.h b/Firestore/Source/Local/FSTNoOpGarbageCollector.h index 8873a1b..c9b5862 100644 --- a/Firestore/Source/Local/FSTNoOpGarbageCollector.h +++ b/Firestore/Source/Local/FSTNoOpGarbageCollector.h @@ -16,7 +16,7 @@ #import <Foundation/Foundation.h> -#import "FSTGarbageCollector.h" +#import "Firestore/Source/Local/FSTGarbageCollector.h" @class FSTDocumentKey; diff --git a/Firestore/Source/Local/FSTNoOpGarbageCollector.m b/Firestore/Source/Local/FSTNoOpGarbageCollector.m index 6e035ab..e03b599 100644 --- a/Firestore/Source/Local/FSTNoOpGarbageCollector.m +++ b/Firestore/Source/Local/FSTNoOpGarbageCollector.m @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "FSTNoOpGarbageCollector.h" +#import "Firestore/Source/Local/FSTNoOpGarbageCollector.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Local/FSTQueryCache.h b/Firestore/Source/Local/FSTQueryCache.h index 87ee342..e0cf4c8 100644 --- a/Firestore/Source/Local/FSTQueryCache.h +++ b/Firestore/Source/Local/FSTQueryCache.h @@ -16,9 +16,9 @@ #import <Foundation/Foundation.h> -#import "FSTDocumentKeySet.h" -#import "FSTGarbageCollector.h" -#import "FSTTypes.h" +#import "Firestore/Source/Core/FSTTypes.h" +#import "Firestore/Source/Local/FSTGarbageCollector.h" +#import "Firestore/Source/Model/FSTDocumentKeySet.h" @class FSTDocumentKey; @class FSTDocumentSet; diff --git a/Firestore/Source/Local/FSTQueryData.h b/Firestore/Source/Local/FSTQueryData.h index 060fd78..048bfad 100644 --- a/Firestore/Source/Local/FSTQueryData.h +++ b/Firestore/Source/Local/FSTQueryData.h @@ -16,7 +16,7 @@ #import <Foundation/Foundation.h> -#import "FSTTypes.h" +#import "Firestore/Source/Core/FSTTypes.h" @class FSTQuery; @class FSTSnapshotVersion; diff --git a/Firestore/Source/Local/FSTQueryData.m b/Firestore/Source/Local/FSTQueryData.m index 438f229..080f136 100644 --- a/Firestore/Source/Local/FSTQueryData.m +++ b/Firestore/Source/Local/FSTQueryData.m @@ -14,10 +14,10 @@ * limitations under the License. */ -#import "FSTQueryData.h" +#import "Firestore/Source/Local/FSTQueryData.h" -#import "FSTQuery.h" -#import "FSTSnapshotVersion.h" +#import "Firestore/Source/Core/FSTQuery.h" +#import "Firestore/Source/Core/FSTSnapshotVersion.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Local/FSTReferenceSet.h b/Firestore/Source/Local/FSTReferenceSet.h index e4f50a7..66285d9 100644 --- a/Firestore/Source/Local/FSTReferenceSet.h +++ b/Firestore/Source/Local/FSTReferenceSet.h @@ -16,9 +16,9 @@ #import <Foundation/Foundation.h> -#import "FSTDocumentKeySet.h" -#import "FSTGarbageCollector.h" -#import "FSTTypes.h" +#import "Firestore/Source/Core/FSTTypes.h" +#import "Firestore/Source/Local/FSTGarbageCollector.h" +#import "Firestore/Source/Model/FSTDocumentKeySet.h" @class FSTDocumentKey; diff --git a/Firestore/Source/Local/FSTReferenceSet.m b/Firestore/Source/Local/FSTReferenceSet.m index 2326ded..2acd64b 100644 --- a/Firestore/Source/Local/FSTReferenceSet.m +++ b/Firestore/Source/Local/FSTReferenceSet.m @@ -14,10 +14,10 @@ * limitations under the License. */ -#import "FSTReferenceSet.h" +#import "Firestore/Source/Local/FSTReferenceSet.h" -#import "FSTDocumentKey.h" -#import "FSTDocumentReference.h" +#import "Firestore/Source/Local/FSTDocumentReference.h" +#import "Firestore/Source/Model/FSTDocumentKey.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Local/FSTRemoteDocumentCache.h b/Firestore/Source/Local/FSTRemoteDocumentCache.h index 8979455..fa42ce5 100644 --- a/Firestore/Source/Local/FSTRemoteDocumentCache.h +++ b/Firestore/Source/Local/FSTRemoteDocumentCache.h @@ -16,7 +16,7 @@ #import <Foundation/Foundation.h> -#import "FSTDocumentDictionary.h" +#import "Firestore/Source/Model/FSTDocumentDictionary.h" @class FSTDocumentKey; @class FSTMaybeDocument; diff --git a/Firestore/Source/Local/FSTRemoteDocumentChangeBuffer.m b/Firestore/Source/Local/FSTRemoteDocumentChangeBuffer.m index 12a68ff..bca587a 100644 --- a/Firestore/Source/Local/FSTRemoteDocumentChangeBuffer.m +++ b/Firestore/Source/Local/FSTRemoteDocumentChangeBuffer.m @@ -14,12 +14,12 @@ * limitations under the License. */ -#import "FSTRemoteDocumentChangeBuffer.h" +#import "Firestore/Source/Local/FSTRemoteDocumentChangeBuffer.h" -#import "FSTAssert.h" -#import "FSTDocument.h" -#import "FSTDocumentKey.h" -#import "FSTRemoteDocumentCache.h" +#import "Firestore/Source/Local/FSTRemoteDocumentCache.h" +#import "Firestore/Source/Model/FSTDocument.h" +#import "Firestore/Source/Model/FSTDocumentKey.h" +#import "Firestore/Source/Util/FSTAssert.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Local/FSTWriteGroup.h b/Firestore/Source/Local/FSTWriteGroup.h index 21482af..5ea0387 100644 --- a/Firestore/Source/Local/FSTWriteGroup.h +++ b/Firestore/Source/Local/FSTWriteGroup.h @@ -19,7 +19,7 @@ #ifdef __cplusplus #include <memory> -#include "StringView.h" +#include "Firestore/Source/Local/StringView.h" namespace leveldb { class DB; diff --git a/Firestore/Source/Local/FSTWriteGroup.mm b/Firestore/Source/Local/FSTWriteGroup.mm index 7ddf642..6859d53 100644 --- a/Firestore/Source/Local/FSTWriteGroup.mm +++ b/Firestore/Source/Local/FSTWriteGroup.mm @@ -14,16 +14,16 @@ * limitations under the License. */ -#import "FSTWriteGroup.h" +#import "Firestore/Source/Local/FSTWriteGroup.h" #import <Protobuf/GPBProtocolBuffers.h> #include <leveldb/db.h> #include <leveldb/write_batch.h> -#import "FSTAssert.h" -#import "FSTLevelDBKey.h" +#import "Firestore/Source/Local/FSTLevelDBKey.h" +#import "Firestore/Source/Util/FSTAssert.h" -#include "ordered_code.h" +#include "Firestore/Port/ordered_code.h" using Firestore::OrderedCode; using Firestore::StringView; diff --git a/Firestore/Source/Local/FSTWriteGroupTracker.m b/Firestore/Source/Local/FSTWriteGroupTracker.m index 1c6c84d..7e3bf60 100644 --- a/Firestore/Source/Local/FSTWriteGroupTracker.m +++ b/Firestore/Source/Local/FSTWriteGroupTracker.m @@ -14,10 +14,10 @@ * limitations under the License. */ -#import "FSTWriteGroupTracker.h" +#import "Firestore/Source/Local/FSTWriteGroupTracker.h" -#import "FSTAssert.h" -#import "FSTWriteGroup.h" +#import "Firestore/Source/Local/FSTWriteGroup.h" +#import "Firestore/Source/Util/FSTAssert.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Model/FSTDatabaseID.m b/Firestore/Source/Model/FSTDatabaseID.m index bf4b417..4d0448a 100644 --- a/Firestore/Source/Model/FSTDatabaseID.m +++ b/Firestore/Source/Model/FSTDatabaseID.m @@ -14,9 +14,9 @@ * limitations under the License. */ -#import "FSTDatabaseID.h" +#import "Firestore/Source/Model/FSTDatabaseID.h" -#import "FSTAssert.h" +#import "Firestore/Source/Util/FSTAssert.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Model/FSTDocument.m b/Firestore/Source/Model/FSTDocument.m index 5146d46..bf416e7 100644 --- a/Firestore/Source/Model/FSTDocument.m +++ b/Firestore/Source/Model/FSTDocument.m @@ -14,13 +14,13 @@ * limitations under the License. */ -#import "FSTDocument.h" +#import "Firestore/Source/Model/FSTDocument.h" -#import "FSTAssert.h" -#import "FSTDocumentKey.h" -#import "FSTFieldValue.h" -#import "FSTPath.h" -#import "FSTSnapshotVersion.h" +#import "Firestore/Source/Core/FSTSnapshotVersion.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" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Model/FSTDocumentDictionary.h b/Firestore/Source/Model/FSTDocumentDictionary.h index 8ae8e01..f4e4ba1 100644 --- a/Firestore/Source/Model/FSTDocumentDictionary.h +++ b/Firestore/Source/Model/FSTDocumentDictionary.h @@ -16,7 +16,7 @@ #import <Foundation/Foundation.h> -#import "FSTImmutableSortedDictionary.h" +#import "Firestore/third_party/Immutable/FSTImmutableSortedDictionary.h" @class FSTDocument; @class FSTDocumentKey; diff --git a/Firestore/Source/Model/FSTDocumentDictionary.m b/Firestore/Source/Model/FSTDocumentDictionary.m index 67e3ae7..362af54 100644 --- a/Firestore/Source/Model/FSTDocumentDictionary.m +++ b/Firestore/Source/Model/FSTDocumentDictionary.m @@ -14,9 +14,9 @@ * limitations under the License. */ -#import "FSTDocumentDictionary.h" +#import "Firestore/Source/Model/FSTDocumentDictionary.h" -#import "FSTDocumentKey.h" +#import "Firestore/Source/Model/FSTDocumentKey.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Model/FSTDocumentKey.m b/Firestore/Source/Model/FSTDocumentKey.m index a412b13..a382a55 100644 --- a/Firestore/Source/Model/FSTDocumentKey.m +++ b/Firestore/Source/Model/FSTDocumentKey.m @@ -14,11 +14,11 @@ * limitations under the License. */ -#import "FSTDocumentKey.h" +#import "Firestore/Source/Model/FSTDocumentKey.h" -#import "FSTAssert.h" -#import "FSTFirestoreClient.h" -#import "FSTPath.h" +#import "Firestore/Source/Core/FSTFirestoreClient.h" +#import "Firestore/Source/Model/FSTPath.h" +#import "Firestore/Source/Util/FSTAssert.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Model/FSTDocumentKeySet.h b/Firestore/Source/Model/FSTDocumentKeySet.h index 7352985..80f6624 100644 --- a/Firestore/Source/Model/FSTDocumentKeySet.h +++ b/Firestore/Source/Model/FSTDocumentKeySet.h @@ -16,7 +16,7 @@ #import <Foundation/Foundation.h> -#import "FSTImmutableSortedSet.h" +#import "Firestore/third_party/Immutable/FSTImmutableSortedSet.h" @class FSTDocumentKey; diff --git a/Firestore/Source/Model/FSTDocumentKeySet.m b/Firestore/Source/Model/FSTDocumentKeySet.m index 54f1b2c..f07b785 100644 --- a/Firestore/Source/Model/FSTDocumentKeySet.m +++ b/Firestore/Source/Model/FSTDocumentKeySet.m @@ -14,9 +14,9 @@ * limitations under the License. */ -#import "FSTDocumentKeySet.h" +#import "Firestore/Source/Model/FSTDocumentKeySet.h" -#import "FSTDocumentKey.h" +#import "Firestore/Source/Model/FSTDocumentKey.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Model/FSTDocumentSet.h b/Firestore/Source/Model/FSTDocumentSet.h index 7457ea3..a7f8c4a 100644 --- a/Firestore/Source/Model/FSTDocumentSet.h +++ b/Firestore/Source/Model/FSTDocumentSet.h @@ -16,7 +16,7 @@ #import <Foundation/Foundation.h> -#import "FSTDocumentDictionary.h" +#import "Firestore/Source/Model/FSTDocumentDictionary.h" @class FSTDocument; @class FSTDocumentKey; diff --git a/Firestore/Source/Model/FSTDocumentSet.m b/Firestore/Source/Model/FSTDocumentSet.m index 94b7b58..c4c0f49 100644 --- a/Firestore/Source/Model/FSTDocumentSet.m +++ b/Firestore/Source/Model/FSTDocumentSet.m @@ -14,11 +14,11 @@ * limitations under the License. */ -#import "FSTDocumentSet.h" +#import "Firestore/Source/Model/FSTDocumentSet.h" -#import "FSTDocument.h" -#import "FSTDocumentKey.h" -#import "FSTImmutableSortedSet.h" +#import "Firestore/Source/Model/FSTDocument.h" +#import "Firestore/Source/Model/FSTDocumentKey.h" +#import "Firestore/third_party/Immutable/FSTImmutableSortedSet.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Model/FSTDocumentVersionDictionary.h b/Firestore/Source/Model/FSTDocumentVersionDictionary.h index f94545f..674614e 100644 --- a/Firestore/Source/Model/FSTDocumentVersionDictionary.h +++ b/Firestore/Source/Model/FSTDocumentVersionDictionary.h @@ -16,7 +16,7 @@ #import <Foundation/Foundation.h> -#import "FSTImmutableSortedDictionary.h" +#import "Firestore/third_party/Immutable/FSTImmutableSortedDictionary.h" @class FSTDocumentKey; @class FSTSnapshotVersion; diff --git a/Firestore/Source/Model/FSTDocumentVersionDictionary.m b/Firestore/Source/Model/FSTDocumentVersionDictionary.m index 0eaf9f8..870e082 100644 --- a/Firestore/Source/Model/FSTDocumentVersionDictionary.m +++ b/Firestore/Source/Model/FSTDocumentVersionDictionary.m @@ -14,10 +14,10 @@ * limitations under the License. */ -#import "FSTDocumentVersionDictionary.h" +#import "Firestore/Source/Model/FSTDocumentVersionDictionary.h" -#import "FSTDocumentKey.h" -#import "FSTSnapshotVersion.h" +#import "Firestore/Source/Core/FSTSnapshotVersion.h" +#import "Firestore/Source/Model/FSTDocumentKey.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Model/FSTFieldValue.h b/Firestore/Source/Model/FSTFieldValue.h index cbf7e3e..6de9793 100644 --- a/Firestore/Source/Model/FSTFieldValue.h +++ b/Firestore/Source/Model/FSTFieldValue.h @@ -16,7 +16,7 @@ #import <Foundation/Foundation.h> -#import "FSTImmutableSortedDictionary.h" +#import "Firestore/third_party/Immutable/FSTImmutableSortedDictionary.h" @class FSTDatabaseID; @class FSTDocumentKey; diff --git a/Firestore/Source/Model/FSTFieldValue.m b/Firestore/Source/Model/FSTFieldValue.m index 7f96a3c..95ad306 100644 --- a/Firestore/Source/Model/FSTFieldValue.m +++ b/Firestore/Source/Model/FSTFieldValue.m @@ -14,16 +14,16 @@ * limitations under the License. */ -#import "FSTFieldValue.h" - -#import "FIRGeoPoint+Internal.h" -#import "FSTAssert.h" -#import "FSTClasses.h" -#import "FSTComparison.h" -#import "FSTDatabaseID.h" -#import "FSTDocumentKey.h" -#import "FSTPath.h" -#import "FSTTimestamp.h" +#import "Firestore/Source/Model/FSTFieldValue.h" + +#import "Firestore/Source/API/FIRGeoPoint+Internal.h" +#import "Firestore/Source/Core/FSTTimestamp.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/FSTClasses.h" +#import "Firestore/Source/Util/FSTComparison.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Model/FSTMutation.m b/Firestore/Source/Model/FSTMutation.m index 9704fde..5b47280 100644 --- a/Firestore/Source/Model/FSTMutation.m +++ b/Firestore/Source/Model/FSTMutation.m @@ -14,16 +14,16 @@ * limitations under the License. */ -#import "FSTMutation.h" - -#import "FSTAssert.h" -#import "FSTClasses.h" -#import "FSTDocument.h" -#import "FSTDocumentKey.h" -#import "FSTFieldValue.h" -#import "FSTPath.h" -#import "FSTSnapshotVersion.h" -#import "FSTTimestamp.h" +#import "Firestore/Source/Model/FSTMutation.h" + +#import "Firestore/Source/Core/FSTSnapshotVersion.h" +#import "Firestore/Source/Core/FSTTimestamp.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/FSTClasses.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Model/FSTMutationBatch.h b/Firestore/Source/Model/FSTMutationBatch.h index cbc31b6..145adfa 100644 --- a/Firestore/Source/Model/FSTMutationBatch.h +++ b/Firestore/Source/Model/FSTMutationBatch.h @@ -16,9 +16,9 @@ #import <Foundation/Foundation.h> -#import "FSTDocumentKeySet.h" -#import "FSTDocumentVersionDictionary.h" -#import "FSTTypes.h" +#import "Firestore/Source/Core/FSTTypes.h" +#import "Firestore/Source/Model/FSTDocumentKeySet.h" +#import "Firestore/Source/Model/FSTDocumentVersionDictionary.h" @class FSTMutation; @class FSTTimestamp; diff --git a/Firestore/Source/Model/FSTMutationBatch.m b/Firestore/Source/Model/FSTMutationBatch.m index ed0e659..3677908 100644 --- a/Firestore/Source/Model/FSTMutationBatch.m +++ b/Firestore/Source/Model/FSTMutationBatch.m @@ -14,14 +14,14 @@ * limitations under the License. */ -#import "FSTMutationBatch.h" - -#import "FSTAssert.h" -#import "FSTDocument.h" -#import "FSTDocumentKey.h" -#import "FSTMutation.h" -#import "FSTSnapshotVersion.h" -#import "FSTTimestamp.h" +#import "Firestore/Source/Model/FSTMutationBatch.h" + +#import "Firestore/Source/Core/FSTSnapshotVersion.h" +#import "Firestore/Source/Core/FSTTimestamp.h" +#import "Firestore/Source/Model/FSTDocument.h" +#import "Firestore/Source/Model/FSTDocumentKey.h" +#import "Firestore/Source/Model/FSTMutation.h" +#import "Firestore/Source/Util/FSTAssert.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Model/FSTPath.m b/Firestore/Source/Model/FSTPath.m index 0588612..b236107 100644 --- a/Firestore/Source/Model/FSTPath.m +++ b/Firestore/Source/Model/FSTPath.m @@ -14,12 +14,12 @@ * limitations under the License. */ -#import "FSTPath.h" +#import "Firestore/Source/Model/FSTPath.h" -#import "FSTAssert.h" -#import "FSTClasses.h" -#import "FSTDocumentKey.h" -#import "FSTUsageValidation.h" +#import "Firestore/Source/Model/FSTDocumentKey.h" +#import "Firestore/Source/Util/FSTAssert.h" +#import "Firestore/Source/Util/FSTClasses.h" +#import "Firestore/Source/Util/FSTUsageValidation.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Remote/FSTBufferedWriter.m b/Firestore/Source/Remote/FSTBufferedWriter.m index d86e03a..47dbb21 100644 --- a/Firestore/Source/Remote/FSTBufferedWriter.m +++ b/Firestore/Source/Remote/FSTBufferedWriter.m @@ -16,7 +16,7 @@ #import <Protobuf/GPBProtocolBuffers.h> -#import "FSTBufferedWriter.h" +#import "Firestore/Source/Remote/FSTBufferedWriter.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Remote/FSTDatastore.h b/Firestore/Source/Remote/FSTDatastore.h index 08aa570..13d9eda 100644 --- a/Firestore/Source/Remote/FSTDatastore.h +++ b/Firestore/Source/Remote/FSTDatastore.h @@ -16,7 +16,7 @@ #import <Foundation/Foundation.h> -#import "FSTTypes.h" +#import "Firestore/Source/Core/FSTTypes.h" @class FSTDatabaseInfo; @class FSTDocumentKey; diff --git a/Firestore/Source/Remote/FSTDatastore.m b/Firestore/Source/Remote/FSTDatastore.m index a26a5a2..02d868c 100644 --- a/Firestore/Source/Remote/FSTDatastore.m +++ b/Firestore/Source/Remote/FSTDatastore.m @@ -14,28 +14,28 @@ * limitations under the License. */ -#import "FSTDatastore.h" +#import "Firestore/Source/Remote/FSTDatastore.h" #import <GRPCClient/GRPCCall+OAuth2.h> #import <ProtoRPC/ProtoRPC.h> -#import "FIRFirestore+Internal.h" #import "FIRFirestoreErrors.h" -#import "FIRFirestoreVersion.h" -#import "FSTAssert.h" -#import "FSTCredentialsProvider.h" -#import "FSTDatabaseID.h" -#import "FSTDatabaseInfo.h" -#import "FSTDispatchQueue.h" -#import "FSTDocument.h" -#import "FSTDocumentKey.h" -#import "FSTLocalStore.h" -#import "FSTLogger.h" -#import "FSTMutation.h" -#import "FSTSerializerBeta.h" -#import "FSTStream.h" - -#import "Firestore.pbrpc.h" +#import "Firestore/Source/API/FIRFirestore+Internal.h" +#import "Firestore/Source/API/FIRFirestoreVersion.h" +#import "Firestore/Source/Auth/FSTCredentialsProvider.h" +#import "Firestore/Source/Core/FSTDatabaseInfo.h" +#import "Firestore/Source/Local/FSTLocalStore.h" +#import "Firestore/Source/Model/FSTDatabaseID.h" +#import "Firestore/Source/Model/FSTDocument.h" +#import "Firestore/Source/Model/FSTDocumentKey.h" +#import "Firestore/Source/Model/FSTMutation.h" +#import "Firestore/Source/Remote/FSTSerializerBeta.h" +#import "Firestore/Source/Remote/FSTStream.h" +#import "Firestore/Source/Util/FSTAssert.h" +#import "Firestore/Source/Util/FSTDispatchQueue.h" +#import "Firestore/Source/Util/FSTLogger.h" + +#import "Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbrpc.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Remote/FSTExistenceFilter.m b/Firestore/Source/Remote/FSTExistenceFilter.m index 7c0ded2..d5ec7b3 100644 --- a/Firestore/Source/Remote/FSTExistenceFilter.m +++ b/Firestore/Source/Remote/FSTExistenceFilter.m @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "FSTExistenceFilter.h" +#import "Firestore/Source/Remote/FSTExistenceFilter.h" @interface FSTExistenceFilter () diff --git a/Firestore/Source/Remote/FSTExponentialBackoff.m b/Firestore/Source/Remote/FSTExponentialBackoff.m index dc589b5..2e06238 100644 --- a/Firestore/Source/Remote/FSTExponentialBackoff.m +++ b/Firestore/Source/Remote/FSTExponentialBackoff.m @@ -14,11 +14,11 @@ * limitations under the License. */ -#import "FSTExponentialBackoff.h" +#import "Firestore/Source/Remote/FSTExponentialBackoff.h" -#import "FSTDispatchQueue.h" -#import "FSTLogger.h" -#import "FSTUtil.h" +#import "Firestore/Source/Util/FSTDispatchQueue.h" +#import "Firestore/Source/Util/FSTLogger.h" +#import "Firestore/Source/Util/FSTUtil.h" @interface FSTExponentialBackoff () - (instancetype)initWithDispatchQueue:(FSTDispatchQueue *)dispatchQueue diff --git a/Firestore/Source/Remote/FSTRemoteEvent.h b/Firestore/Source/Remote/FSTRemoteEvent.h index 939a027..72f71a5 100644 --- a/Firestore/Source/Remote/FSTRemoteEvent.h +++ b/Firestore/Source/Remote/FSTRemoteEvent.h @@ -16,9 +16,9 @@ #import <Foundation/Foundation.h> -#import "FSTDocumentDictionary.h" -#import "FSTDocumentKeySet.h" -#import "FSTTypes.h" +#import "Firestore/Source/Core/FSTTypes.h" +#import "Firestore/Source/Model/FSTDocumentDictionary.h" +#import "Firestore/Source/Model/FSTDocumentKeySet.h" @class FSTDocument; @class FSTDocumentKey; diff --git a/Firestore/Source/Remote/FSTRemoteEvent.m b/Firestore/Source/Remote/FSTRemoteEvent.m index 5c75998..a97eb86 100644 --- a/Firestore/Source/Remote/FSTRemoteEvent.m +++ b/Firestore/Source/Remote/FSTRemoteEvent.m @@ -14,15 +14,15 @@ * limitations under the License. */ -#import "FSTRemoteEvent.h" - -#import "FSTAssert.h" -#import "FSTClasses.h" -#import "FSTDocument.h" -#import "FSTDocumentKey.h" -#import "FSTLogger.h" -#import "FSTSnapshotVersion.h" -#import "FSTWatchChange.h" +#import "Firestore/Source/Remote/FSTRemoteEvent.h" + +#import "Firestore/Source/Core/FSTSnapshotVersion.h" +#import "Firestore/Source/Model/FSTDocument.h" +#import "Firestore/Source/Model/FSTDocumentKey.h" +#import "Firestore/Source/Remote/FSTWatchChange.h" +#import "Firestore/Source/Util/FSTAssert.h" +#import "Firestore/Source/Util/FSTClasses.h" +#import "Firestore/Source/Util/FSTLogger.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Remote/FSTRemoteStore.h b/Firestore/Source/Remote/FSTRemoteStore.h index 0948cfa..313ddb7 100644 --- a/Firestore/Source/Remote/FSTRemoteStore.h +++ b/Firestore/Source/Remote/FSTRemoteStore.h @@ -16,8 +16,8 @@ #import <Foundation/Foundation.h> -#import "FSTDocumentVersionDictionary.h" -#import "FSTTypes.h" +#import "Firestore/Source/Core/FSTTypes.h" +#import "Firestore/Source/Model/FSTDocumentVersionDictionary.h" @class FSTDatabaseInfo; @class FSTDatastore; diff --git a/Firestore/Source/Remote/FSTRemoteStore.m b/Firestore/Source/Remote/FSTRemoteStore.m index 45a8aca..f7c3e57 100644 --- a/Firestore/Source/Remote/FSTRemoteStore.m +++ b/Firestore/Source/Remote/FSTRemoteStore.m @@ -14,24 +14,24 @@ * limitations under the License. */ -#import "FSTRemoteStore.h" - -#import "FSTAssert.h" -#import "FSTDatastore.h" -#import "FSTDocument.h" -#import "FSTDocumentKey.h" -#import "FSTExistenceFilter.h" -#import "FSTLocalStore.h" -#import "FSTLogger.h" -#import "FSTMutation.h" -#import "FSTMutationBatch.h" -#import "FSTQuery.h" -#import "FSTQueryData.h" -#import "FSTRemoteEvent.h" -#import "FSTSnapshotVersion.h" -#import "FSTStream.h" -#import "FSTTransaction.h" -#import "FSTWatchChange.h" +#import "Firestore/Source/Remote/FSTRemoteStore.h" + +#import "Firestore/Source/Core/FSTQuery.h" +#import "Firestore/Source/Core/FSTSnapshotVersion.h" +#import "Firestore/Source/Core/FSTTransaction.h" +#import "Firestore/Source/Local/FSTLocalStore.h" +#import "Firestore/Source/Local/FSTQueryData.h" +#import "Firestore/Source/Model/FSTDocument.h" +#import "Firestore/Source/Model/FSTDocumentKey.h" +#import "Firestore/Source/Model/FSTMutation.h" +#import "Firestore/Source/Model/FSTMutationBatch.h" +#import "Firestore/Source/Remote/FSTDatastore.h" +#import "Firestore/Source/Remote/FSTExistenceFilter.h" +#import "Firestore/Source/Remote/FSTRemoteEvent.h" +#import "Firestore/Source/Remote/FSTStream.h" +#import "Firestore/Source/Remote/FSTWatchChange.h" +#import "Firestore/Source/Util/FSTAssert.h" +#import "Firestore/Source/Util/FSTLogger.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Remote/FSTSerializerBeta.m b/Firestore/Source/Remote/FSTSerializerBeta.m index 418dabd..04785c2 100644 --- a/Firestore/Source/Remote/FSTSerializerBeta.m +++ b/Firestore/Source/Remote/FSTSerializerBeta.m @@ -14,34 +14,34 @@ * limitations under the License. */ -#import "FSTSerializerBeta.h" +#import "Firestore/Source/Remote/FSTSerializerBeta.h" #import <GRPCClient/GRPCCall.h> -#import "Common.pbobjc.h" -#import "Document.pbobjc.h" -#import "Firestore.pbobjc.h" -#import "Latlng.pbobjc.h" -#import "Query.pbobjc.h" -#import "Status.pbobjc.h" -#import "Write.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/Firestore.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/Protos/objc/google/type/Latlng.pbobjc.h" #import "FIRFirestoreErrors.h" #import "FIRGeoPoint.h" -#import "FSTAssert.h" -#import "FSTDatabaseID.h" -#import "FSTDocument.h" -#import "FSTDocumentKey.h" -#import "FSTExistenceFilter.h" -#import "FSTFieldValue.h" -#import "FSTMutation.h" -#import "FSTMutationBatch.h" -#import "FSTPath.h" -#import "FSTQuery.h" -#import "FSTQueryData.h" -#import "FSTSnapshotVersion.h" -#import "FSTTimestamp.h" -#import "FSTWatchChange.h" +#import "Firestore/Source/Core/FSTQuery.h" +#import "Firestore/Source/Core/FSTSnapshotVersion.h" +#import "Firestore/Source/Core/FSTTimestamp.h" +#import "Firestore/Source/Local/FSTQueryData.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/FSTMutation.h" +#import "Firestore/Source/Model/FSTMutationBatch.h" +#import "Firestore/Source/Model/FSTPath.h" +#import "Firestore/Source/Remote/FSTExistenceFilter.h" +#import "Firestore/Source/Remote/FSTWatchChange.h" +#import "Firestore/Source/Util/FSTAssert.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Remote/FSTStream.h b/Firestore/Source/Remote/FSTStream.h index a3ca8a4..546aa3d 100644 --- a/Firestore/Source/Remote/FSTStream.h +++ b/Firestore/Source/Remote/FSTStream.h @@ -16,7 +16,7 @@ #import <Foundation/Foundation.h> -#import "FSTTypes.h" +#import "Firestore/Source/Core/FSTTypes.h" @class FSTDatabaseInfo; @class FSTDocumentKey; diff --git a/Firestore/Source/Remote/FSTStream.m b/Firestore/Source/Remote/FSTStream.m index 6cce921..614f611 100644 --- a/Firestore/Source/Remote/FSTStream.m +++ b/Firestore/Source/Remote/FSTStream.m @@ -14,28 +14,28 @@ * limitations under the License. */ -#import "FSTDatastore.h" +#import "Firestore/Source/Remote/FSTDatastore.h" #import <GRPCClient/GRPCCall+OAuth2.h> #import <GRPCClient/GRPCCall.h> -#import "FIRFirestore+Internal.h" #import "FIRFirestoreErrors.h" -#import "FSTAssert.h" -#import "FSTBufferedWriter.h" -#import "FSTClasses.h" -#import "FSTCredentialsProvider.h" -#import "FSTDatabaseID.h" -#import "FSTDatabaseInfo.h" -#import "FSTDispatchQueue.h" -#import "FSTExponentialBackoff.h" -#import "FSTLogger.h" -#import "FSTMutation.h" -#import "FSTQueryData.h" -#import "FSTSerializerBeta.h" -#import "FSTStream.h" - -#import "Firestore.pbrpc.h" +#import "Firestore/Source/API/FIRFirestore+Internal.h" +#import "Firestore/Source/Auth/FSTCredentialsProvider.h" +#import "Firestore/Source/Core/FSTDatabaseInfo.h" +#import "Firestore/Source/Local/FSTQueryData.h" +#import "Firestore/Source/Model/FSTDatabaseID.h" +#import "Firestore/Source/Model/FSTMutation.h" +#import "Firestore/Source/Remote/FSTBufferedWriter.h" +#import "Firestore/Source/Remote/FSTExponentialBackoff.h" +#import "Firestore/Source/Remote/FSTSerializerBeta.h" +#import "Firestore/Source/Remote/FSTStream.h" +#import "Firestore/Source/Util/FSTAssert.h" +#import "Firestore/Source/Util/FSTClasses.h" +#import "Firestore/Source/Util/FSTDispatchQueue.h" +#import "Firestore/Source/Util/FSTLogger.h" + +#import "Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbrpc.h" /** * Initial backoff time in seconds after an error. diff --git a/Firestore/Source/Remote/FSTWatchChange.h b/Firestore/Source/Remote/FSTWatchChange.h index 6b65279..8ce24fa 100644 --- a/Firestore/Source/Remote/FSTWatchChange.h +++ b/Firestore/Source/Remote/FSTWatchChange.h @@ -16,7 +16,7 @@ #import <Foundation/Foundation.h> -#import "FSTTypes.h" +#import "Firestore/Source/Core/FSTTypes.h" @class FSTDocumentKey; @class FSTExistenceFilter; diff --git a/Firestore/Source/Remote/FSTWatchChange.m b/Firestore/Source/Remote/FSTWatchChange.m index 1ace26e..926d027 100644 --- a/Firestore/Source/Remote/FSTWatchChange.m +++ b/Firestore/Source/Remote/FSTWatchChange.m @@ -14,11 +14,11 @@ * limitations under the License. */ -#import "FSTWatchChange.h" +#import "Firestore/Source/Remote/FSTWatchChange.h" -#import "FSTDocument.h" -#import "FSTDocumentKey.h" -#import "FSTExistenceFilter.h" +#import "Firestore/Source/Model/FSTDocument.h" +#import "Firestore/Source/Model/FSTDocumentKey.h" +#import "Firestore/Source/Remote/FSTExistenceFilter.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Util/FSTAsyncQueryListener.h b/Firestore/Source/Util/FSTAsyncQueryListener.h index 0ff1551..4888268 100644 --- a/Firestore/Source/Util/FSTAsyncQueryListener.h +++ b/Firestore/Source/Util/FSTAsyncQueryListener.h @@ -16,7 +16,7 @@ #import <Foundation/Foundation.h> -#import "FSTViewSnapshot.h" +#import "Firestore/Source/Core/FSTViewSnapshot.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Util/FSTAsyncQueryListener.m b/Firestore/Source/Util/FSTAsyncQueryListener.m index 31951e1..d98e2dd 100644 --- a/Firestore/Source/Util/FSTAsyncQueryListener.m +++ b/Firestore/Source/Util/FSTAsyncQueryListener.m @@ -14,9 +14,9 @@ * limitations under the License. */ -#import "FSTAsyncQueryListener.h" +#import "Firestore/Source/Util/FSTAsyncQueryListener.h" -#import "FSTDispatchQueue.h" +#import "Firestore/Source/Util/FSTDispatchQueue.h" @implementation FSTAsyncQueryListener { volatile BOOL _muted; diff --git a/Firestore/Source/Util/FSTComparison.m b/Firestore/Source/Util/FSTComparison.m index e4f4ccb..9c5c3eb 100644 --- a/Firestore/Source/Util/FSTComparison.m +++ b/Firestore/Source/Util/FSTComparison.m @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "FSTComparison.h" +#import "Firestore/Source/Util/FSTComparison.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Util/FSTDispatchQueue.m b/Firestore/Source/Util/FSTDispatchQueue.m index 8c953fe..6ce5d74 100644 --- a/Firestore/Source/Util/FSTDispatchQueue.m +++ b/Firestore/Source/Util/FSTDispatchQueue.m @@ -16,8 +16,8 @@ #import <Foundation/Foundation.h> -#import "FSTAssert.h" -#import "FSTDispatchQueue.h" +#import "Firestore/Source/Util/FSTAssert.h" +#import "Firestore/Source/Util/FSTDispatchQueue.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Util/FSTLogger.m b/Firestore/Source/Util/FSTLogger.m index 396c788..7742aeb 100644 --- a/Firestore/Source/Util/FSTLogger.m +++ b/Firestore/Source/Util/FSTLogger.m @@ -14,10 +14,10 @@ * limitations under the License. */ -#import "FSTLogger.h" +#import "Firestore/Source/Util/FSTLogger.h" -#import "FIRFirestore+Internal.h" #import "FIRLogger.h" +#import "Firestore/Source/API/FIRFirestore+Internal.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Source/Util/FSTUtil.m b/Firestore/Source/Util/FSTUtil.m index d14c429..a25cd7e 100644 --- a/Firestore/Source/Util/FSTUtil.m +++ b/Firestore/Source/Util/FSTUtil.m @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "FSTUtil.h" +#import "Firestore/Source/Util/FSTUtil.h" NS_ASSUME_NONNULL_BEGIN |