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/Example/Tests/SpecTests | |
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/Example/Tests/SpecTests')
7 files changed, 65 insertions, 65 deletions
diff --git a/Firestore/Example/Tests/SpecTests/FSTLevelDBSpecTests.m b/Firestore/Example/Tests/SpecTests/FSTLevelDBSpecTests.m index 88b3f12..a67f667 100644 --- a/Firestore/Example/Tests/SpecTests/FSTLevelDBSpecTests.m +++ b/Firestore/Example/Tests/SpecTests/FSTLevelDBSpecTests.m @@ -14,12 +14,12 @@ * limitations under the License. */ -#import "FSTSpecTests.h" +#import "Firestore/Example/Tests/SpecTests/FSTSpecTests.h" -#import "Local/FSTLevelDB.h" +#import "Firestore/Source/Local/FSTLevelDB.h" -#import "FSTPersistenceTestHelpers.h" -#import "FSTSyncEngineTestDriver.h" +#import "Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.h" +#import "Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Example/Tests/SpecTests/FSTMemorySpecTests.m b/Firestore/Example/Tests/SpecTests/FSTMemorySpecTests.m index 9cf1f39..3030ab5 100644 --- a/Firestore/Example/Tests/SpecTests/FSTMemorySpecTests.m +++ b/Firestore/Example/Tests/SpecTests/FSTMemorySpecTests.m @@ -14,12 +14,12 @@ * limitations under the License. */ -#import "FSTSpecTests.h" +#import "Firestore/Example/Tests/SpecTests/FSTSpecTests.h" -#import "Local/FSTMemoryPersistence.h" +#import "Firestore/Source/Local/FSTMemoryPersistence.h" -#import "FSTPersistenceTestHelpers.h" -#import "FSTSyncEngineTestDriver.h" +#import "Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.h" +#import "Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Example/Tests/SpecTests/FSTMockDatastore.h b/Firestore/Example/Tests/SpecTests/FSTMockDatastore.h index 8d65529..5420c2e 100644 --- a/Firestore/Example/Tests/SpecTests/FSTMockDatastore.h +++ b/Firestore/Example/Tests/SpecTests/FSTMockDatastore.h @@ -16,7 +16,7 @@ #import <Foundation/Foundation.h> -#import "Remote/FSTDatastore.h" +#import "Firestore/Source/Remote/FSTDatastore.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Example/Tests/SpecTests/FSTMockDatastore.m b/Firestore/Example/Tests/SpecTests/FSTMockDatastore.m index d3b196b..9a1d719 100644 --- a/Firestore/Example/Tests/SpecTests/FSTMockDatastore.m +++ b/Firestore/Example/Tests/SpecTests/FSTMockDatastore.m @@ -14,20 +14,20 @@ * limitations under the License. */ -#import "FSTMockDatastore.h" - -#import "Auth/FSTEmptyCredentialsProvider.h" -#import "Core/FSTDatabaseInfo.h" -#import "Core/FSTSnapshotVersion.h" -#import "Local/FSTQueryData.h" -#import "Model/FSTDatabaseID.h" -#import "Model/FSTMutation.h" -#import "Remote/FSTSerializerBeta.h" -#import "Remote/FSTStream.h" -#import "Util/FSTAssert.h" -#import "Util/FSTLogger.h" - -#import "FSTWatchChange+Testing.h" +#import "Firestore/Example/Tests/SpecTests/FSTMockDatastore.h" + +#import "Firestore/Source/Auth/FSTEmptyCredentialsProvider.h" +#import "Firestore/Source/Core/FSTDatabaseInfo.h" +#import "Firestore/Source/Core/FSTSnapshotVersion.h" +#import "Firestore/Source/Local/FSTQueryData.h" +#import "Firestore/Source/Model/FSTDatabaseID.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/FSTLogger.h" + +#import "Firestore/Example/Tests/Remote/FSTWatchChange+Testing.h" @class GRPCProtoCall; diff --git a/Firestore/Example/Tests/SpecTests/FSTSpecTests.m b/Firestore/Example/Tests/SpecTests/FSTSpecTests.m index 08ff6c7..8782495 100644 --- a/Firestore/Example/Tests/SpecTests/FSTSpecTests.m +++ b/Firestore/Example/Tests/SpecTests/FSTSpecTests.m @@ -14,34 +14,34 @@ * limitations under the License. */ -#import "FSTSpecTests.h" +#import "Firestore/Example/Tests/SpecTests/FSTSpecTests.h" #import <GRPCClient/GRPCCall.h> -#import "Auth/FSTUser.h" -#import "Core/FSTEventManager.h" -#import "Core/FSTQuery.h" -#import "Core/FSTSnapshotVersion.h" -#import "Core/FSTViewSnapshot.h" #import "Firestore/FIRFirestoreErrors.h" -#import "Local/FSTEagerGarbageCollector.h" -#import "Local/FSTNoOpGarbageCollector.h" -#import "Local/FSTPersistence.h" -#import "Local/FSTQueryData.h" -#import "Model/FSTDocument.h" -#import "Model/FSTDocumentKey.h" -#import "Model/FSTFieldValue.h" -#import "Model/FSTMutation.h" -#import "Model/FSTPath.h" -#import "Remote/FSTExistenceFilter.h" -#import "Remote/FSTWatchChange.h" -#import "Util/FSTAssert.h" -#import "Util/FSTClasses.h" -#import "Util/FSTLogger.h" - -#import "FSTHelpers.h" -#import "FSTSyncEngineTestDriver.h" -#import "FSTWatchChange+Testing.h" +#import "Firestore/Source/Auth/FSTUser.h" +#import "Firestore/Source/Core/FSTEventManager.h" +#import "Firestore/Source/Core/FSTQuery.h" +#import "Firestore/Source/Core/FSTSnapshotVersion.h" +#import "Firestore/Source/Core/FSTViewSnapshot.h" +#import "Firestore/Source/Local/FSTEagerGarbageCollector.h" +#import "Firestore/Source/Local/FSTNoOpGarbageCollector.h" +#import "Firestore/Source/Local/FSTPersistence.h" +#import "Firestore/Source/Local/FSTQueryData.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/FSTPath.h" +#import "Firestore/Source/Remote/FSTExistenceFilter.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" + +#import "Firestore/Example/Tests/Remote/FSTWatchChange+Testing.h" +#import "Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.h" +#import "Firestore/Example/Tests/Util/FSTHelpers.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.h b/Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.h index e78ef92..3d031bd 100644 --- a/Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.h +++ b/Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.h @@ -16,7 +16,7 @@ #import <Foundation/Foundation.h> -#import "Core/FSTTypes.h" +#import "Firestore/Source/Core/FSTTypes.h" @class FSTDocumentKey; @class FSTMutation; diff --git a/Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.m b/Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.m index a4678e3..5a2c311 100644 --- a/Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.m +++ b/Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.m @@ -14,27 +14,27 @@ * limitations under the License. */ -#import "FSTSyncEngineTestDriver.h" +#import "Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.h" #import <GRPCClient/GRPCCall.h> -#import "Auth/FSTUser.h" -#import "Core/FSTEventManager.h" -#import "Core/FSTQuery.h" -#import "Core/FSTSnapshotVersion.h" -#import "Core/FSTSyncEngine.h" #import "Firestore/FIRFirestoreErrors.h" -#import "Local/FSTLocalStore.h" -#import "Local/FSTPersistence.h" -#import "Model/FSTMutation.h" -#import "Remote/FSTDatastore.h" -#import "Remote/FSTWatchChange.h" -#import "Util/FSTAssert.h" -#import "Util/FSTDispatchQueue.h" -#import "Util/FSTLogger.h" - -#import "FSTMockDatastore.h" -#import "FSTSyncEngine+Testing.h" +#import "Firestore/Source/Auth/FSTUser.h" +#import "Firestore/Source/Core/FSTEventManager.h" +#import "Firestore/Source/Core/FSTQuery.h" +#import "Firestore/Source/Core/FSTSnapshotVersion.h" +#import "Firestore/Source/Core/FSTSyncEngine.h" +#import "Firestore/Source/Local/FSTLocalStore.h" +#import "Firestore/Source/Local/FSTPersistence.h" +#import "Firestore/Source/Model/FSTMutation.h" +#import "Firestore/Source/Remote/FSTDatastore.h" +#import "Firestore/Source/Remote/FSTWatchChange.h" +#import "Firestore/Source/Util/FSTAssert.h" +#import "Firestore/Source/Util/FSTDispatchQueue.h" +#import "Firestore/Source/Util/FSTLogger.h" + +#import "Firestore/Example/Tests/Core/FSTSyncEngine+Testing.h" +#import "Firestore/Example/Tests/SpecTests/FSTMockDatastore.h" NS_ASSUME_NONNULL_BEGIN |