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 | |
| 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
227 files changed, 1131 insertions, 1175 deletions
diff --git a/Firestore/Example/Firestore.xcodeproj/project.pbxproj b/Firestore/Example/Firestore.xcodeproj/project.pbxproj index eac3251..1cc4f83 100644 --- a/Firestore/Example/Firestore.xcodeproj/project.pbxproj +++ b/Firestore/Example/Firestore.xcodeproj/project.pbxproj @@ -1343,6 +1343,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = ""; IPHONEOS_DEPLOYMENT_TARGET = 8.0; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -1376,6 +1377,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = ""; IPHONEOS_DEPLOYMENT_TARGET = 8.0; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1443,19 +1445,8 @@ ); HEADER_SEARCH_PATHS = ( "$(inherited)", - "\"${PODS_ROOT}/../../Source\"", - "\"${PODS_ROOT}/../../Source/API\"", - "\"${PODS_ROOT}/../../Source/Core\"", - "\"${PODS_ROOT}/../../Source/Remote\"", - "\"${PODS_ROOT}/../../Source/Model\"", - "\"${PODS_ROOT}/../../third_party\"", - "\"${PODS_ROOT}/../../third_party/Immutable\"", - "\"${PODS_ROOT}/../../\"", - "\"${PODS_ROOT}/../../Protos/objc/firestore/local\"", - "\"${PODS_ROOT}/../../Protos/objc/google/firestore/v1beta1\"", - "\"${PODS_ROOT}/../../Protos/objc/google/api\"", - "\"${PODS_ROOT}/../../Protos/objc/google/rpc\"", - "\"${PODS_ROOT}/../../Protos/objc/google/type\"", + "\"${PODS_ROOT}/../../..\"", + "\"${PODS_ROOT}/leveldb-library/include\"", ); INFOPLIST_FILE = "Tests/Tests-Info.plist"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}"; @@ -1485,19 +1476,8 @@ ); HEADER_SEARCH_PATHS = ( "$(inherited)", - "\"${PODS_ROOT}/../../Source\"", - "\"${PODS_ROOT}/../../Source/API\"", - "\"${PODS_ROOT}/../../Source/Core\"", - "\"${PODS_ROOT}/../../Source/Remote\"", - "\"${PODS_ROOT}/../../Source/Model\"", - "\"${PODS_ROOT}/../../third_party\"", - "\"${PODS_ROOT}/../../third_party/Immutable\"", - "\"${PODS_ROOT}/../../Protos/objc/firebase/datastore/clients/proto\"", - "\"${PODS_ROOT}/../../Protos/objc/google/firestore/v1beta1\"", - "\"${PODS_ROOT}/../../Protos/objc/google/api\"", - "\"${PODS_ROOT}/../../Protos/objc/google/rpc\"", - "\"${PODS_ROOT}/../../Protos/objc/google/type\"", - "\"${PODS_ROOT}/../../\"", + "\"${PODS_ROOT}/../../..\"", + "\"${PODS_ROOT}/leveldb-library/include\"", ); INFOPLIST_FILE = "Tests/Tests-Info.plist"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}"; @@ -1527,19 +1507,7 @@ ); HEADER_SEARCH_PATHS = ( "$(inherited)", - "\"${PODS_ROOT}/../../Source\"", - "\"${PODS_ROOT}/../../Source/API\"", - "\"${PODS_ROOT}/../../Source/Core\"", - "\"${PODS_ROOT}/../../Source/Remote\"", - "\"${PODS_ROOT}/../../Source/Model\"", - "\"${PODS_ROOT}/../../third_party\"", - "\"${PODS_ROOT}/../../third_party/Immutable\"", - "\"${PODS_ROOT}/../../Protos/objc/firestore/local\"", - "\"${PODS_ROOT}/../../Protos/objc/google/firestore/v1beta1\"", - "\"${PODS_ROOT}/../../Protos/objc/google/api\"", - "\"${PODS_ROOT}/../../Protos/objc/google/rpc\"", - "\"${PODS_ROOT}/../../Protos/objc/google/type\"", - "\"${PODS_ROOT}/../../\"", + "\"${PODS_ROOT}/../../..\"", ); INFOPLIST_FILE = "Tests/Tests-Info.plist"; OTHER_LDFLAGS = ( @@ -1577,19 +1545,7 @@ ); HEADER_SEARCH_PATHS = ( "$(inherited)", - "\"${PODS_ROOT}/../../Source\"", - "\"${PODS_ROOT}/../../Source/API\"", - "\"${PODS_ROOT}/../../Source/Core\"", - "\"${PODS_ROOT}/../../Source/Remote\"", - "\"${PODS_ROOT}/../../Source/Model\"", - "\"${PODS_ROOT}/../../third_party\"", - "\"${PODS_ROOT}/../../third_party/Immutable\"", - "\"${PODS_ROOT}/../../Protos/objc/firestore/local\"", - "\"${PODS_ROOT}/../../Protos/objc/google/firestore/v1beta1\"", - "\"${PODS_ROOT}/../../Protos/objc/google/api\"", - "\"${PODS_ROOT}/../../Protos/objc/google/rpc\"", - "\"${PODS_ROOT}/../../Protos/objc/google/type\"", - "\"${PODS_ROOT}/../../\"", + "\"${PODS_ROOT}/../../..\"", ); INFOPLIST_FILE = "Tests/Tests-Info.plist"; OTHER_LDFLAGS = ( diff --git a/Firestore/Example/Tests/API/FIRGeoPointTests.m b/Firestore/Example/Tests/API/FIRGeoPointTests.m index ca7d24c..3fc8b33 100644 --- a/Firestore/Example/Tests/API/FIRGeoPointTests.m +++ b/Firestore/Example/Tests/API/FIRGeoPointTests.m @@ -18,7 +18,7 @@ #import <XCTest/XCTest.h> -#import "FSTHelpers.h" +#import "Firestore/Example/Tests/Util/FSTHelpers.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Example/Tests/Core/FSTDatabaseInfoTests.m b/Firestore/Example/Tests/Core/FSTDatabaseInfoTests.m index 931a59f..c7cf22a 100644 --- a/Firestore/Example/Tests/Core/FSTDatabaseInfoTests.m +++ b/Firestore/Example/Tests/Core/FSTDatabaseInfoTests.m @@ -14,11 +14,11 @@ * limitations under the License. */ -#import "Core/FSTDatabaseInfo.h" +#import "Firestore/Source/Core/FSTDatabaseInfo.h" #import <XCTest/XCTest.h> -#import "Model/FSTDatabaseID.h" +#import "Firestore/Source/Model/FSTDatabaseID.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Example/Tests/Core/FSTEventManagerTests.m b/Firestore/Example/Tests/Core/FSTEventManagerTests.m index 85afe58..99021ce 100644 --- a/Firestore/Example/Tests/Core/FSTEventManagerTests.m +++ b/Firestore/Example/Tests/Core/FSTEventManagerTests.m @@ -14,17 +14,17 @@ * limitations under the License. */ -#import "Core/FSTEventManager.h" +#import "Firestore/Source/Core/FSTEventManager.h" #import <OCMock/OCMock.h> #import <XCTest/XCTest.h> -#import "Core/FSTQuery.h" -#import "Core/FSTSyncEngine.h" -#import "Model/FSTDocumentSet.h" -#import "Util/FSTDispatchQueue.h" +#import "Firestore/Source/Core/FSTQuery.h" +#import "Firestore/Source/Core/FSTSyncEngine.h" +#import "Firestore/Source/Model/FSTDocumentSet.h" +#import "Firestore/Source/Util/FSTDispatchQueue.h" -#import "FSTHelpers.h" +#import "Firestore/Example/Tests/Util/FSTHelpers.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Example/Tests/Core/FSTQueryListenerTests.m b/Firestore/Example/Tests/Core/FSTQueryListenerTests.m index 155eb00..1bb7a47 100644 --- a/Firestore/Example/Tests/Core/FSTQueryListenerTests.m +++ b/Firestore/Example/Tests/Core/FSTQueryListenerTests.m @@ -14,19 +14,19 @@ * limitations under the License. */ -#import "Core/FSTEventManager.h" +#import "Firestore/Source/Core/FSTEventManager.h" #import <XCTest/XCTest.h> -#import "Core/FSTQuery.h" -#import "Core/FSTView.h" -#import "Model/FSTDocument.h" -#import "Model/FSTDocumentSet.h" -#import "Remote/FSTRemoteEvent.h" -#import "Util/FSTAsyncQueryListener.h" -#import "Util/FSTDispatchQueue.h" +#import "Firestore/Source/Core/FSTQuery.h" +#import "Firestore/Source/Core/FSTView.h" +#import "Firestore/Source/Model/FSTDocument.h" +#import "Firestore/Source/Model/FSTDocumentSet.h" +#import "Firestore/Source/Remote/FSTRemoteEvent.h" +#import "Firestore/Source/Util/FSTAsyncQueryListener.h" +#import "Firestore/Source/Util/FSTDispatchQueue.h" -#import "FSTHelpers.h" +#import "Firestore/Example/Tests/Util/FSTHelpers.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Example/Tests/Core/FSTQueryTests.m b/Firestore/Example/Tests/Core/FSTQueryTests.m index 051f10d..1fd0e8b 100644 --- a/Firestore/Example/Tests/Core/FSTQueryTests.m +++ b/Firestore/Example/Tests/Core/FSTQueryTests.m @@ -14,17 +14,17 @@ * limitations under the License. */ -#import "Core/FSTQuery.h" +#import "Firestore/Source/Core/FSTQuery.h" #import <XCTest/XCTest.h> -#import "API/FIRFirestore+Internal.h" -#import "Model/FSTDatabaseID.h" -#import "Model/FSTDocument.h" -#import "Model/FSTDocumentKey.h" -#import "Model/FSTPath.h" +#import "Firestore/Source/API/FIRFirestore+Internal.h" +#import "Firestore/Source/Model/FSTDatabaseID.h" +#import "Firestore/Source/Model/FSTDocument.h" +#import "Firestore/Source/Model/FSTDocumentKey.h" +#import "Firestore/Source/Model/FSTPath.h" -#import "FSTHelpers.h" +#import "Firestore/Example/Tests/Util/FSTHelpers.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Example/Tests/Core/FSTSyncEngine+Testing.h b/Firestore/Example/Tests/Core/FSTSyncEngine+Testing.h index ff98e74..ab0697b 100644 --- a/Firestore/Example/Tests/Core/FSTSyncEngine+Testing.h +++ b/Firestore/Example/Tests/Core/FSTSyncEngine+Testing.h @@ -16,7 +16,7 @@ #import <Foundation/Foundation.h> -#import "Core/FSTSyncEngine.h" +#import "Firestore/Source/Core/FSTSyncEngine.h" @class FSTDocumentKey; diff --git a/Firestore/Example/Tests/Core/FSTTargetIDGeneratorTests.m b/Firestore/Example/Tests/Core/FSTTargetIDGeneratorTests.m index 11a7f46..6f54fd1 100644 --- a/Firestore/Example/Tests/Core/FSTTargetIDGeneratorTests.m +++ b/Firestore/Example/Tests/Core/FSTTargetIDGeneratorTests.m @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "Core/FSTTargetIDGenerator.h" +#import "Firestore/Source/Core/FSTTargetIDGenerator.h" #import <XCTest/XCTest.h> diff --git a/Firestore/Example/Tests/Core/FSTTimestampTests.m b/Firestore/Example/Tests/Core/FSTTimestampTests.m index 8538078..a3765fe 100644 --- a/Firestore/Example/Tests/Core/FSTTimestampTests.m +++ b/Firestore/Example/Tests/Core/FSTTimestampTests.m @@ -14,13 +14,13 @@ * limitations under the License. */ -#import "Core/FSTTimestamp.h" +#import "Firestore/Source/Core/FSTTimestamp.h" #import <XCTest/XCTest.h> -#import "Util/FSTAssert.h" +#import "Firestore/Source/Util/FSTAssert.h" -#import "FSTHelpers.h" +#import "Firestore/Example/Tests/Util/FSTHelpers.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Example/Tests/Core/FSTViewSnapshotTest.m b/Firestore/Example/Tests/Core/FSTViewSnapshotTest.m index 202fae8..5d3787a 100644 --- a/Firestore/Example/Tests/Core/FSTViewSnapshotTest.m +++ b/Firestore/Example/Tests/Core/FSTViewSnapshotTest.m @@ -14,16 +14,16 @@ * limitations under the License. */ -#import "Core/FSTViewSnapshot.h" +#import "Firestore/Source/Core/FSTViewSnapshot.h" #import <XCTest/XCTest.h> -#import "Core/FSTQuery.h" -#import "Model/FSTDocument.h" -#import "Model/FSTDocumentSet.h" -#import "Model/FSTPath.h" +#import "Firestore/Source/Core/FSTQuery.h" +#import "Firestore/Source/Model/FSTDocument.h" +#import "Firestore/Source/Model/FSTDocumentSet.h" +#import "Firestore/Source/Model/FSTPath.h" -#import "FSTHelpers.h" +#import "Firestore/Example/Tests/Util/FSTHelpers.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Example/Tests/Core/FSTViewTests.m b/Firestore/Example/Tests/Core/FSTViewTests.m index d939d62..e6c4510 100644 --- a/Firestore/Example/Tests/Core/FSTViewTests.m +++ b/Firestore/Example/Tests/Core/FSTViewTests.m @@ -14,21 +14,21 @@ * limitations under the License. */ -#import "Core/FSTView.h" +#import "Firestore/Source/Core/FSTView.h" #import <XCTest/XCTest.h> -#import "API/FIRFirestore+Internal.h" -#import "Core/FSTQuery.h" -#import "Core/FSTViewSnapshot.h" -#import "Model/FSTDocument.h" -#import "Model/FSTDocumentKey.h" -#import "Model/FSTDocumentSet.h" -#import "Model/FSTFieldValue.h" -#import "Model/FSTPath.h" -#import "Remote/FSTRemoteEvent.h" - -#import "FSTHelpers.h" +#import "Firestore/Source/API/FIRFirestore+Internal.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/Model/FSTPath.h" +#import "Firestore/Source/Remote/FSTRemoteEvent.h" + +#import "Firestore/Example/Tests/Util/FSTHelpers.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Example/Tests/GoogleTest/FSTGoogleTestTests.mm b/Firestore/Example/Tests/GoogleTest/FSTGoogleTestTests.mm index 731e698..d22827a 100644 --- a/Firestore/Example/Tests/GoogleTest/FSTGoogleTestTests.mm +++ b/Firestore/Example/Tests/GoogleTest/FSTGoogleTestTests.mm @@ -17,7 +17,7 @@ #import <XCTest/XCTest.h> #import <objc/runtime.h> -#include "Util/FSTAssert.h" +#include "Firestore/Source/Util/FSTAssert.h" #include "gtest/gtest.h" /** diff --git a/Firestore/Example/Tests/Integration/API/FIRCursorTests.m b/Firestore/Example/Tests/Integration/API/FIRCursorTests.m index 2f8babd..72c55f6 100644 --- a/Firestore/Example/Tests/Integration/API/FIRCursorTests.m +++ b/Firestore/Example/Tests/Integration/API/FIRCursorTests.m @@ -18,7 +18,7 @@ #import <XCTest/XCTest.h> -#import "FSTIntegrationTestCase.h" +#import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h" @interface FIRCursorTests : FSTIntegrationTestCase @end diff --git a/Firestore/Example/Tests/Integration/API/FIRDatabaseTests.m b/Firestore/Example/Tests/Integration/API/FIRDatabaseTests.m index 6a6e49a..8ba8903 100644 --- a/Firestore/Example/Tests/Integration/API/FIRDatabaseTests.m +++ b/Firestore/Example/Tests/Integration/API/FIRDatabaseTests.m @@ -18,9 +18,9 @@ #import <XCTest/XCTest.h> -#import "Core/FSTFirestoreClient.h" -#import "FIRFirestore+Internal.h" -#import "FSTIntegrationTestCase.h" +#import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h" +#import "Firestore/Source/API/FIRFirestore+Internal.h" +#import "Firestore/Source/Core/FSTFirestoreClient.h" @interface FIRDatabaseTests : FSTIntegrationTestCase @end diff --git a/Firestore/Example/Tests/Integration/API/FIRFieldsTests.m b/Firestore/Example/Tests/Integration/API/FIRFieldsTests.m index d851556..60bf36b 100644 --- a/Firestore/Example/Tests/Integration/API/FIRFieldsTests.m +++ b/Firestore/Example/Tests/Integration/API/FIRFieldsTests.m @@ -18,9 +18,9 @@ #import <XCTest/XCTest.h> -#import "Core/FSTFirestoreClient.h" +#import "Firestore/Source/Core/FSTFirestoreClient.h" -#import "FSTIntegrationTestCase.h" +#import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h" @interface FIRFieldsTests : FSTIntegrationTestCase @end diff --git a/Firestore/Example/Tests/Integration/API/FIRListenerRegistrationTests.m b/Firestore/Example/Tests/Integration/API/FIRListenerRegistrationTests.m index 5824314..6b1f787 100644 --- a/Firestore/Example/Tests/Integration/API/FIRListenerRegistrationTests.m +++ b/Firestore/Example/Tests/Integration/API/FIRListenerRegistrationTests.m @@ -18,9 +18,9 @@ #import <XCTest/XCTest.h> -#import "Core/FSTFirestoreClient.h" -#import "FIRFirestore+Internal.h" -#import "FSTIntegrationTestCase.h" +#import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h" +#import "Firestore/Source/API/FIRFirestore+Internal.h" +#import "Firestore/Source/Core/FSTFirestoreClient.h" @interface FIRListenerRegistrationTests : FSTIntegrationTestCase @end diff --git a/Firestore/Example/Tests/Integration/API/FIRQueryTests.m b/Firestore/Example/Tests/Integration/API/FIRQueryTests.m index f08df33..b80c52d 100644 --- a/Firestore/Example/Tests/Integration/API/FIRQueryTests.m +++ b/Firestore/Example/Tests/Integration/API/FIRQueryTests.m @@ -18,9 +18,9 @@ #import <XCTest/XCTest.h> -#import "Core/FSTFirestoreClient.h" +#import "Firestore/Source/Core/FSTFirestoreClient.h" -#import "FSTIntegrationTestCase.h" +#import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h" @interface FIRQueryTests : FSTIntegrationTestCase @end diff --git a/Firestore/Example/Tests/Integration/API/FIRServerTimestampTests.m b/Firestore/Example/Tests/Integration/API/FIRServerTimestampTests.m index 1d77e16..da9fb1a 100644 --- a/Firestore/Example/Tests/Integration/API/FIRServerTimestampTests.m +++ b/Firestore/Example/Tests/Integration/API/FIRServerTimestampTests.m @@ -18,10 +18,10 @@ #import <XCTest/XCTest.h> -#import "Core/FSTFirestoreClient.h" +#import "Firestore/Source/Core/FSTFirestoreClient.h" -#import "FSTEventAccumulator.h" -#import "FSTIntegrationTestCase.h" +#import "Firestore/Example/Tests/Util/FSTEventAccumulator.h" +#import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h" @interface FIRServerTimestampTests : FSTIntegrationTestCase @end diff --git a/Firestore/Example/Tests/Integration/API/FIRTypeTests.m b/Firestore/Example/Tests/Integration/API/FIRTypeTests.m index 4e2c76e..02eccbc 100644 --- a/Firestore/Example/Tests/Integration/API/FIRTypeTests.m +++ b/Firestore/Example/Tests/Integration/API/FIRTypeTests.m @@ -18,7 +18,7 @@ #import <XCTest/XCTest.h> -#import "FSTIntegrationTestCase.h" +#import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h" @interface FIRTypeTests : FSTIntegrationTestCase @end diff --git a/Firestore/Example/Tests/Integration/API/FIRValidationTests.m b/Firestore/Example/Tests/Integration/API/FIRValidationTests.m index 7fa4c3e..444931e 100644 --- a/Firestore/Example/Tests/Integration/API/FIRValidationTests.m +++ b/Firestore/Example/Tests/Integration/API/FIRValidationTests.m @@ -18,8 +18,8 @@ #import <XCTest/XCTest.h> -#import "FSTHelpers.h" -#import "FSTIntegrationTestCase.h" +#import "Firestore/Example/Tests/Util/FSTHelpers.h" +#import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h" // We have tests for passing nil when nil is not supposed to be allowed. So suppress the warnings. #pragma clang diagnostic ignored "-Wnonnull" diff --git a/Firestore/Example/Tests/Integration/API/FIRWriteBatchTests.m b/Firestore/Example/Tests/Integration/API/FIRWriteBatchTests.m index 159cbd7..906b27c 100644 --- a/Firestore/Example/Tests/Integration/API/FIRWriteBatchTests.m +++ b/Firestore/Example/Tests/Integration/API/FIRWriteBatchTests.m @@ -18,8 +18,8 @@ #import <XCTest/XCTest.h> -#import "FSTEventAccumulator.h" -#import "FSTIntegrationTestCase.h" +#import "Firestore/Example/Tests/Util/FSTEventAccumulator.h" +#import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h" @interface FIRWriteBatchTests : FSTIntegrationTestCase @end diff --git a/Firestore/Example/Tests/Integration/FSTDatastoreTests.m b/Firestore/Example/Tests/Integration/FSTDatastoreTests.m index 54ab66b..d51b21a 100644 --- a/Firestore/Example/Tests/Integration/FSTDatastoreTests.m +++ b/Firestore/Example/Tests/Integration/FSTDatastoreTests.m @@ -20,29 +20,29 @@ #import <GRPCClient/GRPCCall+Tests.h> #import <XCTest/XCTest.h> -#import "API/FIRDocumentReference+Internal.h" -#import "API/FSTUserDataConverter.h" -#import "Auth/FSTEmptyCredentialsProvider.h" -#import "Core/FSTDatabaseInfo.h" -#import "Core/FSTFirestoreClient.h" -#import "Core/FSTQuery.h" -#import "Core/FSTSnapshotVersion.h" -#import "Core/FSTTimestamp.h" -#import "Local/FSTQueryData.h" -#import "Model/FSTDatabaseID.h" -#import "Model/FSTDocumentKey.h" -#import "Model/FSTFieldValue.h" -#import "Model/FSTMutation.h" -#import "Model/FSTMutationBatch.h" -#import "Model/FSTPath.h" -#import "Remote/FSTDatastore.h" -#import "Remote/FSTRemoteEvent.h" -#import "Remote/FSTRemoteStore.h" -#import "Util/FSTAssert.h" -#import "Util/FSTDispatchQueue.h" -#import "Util/FSTUtil.h" - -#import "FSTIntegrationTestCase.h" +#import "Firestore/Source/API/FIRDocumentReference+Internal.h" +#import "Firestore/Source/API/FSTUserDataConverter.h" +#import "Firestore/Source/Auth/FSTEmptyCredentialsProvider.h" +#import "Firestore/Source/Core/FSTDatabaseInfo.h" +#import "Firestore/Source/Core/FSTFirestoreClient.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/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/FSTDatastore.h" +#import "Firestore/Source/Remote/FSTRemoteEvent.h" +#import "Firestore/Source/Remote/FSTRemoteStore.h" +#import "Firestore/Source/Util/FSTAssert.h" +#import "Firestore/Source/Util/FSTDispatchQueue.h" +#import "Firestore/Source/Util/FSTUtil.h" + +#import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Example/Tests/Integration/FSTSmokeTests.m b/Firestore/Example/Tests/Integration/FSTSmokeTests.m index e0ad06c..13bace3 100644 --- a/Firestore/Example/Tests/Integration/FSTSmokeTests.m +++ b/Firestore/Example/Tests/Integration/FSTSmokeTests.m @@ -18,8 +18,8 @@ #import <XCTest/XCTest.h> -#import "FSTEventAccumulator.h" -#import "FSTIntegrationTestCase.h" +#import "Firestore/Example/Tests/Util/FSTEventAccumulator.h" +#import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h" @interface FSTSmokeTests : FSTIntegrationTestCase @end diff --git a/Firestore/Example/Tests/Integration/FSTStreamTests.m b/Firestore/Example/Tests/Integration/FSTStreamTests.m index a9ee4d1..c8a9e9d 100644 --- a/Firestore/Example/Tests/Integration/FSTStreamTests.m +++ b/Firestore/Example/Tests/Integration/FSTStreamTests.m @@ -18,15 +18,15 @@ #import <Firestore/FIRFirestoreSettings.h> -#import "Auth/FSTEmptyCredentialsProvider.h" -#import "Core/FSTDatabaseInfo.h" -#import "FSTHelpers.h" -#import "FSTIntegrationTestCase.h" -#import "FSTTestDispatchQueue.h" -#import "Model/FSTDatabaseID.h" -#import "Remote/FSTDatastore.h" -#import "Remote/FSTStream.h" -#import "Util/FSTAssert.h" +#import "Firestore/Example/Tests/Util/FSTHelpers.h" +#import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h" +#import "Firestore/Example/Tests/Util/FSTTestDispatchQueue.h" +#import "Firestore/Source/Auth/FSTEmptyCredentialsProvider.h" +#import "Firestore/Source/Core/FSTDatabaseInfo.h" +#import "Firestore/Source/Model/FSTDatabaseID.h" +#import "Firestore/Source/Remote/FSTDatastore.h" +#import "Firestore/Source/Remote/FSTStream.h" +#import "Firestore/Source/Util/FSTAssert.h" /** Exposes otherwise private methods for testing. */ @interface FSTStream (Testing) diff --git a/Firestore/Example/Tests/Integration/FSTTransactionTests.m b/Firestore/Example/Tests/Integration/FSTTransactionTests.m index a0b5bbe..014e4a7 100644 --- a/Firestore/Example/Tests/Integration/FSTTransactionTests.m +++ b/Firestore/Example/Tests/Integration/FSTTransactionTests.m @@ -19,7 +19,7 @@ #import <XCTest/XCTest.h> #include <libkern/OSAtomic.h> -#import "FSTIntegrationTestCase.h" +#import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h" @interface FSTTransactionTests : FSTIntegrationTestCase @end diff --git a/Firestore/Example/Tests/Local/FSTEagerGarbageCollectorTests.m b/Firestore/Example/Tests/Local/FSTEagerGarbageCollectorTests.m index 34c0685..1dd6d62 100644 --- a/Firestore/Example/Tests/Local/FSTEagerGarbageCollectorTests.m +++ b/Firestore/Example/Tests/Local/FSTEagerGarbageCollectorTests.m @@ -14,14 +14,14 @@ * limitations under the License. */ -#import "Local/FSTEagerGarbageCollector.h" +#import "Firestore/Source/Local/FSTEagerGarbageCollector.h" #import <XCTest/XCTest.h> -#import "Local/FSTReferenceSet.h" -#import "Model/FSTDocumentKey.h" +#import "Firestore/Source/Local/FSTReferenceSet.h" +#import "Firestore/Source/Model/FSTDocumentKey.h" -#import "FSTHelpers.h" +#import "Firestore/Example/Tests/Util/FSTHelpers.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Example/Tests/Local/FSTLevelDBKeyTests.mm b/Firestore/Example/Tests/Local/FSTLevelDBKeyTests.mm index 3374fcf..998d23d 100644 --- a/Firestore/Example/Tests/Local/FSTLevelDBKeyTests.mm +++ b/Firestore/Example/Tests/Local/FSTLevelDBKeyTests.mm @@ -14,13 +14,13 @@ * limitations under the License. */ -#import "Local/FSTLevelDBKey.h" +#import "Firestore/Source/Local/FSTLevelDBKey.h" #import <XCTest/XCTest.h> -#import "Model/FSTPath.h" +#import "Firestore/Source/Model/FSTPath.h" -#import "FSTHelpers.h" +#import "Firestore/Example/Tests/Util/FSTHelpers.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Example/Tests/Local/FSTLevelDBLocalStoreTests.m b/Firestore/Example/Tests/Local/FSTLevelDBLocalStoreTests.m index d426149..f71f5c9 100644 --- a/Firestore/Example/Tests/Local/FSTLevelDBLocalStoreTests.m +++ b/Firestore/Example/Tests/Local/FSTLevelDBLocalStoreTests.m @@ -14,15 +14,15 @@ * limitations under the License. */ -#import "Local/FSTLocalStore.h" +#import "Firestore/Source/Local/FSTLocalStore.h" #import <XCTest/XCTest.h> -#import "Auth/FSTUser.h" -#import "Local/FSTLevelDB.h" +#import "Firestore/Source/Auth/FSTUser.h" +#import "Firestore/Source/Local/FSTLevelDB.h" -#import "FSTLocalStoreTests.h" -#import "FSTPersistenceTestHelpers.h" +#import "Firestore/Example/Tests/Local/FSTLocalStoreTests.h" +#import "Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Example/Tests/Local/FSTLevelDBMutationQueueTests.mm b/Firestore/Example/Tests/Local/FSTLevelDBMutationQueueTests.mm index ea6a895..6c26fd9 100644 --- a/Firestore/Example/Tests/Local/FSTLevelDBMutationQueueTests.mm +++ b/Firestore/Example/Tests/Local/FSTLevelDBMutationQueueTests.mm @@ -14,20 +14,20 @@ * limitations under the License. */ -#import "Local/FSTLevelDBMutationQueue.h" +#import "Firestore/Source/Local/FSTLevelDBMutationQueue.h" #import <XCTest/XCTest.h> #include <leveldb/db.h> -#import "Auth/FSTUser.h" -#import "Local/FSTLevelDB.h" -#import "Local/FSTLevelDBKey.h" -#import "Local/FSTWriteGroup.h" -#include "Port/ordered_code.h" -#import "Protos/objc/firestore/local/Mutation.pbobjc.h" +#include "Firestore/Port/ordered_code.h" +#import "Firestore/Protos/objc/firestore/local/Mutation.pbobjc.h" +#import "Firestore/Source/Auth/FSTUser.h" +#import "Firestore/Source/Local/FSTLevelDB.h" +#import "Firestore/Source/Local/FSTLevelDBKey.h" +#import "Firestore/Source/Local/FSTWriteGroup.h" -#import "FSTMutationQueueTests.h" -#import "FSTPersistenceTestHelpers.h" +#import "Firestore/Example/Tests/Local/FSTMutationQueueTests.h" +#import "Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Example/Tests/Local/FSTLevelDBQueryCacheTests.m b/Firestore/Example/Tests/Local/FSTLevelDBQueryCacheTests.m index 8149397..929ab9e 100644 --- a/Firestore/Example/Tests/Local/FSTLevelDBQueryCacheTests.m +++ b/Firestore/Example/Tests/Local/FSTLevelDBQueryCacheTests.m @@ -14,12 +14,12 @@ * limitations under the License. */ -#import "Local/FSTLevelDBQueryCache.h" +#import "Firestore/Source/Local/FSTLevelDBQueryCache.h" -#import "Local/FSTLevelDB.h" +#import "Firestore/Source/Local/FSTLevelDB.h" -#import "FSTPersistenceTestHelpers.h" -#import "FSTQueryCacheTests.h" +#import "Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.h" +#import "Firestore/Example/Tests/Local/FSTQueryCacheTests.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Example/Tests/Local/FSTLevelDBRemoteDocumentCacheTests.mm b/Firestore/Example/Tests/Local/FSTLevelDBRemoteDocumentCacheTests.mm index a6af103..1f84aa6 100644 --- a/Firestore/Example/Tests/Local/FSTLevelDBRemoteDocumentCacheTests.mm +++ b/Firestore/Example/Tests/Local/FSTLevelDBRemoteDocumentCacheTests.mm @@ -14,15 +14,15 @@ * limitations under the License. */ -#import "FSTRemoteDocumentCacheTests.h" +#import "Firestore/Example/Tests/Local/FSTRemoteDocumentCacheTests.h" #include <leveldb/db.h> -#import "Local/FSTLevelDB.h" -#import "Local/FSTLevelDBKey.h" -#include "Port/ordered_code.h" +#include "Firestore/Port/ordered_code.h" +#import "Firestore/Source/Local/FSTLevelDB.h" +#import "Firestore/Source/Local/FSTLevelDBKey.h" -#import "FSTPersistenceTestHelpers.h" +#import "Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Example/Tests/Local/FSTLocalSerializerTests.m b/Firestore/Example/Tests/Local/FSTLocalSerializerTests.m index 0080f89..90f9ca3 100644 --- a/Firestore/Example/Tests/Local/FSTLocalSerializerTests.m +++ b/Firestore/Example/Tests/Local/FSTLocalSerializerTests.m @@ -14,33 +14,33 @@ * limitations under the License. */ -#import "Local/FSTLocalSerializer.h" +#import "Firestore/Source/Local/FSTLocalSerializer.h" #import <XCTest/XCTest.h> -#import "Core/FSTQuery.h" -#import "Core/FSTSnapshotVersion.h" -#import "Core/FSTTimestamp.h" -#import "Local/FSTQueryData.h" -#import "Model/FSTDatabaseID.h" -#import "Model/FSTDocument.h" -#import "Model/FSTDocumentKey.h" -#import "Model/FSTFieldValue.h" -#import "Model/FSTMutation.h" -#import "Model/FSTMutationBatch.h" -#import "Model/FSTPath.h" -#import "Protos/objc/firestore/local/MaybeDocument.pbobjc.h" -#import "Protos/objc/firestore/local/Mutation.pbobjc.h" -#import "Protos/objc/firestore/local/Target.pbobjc.h" -#import "Protos/objc/google/firestore/v1beta1/Common.pbobjc.h" -#import "Protos/objc/google/firestore/v1beta1/Document.pbobjc.h" -#import "Protos/objc/google/firestore/v1beta1/Firestore.pbobjc.h" -#import "Protos/objc/google/firestore/v1beta1/Query.pbobjc.h" -#import "Protos/objc/google/firestore/v1beta1/Write.pbobjc.h" -#import "Protos/objc/google/type/Latlng.pbobjc.h" -#import "Remote/FSTSerializerBeta.h" - -#import "FSTHelpers.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/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/type/Latlng.pbobjc.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/FSTSerializerBeta.h" + +#import "Firestore/Example/Tests/Util/FSTHelpers.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Example/Tests/Local/FSTLocalStoreTests.m b/Firestore/Example/Tests/Local/FSTLocalStoreTests.m index ab492a7..245e1c4 100644 --- a/Firestore/Example/Tests/Local/FSTLocalStoreTests.m +++ b/Firestore/Example/Tests/Local/FSTLocalStoreTests.m @@ -14,33 +14,33 @@ * limitations under the License. */ -#import "Local/FSTLocalStore.h" +#import "Firestore/Source/Local/FSTLocalStore.h" #import <XCTest/XCTest.h> -#import "Auth/FSTUser.h" -#import "Core/FSTQuery.h" -#import "Core/FSTTimestamp.h" -#import "Local/FSTEagerGarbageCollector.h" -#import "Local/FSTLocalWriteResult.h" -#import "Local/FSTNoOpGarbageCollector.h" -#import "Local/FSTPersistence.h" -#import "Local/FSTQueryData.h" -#import "Model/FSTDocument.h" -#import "Model/FSTDocumentKey.h" -#import "Model/FSTDocumentSet.h" -#import "Model/FSTMutation.h" -#import "Model/FSTMutationBatch.h" -#import "Model/FSTPath.h" -#import "Remote/FSTRemoteEvent.h" -#import "Remote/FSTWatchChange.h" -#import "Util/FSTClasses.h" - -#import "FSTHelpers.h" -#import "FSTImmutableSortedDictionary+Testing.h" -#import "FSTImmutableSortedSet+Testing.h" -#import "FSTLocalStoreTests.h" -#import "FSTWatchChange+Testing.h" +#import "Firestore/Source/Auth/FSTUser.h" +#import "Firestore/Source/Core/FSTQuery.h" +#import "Firestore/Source/Core/FSTTimestamp.h" +#import "Firestore/Source/Local/FSTEagerGarbageCollector.h" +#import "Firestore/Source/Local/FSTLocalWriteResult.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/FSTDocumentSet.h" +#import "Firestore/Source/Model/FSTMutation.h" +#import "Firestore/Source/Model/FSTMutationBatch.h" +#import "Firestore/Source/Model/FSTPath.h" +#import "Firestore/Source/Remote/FSTRemoteEvent.h" +#import "Firestore/Source/Remote/FSTWatchChange.h" +#import "Firestore/Source/Util/FSTClasses.h" + +#import "Firestore/Example/Tests/Local/FSTLocalStoreTests.h" +#import "Firestore/Example/Tests/Remote/FSTWatchChange+Testing.h" +#import "Firestore/Example/Tests/Util/FSTHelpers.h" +#import "Firestore/third_party/Immutable/Tests/FSTImmutableSortedDictionary+Testing.h" +#import "Firestore/third_party/Immutable/Tests/FSTImmutableSortedSet+Testing.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Example/Tests/Local/FSTMemoryLocalStoreTests.m b/Firestore/Example/Tests/Local/FSTMemoryLocalStoreTests.m index e7486d0..b78239e 100644 --- a/Firestore/Example/Tests/Local/FSTMemoryLocalStoreTests.m +++ b/Firestore/Example/Tests/Local/FSTMemoryLocalStoreTests.m @@ -14,14 +14,14 @@ * limitations under the License. */ -#import "Local/FSTLocalStore.h" +#import "Firestore/Source/Local/FSTLocalStore.h" #import <XCTest/XCTest.h> -#import "Local/FSTMemoryPersistence.h" +#import "Firestore/Source/Local/FSTMemoryPersistence.h" -#import "FSTLocalStoreTests.h" -#import "FSTPersistenceTestHelpers.h" +#import "Firestore/Example/Tests/Local/FSTLocalStoreTests.h" +#import "Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Example/Tests/Local/FSTMemoryMutationQueueTests.m b/Firestore/Example/Tests/Local/FSTMemoryMutationQueueTests.m index 4d76393..ab7afee 100644 --- a/Firestore/Example/Tests/Local/FSTMemoryMutationQueueTests.m +++ b/Firestore/Example/Tests/Local/FSTMemoryMutationQueueTests.m @@ -14,13 +14,13 @@ * limitations under the License. */ -#import "Local/FSTMemoryMutationQueue.h" +#import "Firestore/Source/Local/FSTMemoryMutationQueue.h" -#import "Auth/FSTUser.h" -#import "Local/FSTMemoryPersistence.h" +#import "Firestore/Source/Auth/FSTUser.h" +#import "Firestore/Source/Local/FSTMemoryPersistence.h" -#import "FSTMutationQueueTests.h" -#import "FSTPersistenceTestHelpers.h" +#import "Firestore/Example/Tests/Local/FSTMutationQueueTests.h" +#import "Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.h" @interface FSTMemoryMutationQueueTests : FSTMutationQueueTests @end diff --git a/Firestore/Example/Tests/Local/FSTMemoryQueryCacheTests.m b/Firestore/Example/Tests/Local/FSTMemoryQueryCacheTests.m index 6574647..fb7df6b 100644 --- a/Firestore/Example/Tests/Local/FSTMemoryQueryCacheTests.m +++ b/Firestore/Example/Tests/Local/FSTMemoryQueryCacheTests.m @@ -14,12 +14,12 @@ * limitations under the License. */ -#import "Local/FSTMemoryQueryCache.h" +#import "Firestore/Source/Local/FSTMemoryQueryCache.h" -#import "Local/FSTMemoryPersistence.h" +#import "Firestore/Source/Local/FSTMemoryPersistence.h" -#import "FSTPersistenceTestHelpers.h" -#import "FSTQueryCacheTests.h" +#import "Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.h" +#import "Firestore/Example/Tests/Local/FSTQueryCacheTests.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Example/Tests/Local/FSTMemoryRemoteDocumentCacheTests.m b/Firestore/Example/Tests/Local/FSTMemoryRemoteDocumentCacheTests.m index 7602134..162eef0 100644 --- a/Firestore/Example/Tests/Local/FSTMemoryRemoteDocumentCacheTests.m +++ b/Firestore/Example/Tests/Local/FSTMemoryRemoteDocumentCacheTests.m @@ -14,12 +14,12 @@ * limitations under the License. */ -#import "Local/FSTMemoryRemoteDocumentCache.h" +#import "Firestore/Source/Local/FSTMemoryRemoteDocumentCache.h" -#import "Local/FSTMemoryPersistence.h" +#import "Firestore/Source/Local/FSTMemoryPersistence.h" -#import "FSTPersistenceTestHelpers.h" -#import "FSTRemoteDocumentCacheTests.h" +#import "Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.h" +#import "Firestore/Example/Tests/Local/FSTRemoteDocumentCacheTests.h" @interface FSTMemoryRemoteDocumentCacheTests : FSTRemoteDocumentCacheTests @end diff --git a/Firestore/Example/Tests/Local/FSTMutationQueueTests.m b/Firestore/Example/Tests/Local/FSTMutationQueueTests.m index 42ba0b3..f168ac9 100644 --- a/Firestore/Example/Tests/Local/FSTMutationQueueTests.m +++ b/Firestore/Example/Tests/Local/FSTMutationQueueTests.m @@ -14,19 +14,19 @@ * limitations under the License. */ -#import "FSTMutationQueueTests.h" - -#import "Auth/FSTUser.h" -#import "Core/FSTQuery.h" -#import "Core/FSTTimestamp.h" -#import "Local/FSTEagerGarbageCollector.h" -#import "Local/FSTMutationQueue.h" -#import "Local/FSTPersistence.h" -#import "Local/FSTWriteGroup.h" -#import "Model/FSTMutation.h" -#import "Model/FSTMutationBatch.h" - -#import "FSTHelpers.h" +#import "Firestore/Example/Tests/Local/FSTMutationQueueTests.h" + +#import "Firestore/Source/Auth/FSTUser.h" +#import "Firestore/Source/Core/FSTQuery.h" +#import "Firestore/Source/Core/FSTTimestamp.h" +#import "Firestore/Source/Local/FSTEagerGarbageCollector.h" +#import "Firestore/Source/Local/FSTMutationQueue.h" +#import "Firestore/Source/Local/FSTPersistence.h" +#import "Firestore/Source/Local/FSTWriteGroup.h" +#import "Firestore/Source/Model/FSTMutation.h" +#import "Firestore/Source/Model/FSTMutationBatch.h" + +#import "Firestore/Example/Tests/Util/FSTHelpers.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.m b/Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.m index f3d7914..c773b12 100644 --- a/Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.m +++ b/Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.m @@ -14,13 +14,13 @@ * limitations under the License. */ -#import "FSTPersistenceTestHelpers.h" +#import "Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.h" -#import "Local/FSTLevelDB.h" -#import "Local/FSTLocalSerializer.h" -#import "Local/FSTMemoryPersistence.h" -#import "Model/FSTDatabaseID.h" -#import "Remote/FSTSerializerBeta.h" +#import "Firestore/Source/Local/FSTLevelDB.h" +#import "Firestore/Source/Local/FSTLocalSerializer.h" +#import "Firestore/Source/Local/FSTMemoryPersistence.h" +#import "Firestore/Source/Model/FSTDatabaseID.h" +#import "Firestore/Source/Remote/FSTSerializerBeta.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Example/Tests/Local/FSTQueryCacheTests.h b/Firestore/Example/Tests/Local/FSTQueryCacheTests.h index a615372..e2089af 100644 --- a/Firestore/Example/Tests/Local/FSTQueryCacheTests.h +++ b/Firestore/Example/Tests/Local/FSTQueryCacheTests.h @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "Local/FSTQueryCache.h" +#import "Firestore/Source/Local/FSTQueryCache.h" #import <XCTest/XCTest.h> diff --git a/Firestore/Example/Tests/Local/FSTQueryCacheTests.m b/Firestore/Example/Tests/Local/FSTQueryCacheTests.m index ed409b4..1fed440 100644 --- a/Firestore/Example/Tests/Local/FSTQueryCacheTests.m +++ b/Firestore/Example/Tests/Local/FSTQueryCacheTests.m @@ -14,18 +14,18 @@ * limitations under the License. */ -#import "FSTQueryCacheTests.h" - -#import "Core/FSTQuery.h" -#import "Core/FSTSnapshotVersion.h" -#import "Local/FSTEagerGarbageCollector.h" -#import "Local/FSTPersistence.h" -#import "Local/FSTQueryData.h" -#import "Local/FSTWriteGroup.h" -#import "Model/FSTDocumentKey.h" - -#import "FSTHelpers.h" -#import "FSTImmutableSortedSet+Testing.h" +#import "Firestore/Example/Tests/Local/FSTQueryCacheTests.h" + +#import "Firestore/Source/Core/FSTQuery.h" +#import "Firestore/Source/Core/FSTSnapshotVersion.h" +#import "Firestore/Source/Local/FSTEagerGarbageCollector.h" +#import "Firestore/Source/Local/FSTPersistence.h" +#import "Firestore/Source/Local/FSTQueryData.h" +#import "Firestore/Source/Local/FSTWriteGroup.h" +#import "Firestore/Source/Model/FSTDocumentKey.h" + +#import "Firestore/Example/Tests/Util/FSTHelpers.h" +#import "Firestore/third_party/Immutable/Tests/FSTImmutableSortedSet+Testing.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Example/Tests/Local/FSTReferenceSetTests.m b/Firestore/Example/Tests/Local/FSTReferenceSetTests.m index a8c783a..0b852a2 100644 --- a/Firestore/Example/Tests/Local/FSTReferenceSetTests.m +++ b/Firestore/Example/Tests/Local/FSTReferenceSetTests.m @@ -14,11 +14,11 @@ * limitations under the License. */ -#import "Local/FSTReferenceSet.h" +#import "Firestore/Source/Local/FSTReferenceSet.h" #import <XCTest/XCTest.h> -#import "Model/FSTDocumentKey.h" +#import "Firestore/Source/Model/FSTDocumentKey.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Example/Tests/Local/FSTRemoteDocumentCacheTests.h b/Firestore/Example/Tests/Local/FSTRemoteDocumentCacheTests.h index fa2a857..29e7b86 100644 --- a/Firestore/Example/Tests/Local/FSTRemoteDocumentCacheTests.h +++ b/Firestore/Example/Tests/Local/FSTRemoteDocumentCacheTests.h @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "Local/FSTRemoteDocumentCache.h" +#import "Firestore/Source/Local/FSTRemoteDocumentCache.h" #import <XCTest/XCTest.h> diff --git a/Firestore/Example/Tests/Local/FSTRemoteDocumentCacheTests.m b/Firestore/Example/Tests/Local/FSTRemoteDocumentCacheTests.m index a875934..e6ec699 100644 --- a/Firestore/Example/Tests/Local/FSTRemoteDocumentCacheTests.m +++ b/Firestore/Example/Tests/Local/FSTRemoteDocumentCacheTests.m @@ -14,16 +14,16 @@ * limitations under the License. */ -#import "FSTRemoteDocumentCacheTests.h" +#import "Firestore/Example/Tests/Local/FSTRemoteDocumentCacheTests.h" -#import "Core/FSTQuery.h" -#import "Local/FSTPersistence.h" -#import "Local/FSTWriteGroup.h" -#import "Model/FSTDocument.h" -#import "Model/FSTDocumentKey.h" -#import "Model/FSTDocumentSet.h" +#import "Firestore/Source/Core/FSTQuery.h" +#import "Firestore/Source/Local/FSTPersistence.h" +#import "Firestore/Source/Local/FSTWriteGroup.h" +#import "Firestore/Source/Model/FSTDocument.h" +#import "Firestore/Source/Model/FSTDocumentKey.h" +#import "Firestore/Source/Model/FSTDocumentSet.h" -#import "FSTHelpers.h" +#import "Firestore/Example/Tests/Util/FSTHelpers.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Example/Tests/Local/FSTRemoteDocumentChangeBufferTests.m b/Firestore/Example/Tests/Local/FSTRemoteDocumentChangeBufferTests.m index ebf7713..1970779 100644 --- a/Firestore/Example/Tests/Local/FSTRemoteDocumentChangeBufferTests.m +++ b/Firestore/Example/Tests/Local/FSTRemoteDocumentChangeBufferTests.m @@ -14,16 +14,16 @@ * limitations under the License. */ -#import "Local/FSTRemoteDocumentChangeBuffer.h" +#import "Firestore/Source/Local/FSTRemoteDocumentChangeBuffer.h" #import <XCTest/XCTest.h> -#import "Local/FSTLevelDB.h" -#import "Local/FSTRemoteDocumentCache.h" -#import "Model/FSTDocument.h" +#import "Firestore/Source/Local/FSTLevelDB.h" +#import "Firestore/Source/Local/FSTRemoteDocumentCache.h" +#import "Firestore/Source/Model/FSTDocument.h" -#import "FSTHelpers.h" -#import "FSTPersistenceTestHelpers.h" +#import "Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.h" +#import "Firestore/Example/Tests/Util/FSTHelpers.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Example/Tests/Local/FSTWriteGroupTests.mm b/Firestore/Example/Tests/Local/FSTWriteGroupTests.mm index b829ccf..edd05a3 100644 --- a/Firestore/Example/Tests/Local/FSTWriteGroupTests.mm +++ b/Firestore/Example/Tests/Local/FSTWriteGroupTests.mm @@ -14,16 +14,16 @@ * limitations under the License. */ -#import "Local/FSTWriteGroup.h" +#import "Firestore/Source/Local/FSTWriteGroup.h" #import <XCTest/XCTest.h> #include <leveldb/db.h> -#import "Local/FSTLevelDB.h" -#import "Local/FSTLevelDBKey.h" -#import "Protos/objc/firestore/local/Mutation.pbobjc.h" +#import "Firestore/Protos/objc/firestore/local/Mutation.pbobjc.h" +#import "Firestore/Source/Local/FSTLevelDB.h" +#import "Firestore/Source/Local/FSTLevelDBKey.h" -#import "FSTPersistenceTestHelpers.h" +#import "Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.h" using leveldb::ReadOptions; using leveldb::Status; diff --git a/Firestore/Example/Tests/Model/FSTDatabaseIDTests.m b/Firestore/Example/Tests/Model/FSTDatabaseIDTests.m index 9e7299f..cb1b19d 100644 --- a/Firestore/Example/Tests/Model/FSTDatabaseIDTests.m +++ b/Firestore/Example/Tests/Model/FSTDatabaseIDTests.m @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "Model/FSTDatabaseID.h" +#import "Firestore/Source/Model/FSTDatabaseID.h" #import <XCTest/XCTest.h> diff --git a/Firestore/Example/Tests/Model/FSTDocumentKeyTests.m b/Firestore/Example/Tests/Model/FSTDocumentKeyTests.m index ba68009..d66ee73 100644 --- a/Firestore/Example/Tests/Model/FSTDocumentKeyTests.m +++ b/Firestore/Example/Tests/Model/FSTDocumentKeyTests.m @@ -14,11 +14,11 @@ * limitations under the License. */ -#import "Model/FSTDocumentKey.h" +#import "Firestore/Source/Model/FSTDocumentKey.h" #import <XCTest/XCTest.h> -#import "Model/FSTPath.h" +#import "Firestore/Source/Model/FSTPath.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Example/Tests/Model/FSTDocumentSetTests.m b/Firestore/Example/Tests/Model/FSTDocumentSetTests.m index e473088..bf6cd21 100644 --- a/Firestore/Example/Tests/Model/FSTDocumentSetTests.m +++ b/Firestore/Example/Tests/Model/FSTDocumentSetTests.m @@ -14,13 +14,13 @@ * limitations under the License. */ -#import "Model/FSTDocumentSet.h" +#import "Firestore/Source/Model/FSTDocumentSet.h" #import <XCTest/XCTest.h> -#import "Model/FSTDocument.h" +#import "Firestore/Source/Model/FSTDocument.h" -#import "FSTHelpers.h" +#import "Firestore/Example/Tests/Util/FSTHelpers.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Example/Tests/Model/FSTDocumentTests.m b/Firestore/Example/Tests/Model/FSTDocumentTests.m index 9ceb0cd..e56ab34 100644 --- a/Firestore/Example/Tests/Model/FSTDocumentTests.m +++ b/Firestore/Example/Tests/Model/FSTDocumentTests.m @@ -14,16 +14,16 @@ * limitations under the License. */ -#import "Model/FSTDocument.h" +#import "Firestore/Source/Model/FSTDocument.h" #import <XCTest/XCTest.h> -#import "Core/FSTSnapshotVersion.h" -#import "Model/FSTDocumentKey.h" -#import "Model/FSTFieldValue.h" -#import "Model/FSTPath.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 "FSTHelpers.h" +#import "Firestore/Example/Tests/Util/FSTHelpers.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Example/Tests/Model/FSTFieldValueTests.m b/Firestore/Example/Tests/Model/FSTFieldValueTests.m index a357e60..744bcc4 100644 --- a/Firestore/Example/Tests/Model/FSTFieldValueTests.m +++ b/Firestore/Example/Tests/Model/FSTFieldValueTests.m @@ -14,19 +14,19 @@ * limitations under the License. */ -#import "Model/FSTFieldValue.h" +#import "Firestore/Source/Model/FSTFieldValue.h" #import <XCTest/XCTest.h> -#import "API/FIRFirestore+Internal.h" -#import "API/FSTUserDataConverter.h" -#import "Core/FSTTimestamp.h" #import "Firestore/FIRGeoPoint.h" -#import "Model/FSTDatabaseID.h" -#import "Model/FSTFieldValue.h" -#import "Model/FSTPath.h" - -#import "FSTHelpers.h" +#import "Firestore/Source/API/FIRFirestore+Internal.h" +#import "Firestore/Source/API/FSTUserDataConverter.h" +#import "Firestore/Source/Core/FSTTimestamp.h" +#import "Firestore/Source/Model/FSTDatabaseID.h" +#import "Firestore/Source/Model/FSTFieldValue.h" +#import "Firestore/Source/Model/FSTPath.h" + +#import "Firestore/Example/Tests/Util/FSTHelpers.h" /** Helper to wrap the values in a set of equality groups using FSTTestFieldValue(). */ NSArray *FSTWrapGroups(NSArray *groups) { diff --git a/Firestore/Example/Tests/Model/FSTMutationTests.m b/Firestore/Example/Tests/Model/FSTMutationTests.m index 5ad9f94..678755e 100644 --- a/Firestore/Example/Tests/Model/FSTMutationTests.m +++ b/Firestore/Example/Tests/Model/FSTMutationTests.m @@ -14,17 +14,17 @@ * limitations under the License. */ -#import "Model/FSTMutation.h" +#import "Firestore/Source/Model/FSTMutation.h" #import <XCTest/XCTest.h> -#import "Core/FSTTimestamp.h" -#import "Model/FSTDocument.h" -#import "Model/FSTDocumentKey.h" -#import "Model/FSTFieldValue.h" -#import "Model/FSTPath.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 "FSTHelpers.h" +#import "Firestore/Example/Tests/Util/FSTHelpers.h" @interface FSTMutationTests : XCTestCase @end diff --git a/Firestore/Example/Tests/Model/FSTPathTests.m b/Firestore/Example/Tests/Model/FSTPathTests.m index a5d3d80..b8529e5 100644 --- a/Firestore/Example/Tests/Model/FSTPathTests.m +++ b/Firestore/Example/Tests/Model/FSTPathTests.m @@ -14,8 +14,8 @@ * limitations under the License. */ -#import "FSTHelpers.h" -#import "Model/FSTPath.h" +#import "Firestore/Example/Tests/Util/FSTHelpers.h" +#import "Firestore/Source/Model/FSTPath.h" #import <XCTest/XCTest.h> diff --git a/Firestore/Example/Tests/Remote/FSTDatastoreTests.m b/Firestore/Example/Tests/Remote/FSTDatastoreTests.m index 511de72..8c1c16f 100644 --- a/Firestore/Example/Tests/Remote/FSTDatastoreTests.m +++ b/Firestore/Example/Tests/Remote/FSTDatastoreTests.m @@ -15,7 +15,7 @@ */ #import "Firestore/FIRFirestoreErrors.h" -#import "Remote/FSTDatastore.h" +#import "Firestore/Source/Remote/FSTDatastore.h" #import <GRPCClient/GRPCCall.h> #import <XCTest/XCTest.h> diff --git a/Firestore/Example/Tests/Remote/FSTRemoteEventTests.m b/Firestore/Example/Tests/Remote/FSTRemoteEventTests.m index a172af7..a947eb4 100644 --- a/Firestore/Example/Tests/Remote/FSTRemoteEventTests.m +++ b/Firestore/Example/Tests/Remote/FSTRemoteEventTests.m @@ -14,18 +14,18 @@ * limitations under the License. */ -#import "Remote/FSTRemoteEvent.h" +#import "Firestore/Source/Remote/FSTRemoteEvent.h" #import <XCTest/XCTest.h> -#import "Local/FSTQueryData.h" -#import "Model/FSTDocument.h" -#import "Model/FSTDocumentKey.h" -#import "Remote/FSTExistenceFilter.h" -#import "Remote/FSTWatchChange.h" +#import "Firestore/Source/Local/FSTQueryData.h" +#import "Firestore/Source/Model/FSTDocument.h" +#import "Firestore/Source/Model/FSTDocumentKey.h" +#import "Firestore/Source/Remote/FSTExistenceFilter.h" +#import "Firestore/Source/Remote/FSTWatchChange.h" -#import "FSTHelpers.h" -#import "FSTWatchChange+Testing.h" +#import "Firestore/Example/Tests/Remote/FSTWatchChange+Testing.h" +#import "Firestore/Example/Tests/Util/FSTHelpers.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Example/Tests/Remote/FSTSerializerBetaTests.m b/Firestore/Example/Tests/Remote/FSTSerializerBetaTests.m index c4cf9df..54aa955 100644 --- a/Firestore/Example/Tests/Remote/FSTSerializerBetaTests.m +++ b/Firestore/Example/Tests/Remote/FSTSerializerBetaTests.m @@ -14,37 +14,37 @@ * limitations under the License. */ -#import "Remote/FSTSerializerBeta.h" +#import "Firestore/Source/Remote/FSTSerializerBeta.h" #import <GRPCClient/GRPCCall.h> #import <XCTest/XCTest.h> -#import "Core/FSTQuery.h" -#import "Core/FSTSnapshotVersion.h" -#import "Core/FSTTimestamp.h" #import "Firestore/FIRFieldPath.h" #import "Firestore/FIRFirestoreErrors.h" #import "Firestore/FIRGeoPoint.h" -#import "Local/FSTQueryData.h" -#import "Model/FSTDatabaseID.h" -#import "Model/FSTDocument.h" -#import "Model/FSTDocumentKey.h" -#import "Model/FSTFieldValue.h" -#import "Model/FSTMutation.h" -#import "Model/FSTMutationBatch.h" -#import "Model/FSTPath.h" -#import "Protos/objc/firestore/local/MaybeDocument.pbobjc.h" -#import "Protos/objc/firestore/local/Mutation.pbobjc.h" -#import "Protos/objc/google/firestore/v1beta1/Common.pbobjc.h" -#import "Protos/objc/google/firestore/v1beta1/Document.pbobjc.h" -#import "Protos/objc/google/firestore/v1beta1/Firestore.pbobjc.h" -#import "Protos/objc/google/firestore/v1beta1/Query.pbobjc.h" -#import "Protos/objc/google/firestore/v1beta1/Write.pbobjc.h" -#import "Protos/objc/google/rpc/Status.pbobjc.h" -#import "Protos/objc/google/type/Latlng.pbobjc.h" -#import "Remote/FSTWatchChange.h" - -#import "FSTHelpers.h" +#import "Firestore/Protos/objc/firestore/local/MaybeDocument.pbobjc.h" +#import "Firestore/Protos/objc/firestore/local/Mutation.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 "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/FSTWatchChange.h" + +#import "Firestore/Example/Tests/Util/FSTHelpers.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Example/Tests/Remote/FSTWatchChange+Testing.h b/Firestore/Example/Tests/Remote/FSTWatchChange+Testing.h index f94fe05..73d8e34 100644 --- a/Firestore/Example/Tests/Remote/FSTWatchChange+Testing.h +++ b/Firestore/Example/Tests/Remote/FSTWatchChange+Testing.h @@ -16,8 +16,8 @@ #import <Foundation/Foundation.h> -#import "Core/FSTTypes.h" -#import "Remote/FSTWatchChange.h" +#import "Firestore/Source/Core/FSTTypes.h" +#import "Firestore/Source/Remote/FSTWatchChange.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Example/Tests/Remote/FSTWatchChange+Testing.m b/Firestore/Example/Tests/Remote/FSTWatchChange+Testing.m index cb5e479..6bb314d 100644 --- a/Firestore/Example/Tests/Remote/FSTWatchChange+Testing.m +++ b/Firestore/Example/Tests/Remote/FSTWatchChange+Testing.m @@ -14,10 +14,10 @@ * limitations under the License. */ -#import "FSTWatchChange+Testing.h" +#import "Firestore/Example/Tests/Remote/FSTWatchChange+Testing.h" -#import "Model/FSTDocument.h" -#import "Remote/FSTWatchChange.h" +#import "Firestore/Source/Model/FSTDocument.h" +#import "Firestore/Source/Remote/FSTWatchChange.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Example/Tests/Remote/FSTWatchChangeTests.m b/Firestore/Example/Tests/Remote/FSTWatchChangeTests.m index ccbd644..df2496b 100644 --- a/Firestore/Example/Tests/Remote/FSTWatchChangeTests.m +++ b/Firestore/Example/Tests/Remote/FSTWatchChangeTests.m @@ -14,15 +14,15 @@ * limitations under the License. */ -#import "Remote/FSTWatchChange.h" +#import "Firestore/Source/Remote/FSTWatchChange.h" #import <XCTest/XCTest.h> -#import "Model/FSTDocument.h" -#import "Remote/FSTExistenceFilter.h" +#import "Firestore/Source/Model/FSTDocument.h" +#import "Firestore/Source/Remote/FSTExistenceFilter.h" -#import "FSTHelpers.h" -#import "FSTWatchChange+Testing.h" +#import "Firestore/Example/Tests/Remote/FSTWatchChange+Testing.h" +#import "Firestore/Example/Tests/Util/FSTHelpers.h" NS_ASSUME_NONNULL_BEGIN 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 diff --git a/Firestore/Example/Tests/Util/FSTAssertTests.m b/Firestore/Example/Tests/Util/FSTAssertTests.m index f0734df..0cba03f 100644 --- a/Firestore/Example/Tests/Util/FSTAssertTests.m +++ b/Firestore/Example/Tests/Util/FSTAssertTests.m @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "Util/FSTAssert.h" +#import "Firestore/Source/Util/FSTAssert.h" #import <XCTest/XCTest.h> diff --git a/Firestore/Example/Tests/Util/FSTComparisonTests.m b/Firestore/Example/Tests/Util/FSTComparisonTests.m index 9728f20..5632e64 100644 --- a/Firestore/Example/Tests/Util/FSTComparisonTests.m +++ b/Firestore/Example/Tests/Util/FSTComparisonTests.m @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "Util/FSTComparison.h" +#import "Firestore/Source/Util/FSTComparison.h" #import <XCTest/XCTest.h> diff --git a/Firestore/Example/Tests/Util/FSTEventAccumulator.m b/Firestore/Example/Tests/Util/FSTEventAccumulator.m index c7e5b41..b44ec67 100644 --- a/Firestore/Example/Tests/Util/FSTEventAccumulator.m +++ b/Firestore/Example/Tests/Util/FSTEventAccumulator.m @@ -14,13 +14,13 @@ * limitations under the License. */ -#import "FSTEventAccumulator.h" +#import "Firestore/Example/Tests/Util/FSTEventAccumulator.h" #import <XCTest/XCTest.h> -#import "Util/FSTAssert.h" +#import "Firestore/Source/Util/FSTAssert.h" -#import "XCTestCase+Await.h" +#import "Firestore/Example/Tests/Util/XCTestCase+Await.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Example/Tests/Util/FSTHelpers.h b/Firestore/Example/Tests/Util/FSTHelpers.h index 3facc9c..91ccbcf 100644 --- a/Firestore/Example/Tests/Util/FSTHelpers.h +++ b/Firestore/Example/Tests/Util/FSTHelpers.h @@ -16,10 +16,10 @@ #import <Foundation/Foundation.h> -#import "API/FIRDocumentReference+Internal.h" -#import "Core/FSTTypes.h" -#import "Model/FSTDocumentDictionary.h" -#import "Model/FSTDocumentKeySet.h" +#import "Firestore/Source/API/FIRDocumentReference+Internal.h" +#import "Firestore/Source/Core/FSTTypes.h" +#import "Firestore/Source/Model/FSTDocumentDictionary.h" +#import "Firestore/Source/Model/FSTDocumentKeySet.h" @class FIRGeoPoint; @class FSTDeleteMutation; diff --git a/Firestore/Example/Tests/Util/FSTHelpers.m b/Firestore/Example/Tests/Util/FSTHelpers.m index 3b7f47f..7b24649 100644 --- a/Firestore/Example/Tests/Util/FSTHelpers.m +++ b/Firestore/Example/Tests/Util/FSTHelpers.m @@ -14,28 +14,28 @@ * limitations under the License. */ -#import "FSTHelpers.h" - -#import "API/FIRFieldPath+Internal.h" -#import "API/FSTUserDataConverter.h" -#import "Core/FSTQuery.h" -#import "Core/FSTSnapshotVersion.h" -#import "Core/FSTTimestamp.h" -#import "Core/FSTView.h" +#import "Firestore/Example/Tests/Util/FSTHelpers.h" + #import "Firestore/FIRFieldPath.h" #import "Firestore/FIRGeoPoint.h" -#import "Local/FSTLocalViewChanges.h" -#import "Local/FSTQueryData.h" -#import "Model/FSTDatabaseID.h" -#import "Model/FSTDocument.h" -#import "Model/FSTDocumentKey.h" -#import "Model/FSTDocumentSet.h" -#import "Model/FSTFieldValue.h" -#import "Model/FSTMutation.h" -#import "Model/FSTPath.h" -#import "Remote/FSTRemoteEvent.h" -#import "Remote/FSTWatchChange.h" -#import "Util/FSTAssert.h" +#import "Firestore/Source/API/FIRFieldPath+Internal.h" +#import "Firestore/Source/API/FSTUserDataConverter.h" +#import "Firestore/Source/Core/FSTQuery.h" +#import "Firestore/Source/Core/FSTSnapshotVersion.h" +#import "Firestore/Source/Core/FSTTimestamp.h" +#import "Firestore/Source/Core/FSTView.h" +#import "Firestore/Source/Local/FSTLocalViewChanges.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/FSTDocumentSet.h" +#import "Firestore/Source/Model/FSTFieldValue.h" +#import "Firestore/Source/Model/FSTMutation.h" +#import "Firestore/Source/Model/FSTPath.h" +#import "Firestore/Source/Remote/FSTRemoteEvent.h" +#import "Firestore/Source/Remote/FSTWatchChange.h" +#import "Firestore/Source/Util/FSTAssert.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Example/Tests/Util/FSTIntegrationTestCase.h b/Firestore/Example/Tests/Util/FSTIntegrationTestCase.h index 1170080..88f9346 100644 --- a/Firestore/Example/Tests/Util/FSTIntegrationTestCase.h +++ b/Firestore/Example/Tests/Util/FSTIntegrationTestCase.h @@ -17,7 +17,7 @@ #import <Foundation/Foundation.h> #import <XCTest/XCTest.h> -#import "XCTestCase+Await.h" +#import "Firestore/Example/Tests/Util/XCTestCase+Await.h" @class FIRCollectionReference; @class FIRDocumentSnapshot; diff --git a/Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm b/Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm index 4bfdb41..187eb60 100644 --- a/Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm +++ b/Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm @@ -14,22 +14,22 @@ * limitations under the License. */ -#import "FSTIntegrationTestCase.h" +#import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h" #import <FirebaseCommunity/FIRLogger.h> #import <Firestore/Firestore-umbrella.h> #import <GRPCClient/GRPCCall+ChannelArg.h> #import <GRPCClient/GRPCCall+Tests.h> -#import "API/FIRFirestore+Internal.h" -#import "Auth/FSTEmptyCredentialsProvider.h" -#import "Local/FSTLevelDB.h" -#import "Model/FSTDatabaseID.h" -#import "Util/FSTDispatchQueue.h" -#import "Util/FSTUtil.h" +#import "Firestore/Source/API/FIRFirestore+Internal.h" +#import "Firestore/Source/Auth/FSTEmptyCredentialsProvider.h" +#import "Firestore/Source/Local/FSTLevelDB.h" +#import "Firestore/Source/Model/FSTDatabaseID.h" +#import "Firestore/Source/Util/FSTDispatchQueue.h" +#import "Firestore/Source/Util/FSTUtil.h" -#import "FSTEventAccumulator.h" -#import "FSTTestDispatchQueue.h" +#import "Firestore/Example/Tests/Util/FSTEventAccumulator.h" +#import "Firestore/Example/Tests/Util/FSTTestDispatchQueue.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Example/Tests/Util/FSTTestDispatchQueue.h b/Firestore/Example/Tests/Util/FSTTestDispatchQueue.h index 4f4e13e..7ecbbaf 100644 --- a/Firestore/Example/Tests/Util/FSTTestDispatchQueue.h +++ b/Firestore/Example/Tests/Util/FSTTestDispatchQueue.h @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "Util/FSTDispatchQueue.h" +#import "Firestore/Source/Util/FSTDispatchQueue.h" @class XCTestExpectation; diff --git a/Firestore/Example/Tests/Util/FSTTestDispatchQueue.m b/Firestore/Example/Tests/Util/FSTTestDispatchQueue.m index 27b62bc..8124cf2 100644 --- a/Firestore/Example/Tests/Util/FSTTestDispatchQueue.m +++ b/Firestore/Example/Tests/Util/FSTTestDispatchQueue.m @@ -14,11 +14,11 @@ * limitations under the License. */ -#import "FSTTestDispatchQueue.h" +#import "Firestore/Example/Tests/Util/FSTTestDispatchQueue.h" #import <XCTest/XCTestExpectation.h> -#import "Util/FSTAssert.h" +#import "Firestore/Source/Util/FSTAssert.h" @interface FSTTestDispatchQueue () diff --git a/Firestore/Example/Tests/Util/FSTUtilTests.m b/Firestore/Example/Tests/Util/FSTUtilTests.m index 998832d..d59ed7a 100644 --- a/Firestore/Example/Tests/Util/FSTUtilTests.m +++ b/Firestore/Example/Tests/Util/FSTUtilTests.m @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "Util/FSTUtil.h" +#import "Firestore/Source/Util/FSTUtil.h" #import <XCTest/XCTest.h> diff --git a/Firestore/Example/Tests/Util/XCTestCase+Await.m b/Firestore/Example/Tests/Util/XCTestCase+Await.m index e200c8c..15c67ca 100644 --- a/Firestore/Example/Tests/Util/XCTestCase+Await.m +++ b/Firestore/Example/Tests/Util/XCTestCase+Await.m @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "XCTestCase+Await.h" +#import "Firestore/Example/Tests/Util/XCTestCase+Await.h" #import <Foundation/Foundation.h> diff --git a/Firestore/Firestore.podspec b/Firestore/Firestore.podspec index 32aae55..56683f1 100644 --- a/Firestore/Firestore.podspec +++ b/Firestore/Firestore.podspec @@ -51,6 +51,7 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling, s.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1 ', + 'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"/..', 'OTHER_CFLAGS' => '-DFIRFirestore_VERSION=' + s.version.to_s } end diff --git a/Firestore/Port/absl/absl_endian.h b/Firestore/Port/absl/absl_endian.h index 3b3cf3c..2c51a27 100644 --- a/Firestore/Port/absl/absl_endian.h +++ b/Firestore/Port/absl/absl_endian.h @@ -28,7 +28,7 @@ #endif #include <cstdint> -#include "absl_port.h" +#include "Firestore/Port/absl/absl_port.h" namespace absl { diff --git a/Firestore/Port/absl/absl_port.h b/Firestore/Port/absl/absl_port.h index 3a123a2..eee21fc 100644 --- a/Firestore/Port/absl/absl_port.h +++ b/Firestore/Port/absl/absl_port.h @@ -41,9 +41,9 @@ #include <stdlib.h> // for free() #include <string.h> // for memcpy() -#include "absl_attributes.h" -#include "absl_config.h" -#include "absl_integral_types.h" +#include "Firestore/Port/absl/absl_attributes.h" +#include "Firestore/Port/absl/absl_config.h" +#include "Firestore/Port/absl/absl_integral_types.h" #ifdef SWIG %include "attributes.h" diff --git a/Firestore/Port/bits.cc b/Firestore/Port/bits.cc index 40af964..3e61223 100644 --- a/Firestore/Port/bits.cc +++ b/Firestore/Port/bits.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "bits.h" +#include "Firestore/Port/bits.h" #include <assert.h> diff --git a/Firestore/Port/bits_test.cc b/Firestore/Port/bits_test.cc index 18c3b1d..8c3c246 100644 --- a/Firestore/Port/bits_test.cc +++ b/Firestore/Port/bits_test.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "bits.h" +#include "Firestore/Port/bits.h" #include <iostream> diff --git a/Firestore/Port/ordered_code.cc b/Firestore/Port/ordered_code.cc index ec5733c..038d445 100644 --- a/Firestore/Port/ordered_code.cc +++ b/Firestore/Port/ordered_code.cc @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "ordered_code.h" +#include "Firestore/Port/ordered_code.h" #include <assert.h> -#include "bits.h" +#include "Firestore/Port/bits.h" -#include "absl_endian.h" -#include "absl_port.h" +#include "Firestore/Port/absl/absl_endian.h" +#include "Firestore/Port/absl/absl_port.h" #include <leveldb/db.h> // For Slice // We encode a string in different ways depending on whether the item diff --git a/Firestore/Port/ordered_code_test.cc b/Firestore/Port/ordered_code_test.cc index 21b0bd1..0a339fc 100644 --- a/Firestore/Port/ordered_code_test.cc +++ b/Firestore/Port/ordered_code_test.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "ordered_code.h" +#include "Firestore/Port/ordered_code.h" // #include <float.h> // #include <stddef.h> diff --git a/Firestore/Port/string_util.cc b/Firestore/Port/string_util.cc index 5e87fff..2587860 100644 --- a/Firestore/Port/string_util.cc +++ b/Firestore/Port/string_util.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "string_util.h" +#include "Firestore/Port/string_util.h" #include <leveldb/db.h> diff --git a/Firestore/Port/string_util_test.cc b/Firestore/Port/string_util_test.cc index bac1de3..ac8ce56 100644 --- a/Firestore/Port/string_util_test.cc +++ b/Firestore/Port/string_util_test.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "string_util.h" +#include "Firestore/Port/string_util.h" #include "leveldb/db.h" diff --git a/Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbrpc.h b/Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbrpc.h index 5704c2b..d7f127b 100644 --- a/Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbrpc.h +++ b/Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbrpc.h @@ -14,18 +14,18 @@ * limitations under the License. */ -#import "Firestore.pbobjc.h" +#import "Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbobjc.h" #import <ProtoRPC/ProtoService.h> #import <ProtoRPC/ProtoRPC.h> #import <RxLibrary/GRXWriteable.h> #import <RxLibrary/GRXWriter.h> -#import "Annotations.pbobjc.h" -#import "Common.pbobjc.h" -#import "Document.pbobjc.h" -#import "Query.pbobjc.h" -#import "Write.pbobjc.h" +#import "Firestore/Protos/objc/google/api/Annotations.pbobjc.h" +#import "Firestore/Protos/objc/google/firestore/v1beta1/Common.pbobjc.h" +#import "Firestore/Protos/objc/google/firestore/v1beta1/Document.pbobjc.h" +#import "Firestore/Protos/objc/google/firestore/v1beta1/Query.pbobjc.h" +#import "Firestore/Protos/objc/google/firestore/v1beta1/Write.pbobjc.h" #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS #import <Protobuf/Empty.pbobjc.h> #else @@ -36,7 +36,7 @@ #else #import "Timestamp.pbobjc.h" #endif -#import "Status.pbobjc.h" +#import "Firestore/Protos/objc/google/rpc/Status.pbobjc.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbrpc.m b/Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbrpc.m index a3e338d..eec4c9a 100644 --- a/Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbrpc.m +++ b/Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbrpc.m @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "Firestore.pbrpc.h" +#import "Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbrpc.h" #import <ProtoRPC/ProtoRPC.h> #import <RxLibrary/GRXWriter+Immediate.h> 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 diff --git a/Firestore/third_party/Immutable/FSTArraySortedDictionary.h b/Firestore/third_party/Immutable/FSTArraySortedDictionary.h index 4b78360..0fd7b44 100644 --- a/Firestore/third_party/Immutable/FSTArraySortedDictionary.h +++ b/Firestore/third_party/Immutable/FSTArraySortedDictionary.h @@ -1,6 +1,6 @@ #import <Foundation/Foundation.h> -#import "FSTImmutableSortedDictionary.h" +#import "Firestore/third_party/Immutable/FSTImmutableSortedDictionary.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/third_party/Immutable/FSTArraySortedDictionary.m b/Firestore/third_party/Immutable/FSTArraySortedDictionary.m index fd3bfd7..ad1d68a 100644 --- a/Firestore/third_party/Immutable/FSTArraySortedDictionary.m +++ b/Firestore/third_party/Immutable/FSTArraySortedDictionary.m @@ -1,8 +1,8 @@ -#import "FSTArraySortedDictionary.h" +#import "Firestore/third_party/Immutable/FSTArraySortedDictionary.h" -#import "FSTArraySortedDictionaryEnumerator.h" -#import "FSTAssert.h" -#import "FSTTreeSortedDictionary.h" +#import "Firestore/third_party/Immutable/FSTArraySortedDictionaryEnumerator.h" +#import "Firestore/Source/Util/FSTAssert.h" +#import "Firestore/third_party/Immutable/FSTTreeSortedDictionary.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/third_party/Immutable/FSTArraySortedDictionaryEnumerator.m b/Firestore/third_party/Immutable/FSTArraySortedDictionaryEnumerator.m index e8fdfcc..9039f96 100644 --- a/Firestore/third_party/Immutable/FSTArraySortedDictionaryEnumerator.m +++ b/Firestore/third_party/Immutable/FSTArraySortedDictionaryEnumerator.m @@ -1,4 +1,4 @@ -#import "FSTArraySortedDictionaryEnumerator.h" +#import "Firestore/third_party/Immutable/FSTArraySortedDictionaryEnumerator.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/third_party/Immutable/FSTImmutableSortedDictionary.m b/Firestore/third_party/Immutable/FSTImmutableSortedDictionary.m index a858529..6e78961 100644 --- a/Firestore/third_party/Immutable/FSTImmutableSortedDictionary.m +++ b/Firestore/third_party/Immutable/FSTImmutableSortedDictionary.m @@ -1,8 +1,8 @@ -#import "FSTImmutableSortedDictionary.h" +#import "Firestore/third_party/Immutable/FSTImmutableSortedDictionary.h" -#import "FSTArraySortedDictionary.h" -#import "FSTClasses.h" -#import "FSTTreeSortedDictionary.h" +#import "Firestore/third_party/Immutable/FSTArraySortedDictionary.h" +#import "Firestore/Source/Util/FSTClasses.h" +#import "Firestore/third_party/Immutable/FSTTreeSortedDictionary.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/third_party/Immutable/FSTImmutableSortedSet.m b/Firestore/third_party/Immutable/FSTImmutableSortedSet.m index a13a79e..a23068e 100644 --- a/Firestore/third_party/Immutable/FSTImmutableSortedSet.m +++ b/Firestore/third_party/Immutable/FSTImmutableSortedSet.m @@ -1,6 +1,6 @@ -#import "FSTImmutableSortedSet.h" +#import "Firestore/third_party/Immutable/FSTImmutableSortedSet.h" -#import "FSTImmutableSortedDictionary.h" +#import "Firestore/third_party/Immutable/FSTImmutableSortedDictionary.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/third_party/Immutable/FSTLLRBEmptyNode.h b/Firestore/third_party/Immutable/FSTLLRBEmptyNode.h index 4c3c2af..13c3bf8 100644 --- a/Firestore/third_party/Immutable/FSTLLRBEmptyNode.h +++ b/Firestore/third_party/Immutable/FSTLLRBEmptyNode.h @@ -1,6 +1,6 @@ #import <Foundation/Foundation.h> -#import "FSTLLRBNode.h" +#import "Firestore/third_party/Immutable/FSTLLRBNode.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/third_party/Immutable/FSTLLRBEmptyNode.m b/Firestore/third_party/Immutable/FSTLLRBEmptyNode.m index ec49c2c..45d2652 100644 --- a/Firestore/third_party/Immutable/FSTLLRBEmptyNode.m +++ b/Firestore/third_party/Immutable/FSTLLRBEmptyNode.m @@ -1,6 +1,6 @@ -#import "FSTLLRBEmptyNode.h" +#import "Firestore/third_party/Immutable/FSTLLRBEmptyNode.h" -#import "FSTLLRBValueNode.h" +#import "Firestore/third_party/Immutable/FSTLLRBValueNode.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/third_party/Immutable/FSTLLRBValueNode.h b/Firestore/third_party/Immutable/FSTLLRBValueNode.h index 4a0873c..9a62378 100644 --- a/Firestore/third_party/Immutable/FSTLLRBValueNode.h +++ b/Firestore/third_party/Immutable/FSTLLRBValueNode.h @@ -1,6 +1,6 @@ #import <Foundation/Foundation.h> -#import "FSTLLRBNode.h" +#import "Firestore/third_party/Immutable/FSTLLRBNode.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/third_party/Immutable/FSTLLRBValueNode.m b/Firestore/third_party/Immutable/FSTLLRBValueNode.m index d048012..194a393 100644 --- a/Firestore/third_party/Immutable/FSTLLRBValueNode.m +++ b/Firestore/third_party/Immutable/FSTLLRBValueNode.m @@ -1,7 +1,7 @@ -#import "FSTLLRBValueNode.h" +#import "Firestore/third_party/Immutable/FSTLLRBValueNode.h" -#import "FSTAssert.h" -#import "FSTLLRBEmptyNode.h" +#import "Firestore/Source/Util/FSTAssert.h" +#import "Firestore/third_party/Immutable/FSTLLRBEmptyNode.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/third_party/Immutable/FSTTreeSortedDictionary.h b/Firestore/third_party/Immutable/FSTTreeSortedDictionary.h index 6c26e5f..ca1a290 100644 --- a/Firestore/third_party/Immutable/FSTTreeSortedDictionary.h +++ b/Firestore/third_party/Immutable/FSTTreeSortedDictionary.h @@ -14,8 +14,8 @@ #import <Foundation/Foundation.h> -#import "FSTImmutableSortedDictionary.h" -#import "FSTLLRBNode.h" +#import "Firestore/third_party/Immutable/FSTImmutableSortedDictionary.h" +#import "Firestore/third_party/Immutable/FSTLLRBNode.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/third_party/Immutable/FSTTreeSortedDictionary.m b/Firestore/third_party/Immutable/FSTTreeSortedDictionary.m index 4059951..b3e691f 100644 --- a/Firestore/third_party/Immutable/FSTTreeSortedDictionary.m +++ b/Firestore/third_party/Immutable/FSTTreeSortedDictionary.m @@ -1,8 +1,8 @@ -#import "FSTTreeSortedDictionary.h" +#import "Firestore/third_party/Immutable/FSTTreeSortedDictionary.h" -#import "FSTLLRBEmptyNode.h" -#import "FSTLLRBValueNode.h" -#import "FSTTreeSortedDictionaryEnumerator.h" +#import "Firestore/third_party/Immutable/FSTLLRBEmptyNode.h" +#import "Firestore/third_party/Immutable/FSTLLRBValueNode.h" +#import "Firestore/third_party/Immutable/FSTTreeSortedDictionaryEnumerator.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/third_party/Immutable/FSTTreeSortedDictionaryEnumerator.h b/Firestore/third_party/Immutable/FSTTreeSortedDictionaryEnumerator.h index ab82f00..d31d4c2 100644 --- a/Firestore/third_party/Immutable/FSTTreeSortedDictionaryEnumerator.h +++ b/Firestore/third_party/Immutable/FSTTreeSortedDictionaryEnumerator.h @@ -1,6 +1,6 @@ #import <Foundation/Foundation.h> -#import "FSTTreeSortedDictionary.h" +#import "Firestore/third_party/Immutable/FSTTreeSortedDictionary.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/third_party/Immutable/FSTTreeSortedDictionaryEnumerator.m b/Firestore/third_party/Immutable/FSTTreeSortedDictionaryEnumerator.m index bfdfba5..b413792 100644 --- a/Firestore/third_party/Immutable/FSTTreeSortedDictionaryEnumerator.m +++ b/Firestore/third_party/Immutable/FSTTreeSortedDictionaryEnumerator.m @@ -1,4 +1,4 @@ -#import "FSTTreeSortedDictionaryEnumerator.h" +#import "Firestore/third_party/Immutable/FSTTreeSortedDictionaryEnumerator.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/third_party/Immutable/Tests/FSTArraySortedDictionaryTests.m b/Firestore/third_party/Immutable/Tests/FSTArraySortedDictionaryTests.m index 68f2fc3..a799686 100644 --- a/Firestore/third_party/Immutable/Tests/FSTArraySortedDictionaryTests.m +++ b/Firestore/third_party/Immutable/Tests/FSTArraySortedDictionaryTests.m @@ -1,8 +1,8 @@ -#import "Immutable/FSTArraySortedDictionary.h" +#import "Firestore/third_party/Immutable/FSTArraySortedDictionary.h" #import <XCTest/XCTest.h> -#import "Util/FSTAssert.h" +#import "Firestore/Source/Util/FSTAssert.h" @interface FSTArraySortedDictionary (Test) // Override methods to return subtype. diff --git a/Firestore/third_party/Immutable/Tests/FSTImmutableSortedDictionary+Testing.h b/Firestore/third_party/Immutable/Tests/FSTImmutableSortedDictionary+Testing.h index 7496173..85e0197 100644 --- a/Firestore/third_party/Immutable/Tests/FSTImmutableSortedDictionary+Testing.h +++ b/Firestore/third_party/Immutable/Tests/FSTImmutableSortedDictionary+Testing.h @@ -1,6 +1,6 @@ #import <Foundation/Foundation.h> -#import "Immutable/FSTImmutableSortedDictionary.h" +#import "Firestore/third_party/Immutable/FSTImmutableSortedDictionary.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/third_party/Immutable/Tests/FSTImmutableSortedDictionary+Testing.m b/Firestore/third_party/Immutable/Tests/FSTImmutableSortedDictionary+Testing.m index d402916..7def7cb 100644 --- a/Firestore/third_party/Immutable/Tests/FSTImmutableSortedDictionary+Testing.m +++ b/Firestore/third_party/Immutable/Tests/FSTImmutableSortedDictionary+Testing.m @@ -1,4 +1,4 @@ -#import "FSTImmutableSortedDictionary+Testing.h" +#import "Firestore/third_party/Immutable/Tests/FSTImmutableSortedDictionary+Testing.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/third_party/Immutable/Tests/FSTImmutableSortedSet+Testing.h b/Firestore/third_party/Immutable/Tests/FSTImmutableSortedSet+Testing.h index a0e25d7..0eb82cf 100644 --- a/Firestore/third_party/Immutable/Tests/FSTImmutableSortedSet+Testing.h +++ b/Firestore/third_party/Immutable/Tests/FSTImmutableSortedSet+Testing.h @@ -1,4 +1,4 @@ -#import "Immutable/FSTImmutableSortedSet.h" +#import "Firestore/third_party/Immutable/FSTImmutableSortedSet.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/third_party/Immutable/Tests/FSTImmutableSortedSet+Testing.m b/Firestore/third_party/Immutable/Tests/FSTImmutableSortedSet+Testing.m index d4d81e0..25ba56e 100644 --- a/Firestore/third_party/Immutable/Tests/FSTImmutableSortedSet+Testing.m +++ b/Firestore/third_party/Immutable/Tests/FSTImmutableSortedSet+Testing.m @@ -1,4 +1,4 @@ -#import "FSTImmutableSortedSet+Testing.h" +#import "Firestore/third_party/Immutable/Tests/FSTImmutableSortedSet+Testing.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Firestore/third_party/Immutable/Tests/FSTLLRBValueNode+Test.h b/Firestore/third_party/Immutable/Tests/FSTLLRBValueNode+Test.h index 3b05647..768521a 100644 --- a/Firestore/third_party/Immutable/Tests/FSTLLRBValueNode+Test.h +++ b/Firestore/third_party/Immutable/Tests/FSTLLRBValueNode+Test.h @@ -1,4 +1,4 @@ -#import "Immutable/FSTLLRBValueNode.h" +#import "Firestore/third_party/Immutable/FSTLLRBValueNode.h" #import <Foundation/Foundation.h> diff --git a/Firestore/third_party/Immutable/Tests/FSTTreeSortedDictionaryTests.m b/Firestore/third_party/Immutable/Tests/FSTTreeSortedDictionaryTests.m index 352ac4e..344efba 100644 --- a/Firestore/third_party/Immutable/Tests/FSTTreeSortedDictionaryTests.m +++ b/Firestore/third_party/Immutable/Tests/FSTTreeSortedDictionaryTests.m @@ -1,12 +1,12 @@ #import <XCTest/XCTest.h> -#import "Immutable/FSTLLRBEmptyNode.h" -#import "Immutable/FSTLLRBNode.h" -#import "Immutable/FSTLLRBValueNode.h" -#import "Immutable/FSTTreeSortedDictionary.h" -#import "Util/FSTAssert.h" +#import "Firestore/third_party/Immutable/FSTLLRBEmptyNode.h" +#import "Firestore/third_party/Immutable/FSTLLRBNode.h" +#import "Firestore/third_party/Immutable/FSTLLRBValueNode.h" +#import "Firestore/third_party/Immutable/FSTTreeSortedDictionary.h" +#import "Firestore/Source/Util/FSTAssert.h" -#import "FSTLLRBValueNode+Test.h" +#import "Firestore/third_party/Immutable/Tests/FSTLLRBValueNode+Test.h" @interface FSTTreeSortedDictionary (Test) // Override methods to return subtype. |