aboutsummaryrefslogtreecommitdiffhomepage
path: root/Firestore/Source/Core
diff options
context:
space:
mode:
authorGravatar Gil <mcg@google.com>2017-11-16 20:52:01 -0800
committerGravatar GitHub <noreply@github.com>2017-11-16 20:52:01 -0800
commit4fbc96904fe86b3a0cdb91bfa6d96491221eb6b9 (patch)
treeb1737ee79405b7c80c2a03f6598c3ba71df2d05f /Firestore/Source/Core
parent88b7e74e3102fc8de453f22a44fd5cb4c91472e3 (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/Core')
-rw-r--r--Firestore/Source/Core/FSTDatabaseInfo.m4
-rw-r--r--Firestore/Source/Core/FSTEventManager.h6
-rw-r--r--Firestore/Source/Core/FSTEventManager.m10
-rw-r--r--Firestore/Source/Core/FSTFirestoreClient.h6
-rw-r--r--Firestore/Source/Core/FSTFirestoreClient.m40
-rw-r--r--Firestore/Source/Core/FSTQuery.m16
-rw-r--r--Firestore/Source/Core/FSTSnapshotVersion.m4
-rw-r--r--Firestore/Source/Core/FSTSyncEngine.h4
-rw-r--r--Firestore/Source/Core/FSTSyncEngine.m44
-rw-r--r--Firestore/Source/Core/FSTTargetIDGenerator.h2
-rw-r--r--Firestore/Source/Core/FSTTargetIDGenerator.m2
-rw-r--r--Firestore/Source/Core/FSTTimestamp.m6
-rw-r--r--Firestore/Source/Core/FSTTransaction.h2
-rw-r--r--Firestore/Source/Core/FSTTransaction.m20
-rw-r--r--Firestore/Source/Core/FSTView.h4
-rw-r--r--Firestore/Source/Core/FSTView.m20
-rw-r--r--Firestore/Source/Core/FSTViewSnapshot.m16
17 files changed, 103 insertions, 103 deletions
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