Skip to content

Repo-relative imports for Database #5861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 22, 2020
Merged

Repo-relative imports for Database #5861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d633359
Repo-relative imports for Database
paulb777 Jun 19, 2020
dd32f62
Don't change Functions here
paulb777 Jun 20, 2020
df6d05c
Only run integration tests on iOS to avoid flakiness
paulb777 Jun 20, 2020
3d70b13
fix
paulb777 Jun 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .github/workflows/database.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,13 @@ jobs:
# Don't run on private repo unless it is a PR.
if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request'
runs-on: macos-latest
strategy:
matrix:
target: [iOS, tvOS, macOS]
steps:
- uses: actions/checkout@v2
- name: Setup Bundler
run: scripts/setup_bundler.sh
- name: IntegrationTest
run: scripts/third_party/travis/retry.sh scripts/build.sh Database ${{ matrix.target }} integration
# Only iOS to mitigate flakes.
Copy link
Contributor

@maksymmalyhin maksymmalyhin Jun 22, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder may the flakes occur due to concurrent tests execution (modifying the same database keys from tests fro different platforms simultaneously)? If so, we probably can fix it by modifying the tests, but it's probably out of scope of the PR.

Copy link
Member Author

@paulb777 paulb777 Jun 22, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, I wondered the same thing - but we've also disabled other tests in this suite because of flakiness from a single run.

In any case until we invest in improving the robustness of these tests, its not worth the cost of running the integration tests for non-iOS platforms.

run: scripts/third_party/travis/retry.sh scripts/build.sh Database iOS integration

catalyst:
# Don't run on private repo unless it is a PR.
Expand Down
2 changes: 1 addition & 1 deletion Example/Shared/FIRAuthInteropFake.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

#import "FIRAuthInteropFake.h"
#import "Example/Shared/FIRAuthInteropFake.h"

#import "Interop/Auth/Public/FIRAuthInterop.h"

Expand Down
2 changes: 1 addition & 1 deletion Example/Shared/FIRComponentTestUtilities.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

#import "FIRComponentTestUtilities.h"
#import "Example/Shared/FIRComponentTestUtilities.h"

NS_ASSUME_NONNULL_BEGIN

Expand Down
2 changes: 1 addition & 1 deletion Example/Shared/FIRSampleAppUtilities.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

#import "FIRSampleAppUtilities.h"
#import "Example/Shared/FIRSampleAppUtilities.h"

#import <SafariServices/SafariServices.h>
#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
Expand Down
12 changes: 6 additions & 6 deletions FirebaseDatabase/Sources/Api/FIRDataSnapshot.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
* limitations under the License.
*/

#import "FIRDataSnapshot.h"
#import "FChildrenNode.h"
#import "FIRDataSnapshot_Private.h"
#import "FIRDatabaseReference.h"
#import "FTransformedEnumerator.h"
#import "FValidation.h"
#import "FirebaseDatabase/Sources/Public/FIRDataSnapshot.h"
#import "FirebaseDatabase/Sources/Api/Private/FIRDataSnapshot_Private.h"
#import "FirebaseDatabase/Sources/FTransformedEnumerator.h"
#import "FirebaseDatabase/Sources/Public/FIRDatabaseReference.h"
#import "FirebaseDatabase/Sources/Snapshot/FChildrenNode.h"
#import "FirebaseDatabase/Sources/Utilities/FValidation.h"

@interface FIRDataSnapshot ()
@property(nonatomic, strong) FIRDatabaseReference *ref;
Expand Down
16 changes: 8 additions & 8 deletions FirebaseDatabase/Sources/Api/FIRDatabase.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
#import "Interop/Auth/Public/FIRAuthInterop.h"

#import "FIRDatabase.h"
#import "FIRDatabaseComponent.h"
#import "FIRDatabaseConfig_Private.h"
#import "FIRDatabaseQuery_Private.h"
#import "FIRDatabaseReference_Private.h"
#import "FIRDatabase_Private.h"
#import "FRepoInfo.h"
#import "FValidation.h"
#import "FirebaseDatabase/Sources/Api/FIRDatabaseComponent.h"
#import "FirebaseDatabase/Sources/Api/Private/FIRDatabaseQuery_Private.h"
#import "FirebaseDatabase/Sources/Api/Private/FIRDatabaseReference_Private.h"
#import "FirebaseDatabase/Sources/Api/Private/FIRDatabase_Private.h"
#import "FirebaseDatabase/Sources/Core/FRepoInfo.h"
#import "FirebaseDatabase/Sources/FIRDatabaseConfig_Private.h"
#import "FirebaseDatabase/Sources/Public/FIRDatabase.h"
#import "FirebaseDatabase/Sources/Utilities/FValidation.h"

@implementation FIRDatabase

Expand Down
8 changes: 4 additions & 4 deletions FirebaseDatabase/Sources/Api/FIRDatabaseComponent.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
* limitations under the License.
*/

#import "FIRDatabaseComponent.h"
#import "FirebaseDatabase/Sources/Api/FIRDatabaseComponent.h"

#import "FIRDatabaseConfig_Private.h"
#import "FIRDatabase_Private.h"
#import "FRepoManager.h"
#import "FirebaseDatabase/Sources/Api/Private/FIRDatabase_Private.h"
#import "FirebaseDatabase/Sources/Core/FRepoManager.h"
#import "FirebaseDatabase/Sources/FIRDatabaseConfig_Private.h"

#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
#import "Interop/Auth/Public/FIRAuthInterop.h"
Expand Down
8 changes: 4 additions & 4 deletions FirebaseDatabase/Sources/Api/FIRDatabaseConfig.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
* limitations under the License.
*/

#import "FIRDatabaseConfig.h"
#import "FirebaseDatabase/Sources/Api/FIRDatabaseConfig.h"

#import "FAuthTokenProvider.h"
#import "FIRDatabaseConfig_Private.h"
#import "FIRNoopAuthTokenProvider.h"
#import "FirebaseDatabase/Sources/FIRDatabaseConfig_Private.h"
#import "FirebaseDatabase/Sources/Login/FAuthTokenProvider.h"
#import "FirebaseDatabase/Sources/Login/FIRNoopAuthTokenProvider.h"

@interface FIRDatabaseConfig (Private)

Expand Down
30 changes: 15 additions & 15 deletions FirebaseDatabase/Sources/Api/FIRDatabaseQuery.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@
* limitations under the License.
*/

#import "FIRDatabaseQuery.h"
#import "FChildEventRegistration.h"
#import "FConstants.h"
#import "FIRDatabaseQuery_Private.h"
#import "FKeyIndex.h"
#import "FLeafNode.h"
#import "FPath.h"
#import "FPathIndex.h"
#import "FPriorityIndex.h"
#import "FQueryParams.h"
#import "FQuerySpec.h"
#import "FSnapshotUtilities.h"
#import "FValidation.h"
#import "FValueEventRegistration.h"
#import "FValueIndex.h"
#import "FirebaseDatabase/Sources/Public/FIRDatabaseQuery.h"
#import "FirebaseDatabase/Sources/Api/Private/FIRDatabaseQuery_Private.h"
#import "FirebaseDatabase/Sources/Constants/FConstants.h"
#import "FirebaseDatabase/Sources/Core/FQueryParams.h"
#import "FirebaseDatabase/Sources/Core/FQuerySpec.h"
#import "FirebaseDatabase/Sources/Core/Utilities/FPath.h"
#import "FirebaseDatabase/Sources/Core/View/FChildEventRegistration.h"
#import "FirebaseDatabase/Sources/Core/View/FValueEventRegistration.h"
#import "FirebaseDatabase/Sources/FKeyIndex.h"
#import "FirebaseDatabase/Sources/FPathIndex.h"
#import "FirebaseDatabase/Sources/FPriorityIndex.h"
#import "FirebaseDatabase/Sources/FValueIndex.h"
#import "FirebaseDatabase/Sources/Snapshot/FLeafNode.h"
#import "FirebaseDatabase/Sources/Snapshot/FSnapshotUtilities.h"
#import "FirebaseDatabase/Sources/Utilities/FValidation.h"

@implementation FIRDatabaseQuery

Expand Down
16 changes: 8 additions & 8 deletions FirebaseDatabase/Sources/Api/FIRMutableData.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
* limitations under the License.
*/

#import "FIRMutableData.h"
#import "FChildrenNode.h"
#import "FIRMutableData_Private.h"
#import "FIndexedNode.h"
#import "FNamedNode.h"
#import "FSnapshotHolder.h"
#import "FSnapshotUtilities.h"
#import "FTransformedEnumerator.h"
#import "FirebaseDatabase/Sources/Public/FIRMutableData.h"
#import "FirebaseDatabase/Sources/Api/Private/FIRMutableData_Private.h"
#import "FirebaseDatabase/Sources/Core/FSnapshotHolder.h"
#import "FirebaseDatabase/Sources/FNamedNode.h"
#import "FirebaseDatabase/Sources/FTransformedEnumerator.h"
#import "FirebaseDatabase/Sources/Snapshot/FChildrenNode.h"
#import "FirebaseDatabase/Sources/Snapshot/FIndexedNode.h"
#import "FirebaseDatabase/Sources/Snapshot/FSnapshotUtilities.h"

@interface FIRMutableData ()

Expand Down
2 changes: 1 addition & 1 deletion FirebaseDatabase/Sources/Api/FIRServerValue.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

#import "FIRServerValue.h"
#import "FirebaseDatabase/Sources/Public/FIRServerValue.h"

@implementation FIRServerValue

Expand Down
4 changes: 2 additions & 2 deletions FirebaseDatabase/Sources/Api/FIRTransactionResult.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* limitations under the License.
*/

#import "FIRTransactionResult.h"
#import "FIRTransactionResult_Private.h"
#import "FirebaseDatabase/Sources/Public/FIRTransactionResult.h"
#import "FirebaseDatabase/Sources/Api/Private/FIRTransactionResult_Private.h"

@implementation FIRTransactionResult

Expand Down
6 changes: 3 additions & 3 deletions FirebaseDatabase/Sources/Api/Private/FIRDataSnapshot_Private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
* limitations under the License.
*/

#import "FIRDataSnapshot.h"
#import "FIndexedNode.h"
#import "FTypedefs_Private.h"
#import "FirebaseDatabase/Sources/Api/Private/FTypedefs_Private.h"
#import "FirebaseDatabase/Sources/Public/FIRDataSnapshot.h"
#import "FirebaseDatabase/Sources/Snapshot/FIndexedNode.h"

@interface FIRDataSnapshot ()

Expand Down
12 changes: 6 additions & 6 deletions FirebaseDatabase/Sources/Api/Private/FIRDatabaseQuery_Private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
* limitations under the License.
*/

#import "FIRDatabaseQuery.h"
#import "FPath.h"
#import "FQueryParams.h"
#import "FRepo.h"
#import "FRepoManager.h"
#import "FTypedefs_Private.h"
#import "FirebaseDatabase/Sources/Api/Private/FTypedefs_Private.h"
#import "FirebaseDatabase/Sources/Core/FQueryParams.h"
#import "FirebaseDatabase/Sources/Core/FRepo.h"
#import "FirebaseDatabase/Sources/Core/FRepoManager.h"
#import "FirebaseDatabase/Sources/Core/Utilities/FPath.h"
#import "FirebaseDatabase/Sources/Public/FIRDatabaseQuery.h"

@interface FIRDatabaseQuery ()

Expand Down
8 changes: 4 additions & 4 deletions FirebaseDatabase/Sources/Api/Private/FIRDatabaseReference_Private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
* limitations under the License.
*/

#import "FIRDatabaseConfig.h"
#import "FIRDatabaseReference.h"
#import "FRepo.h"
#import "FTypedefs_Private.h"
#import "FirebaseDatabase/Sources/Api/FIRDatabaseConfig.h"
#import "FirebaseDatabase/Sources/Api/Private/FTypedefs_Private.h"
#import "FirebaseDatabase/Sources/Core/FRepo.h"
#import "FirebaseDatabase/Sources/Public/FIRDatabaseReference.h"

@interface FIRDatabaseReference ()

Expand Down
2 changes: 1 addition & 1 deletion FirebaseDatabase/Sources/Api/Private/FIRDatabase_Private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

#import "FIRDatabase.h"
#import "FirebaseDatabase/Sources/Public/FIRDatabase.h"

@class FRepo;
@class FRepoInfo;
Expand Down
4 changes: 2 additions & 2 deletions FirebaseDatabase/Sources/Api/Private/FIRMutableData_Private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* limitations under the License.
*/

#import "FIRMutableData.h"
#import "FNode.h"
#import "FirebaseDatabase/Sources/Public/FIRMutableData.h"
#import "FirebaseDatabase/Sources/Snapshot/FNode.h"

@interface FIRMutableData ()

Expand Down
4 changes: 2 additions & 2 deletions FirebaseDatabase/Sources/Api/Private/FIRTransactionResult_Private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* limitations under the License.
*/

#import "FIRMutableData.h"
#import "FIRTransactionResult.h"
#import "FirebaseDatabase/Sources/Public/FIRMutableData.h"
#import "FirebaseDatabase/Sources/Public/FIRTransactionResult.h"

@interface FIRTransactionResult ()

Expand Down
2 changes: 1 addition & 1 deletion FirebaseDatabase/Sources/Constants/FConstants.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

#import "FConstants.h"
#import "FirebaseDatabase/Sources/Constants/FConstants.h"

#pragma mark -
#pragma mark Wire Protocol Envelope Constants
Expand Down
2 changes: 1 addition & 1 deletion FirebaseDatabase/Sources/Core/FCompoundHash.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#import <Foundation/Foundation.h>

#import "FNode.h"
#import "FirebaseDatabase/Sources/Snapshot/FNode.h"

@interface FCompoundHashBuilder : NSObject

Expand Down
10 changes: 5 additions & 5 deletions FirebaseDatabase/Sources/Core/FCompoundHash.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
* limitations under the License.
*/

#import "FCompoundHash.h"
#import "FChildrenNode.h"
#import "FLeafNode.h"
#import "FSnapshotUtilities.h"
#import "FStringUtilities.h"
#import "FirebaseDatabase/Sources/Core/FCompoundHash.h"
#import "FirebaseDatabase/Sources/Snapshot/FChildrenNode.h"
#import "FirebaseDatabase/Sources/Snapshot/FLeafNode.h"
#import "FirebaseDatabase/Sources/Snapshot/FSnapshotUtilities.h"
#import "FirebaseDatabase/Sources/Utilities/FStringUtilities.h"

@interface FCompoundHashBuilder ()

Expand Down
2 changes: 1 addition & 1 deletion FirebaseDatabase/Sources/Core/FListenProvider.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

#import "FTypedefs_Private.h"
#import "FirebaseDatabase/Sources/Api/Private/FTypedefs_Private.h"

@class FQuerySpec;
@protocol FSyncTreeHash;
Expand Down
4 changes: 2 additions & 2 deletions FirebaseDatabase/Sources/Core/FListenProvider.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* limitations under the License.
*/

#import "FListenProvider.h"
#import "FIRDatabaseQuery.h"
#import "FirebaseDatabase/Sources/Core/FListenProvider.h"
#import "FirebaseDatabase/Sources/Public/FIRDatabaseQuery.h"

@implementation FListenProvider

Expand Down
8 changes: 4 additions & 4 deletions FirebaseDatabase/Sources/Core/FPersistentConnection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
* limitations under the License.
*/

#import "FConnection.h"
#import "FRepoInfo.h"
#import "FTypedefs.h"
#import "FTypedefs_Private.h"
#import "FirebaseDatabase/Sources/Api/Private/FTypedefs_Private.h"
#import "FirebaseDatabase/Sources/Core/FRepoInfo.h"
#import "FirebaseDatabase/Sources/Realtime/FConnection.h"
#import "FirebaseDatabase/Sources/Utilities/FTypedefs.h"
#import <Foundation/Foundation.h>

@protocol FPersistentConnectionDelegate;
Expand Down
36 changes: 18 additions & 18 deletions FirebaseDatabase/Sources/Core/FPersistentConnection.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,25 @@
*/
#import <Foundation/Foundation.h>

#import "FAtomicNumber.h"
#import "FAuthTokenProvider.h"
#import "FCompoundHash.h"
#import "FConstants.h"
#import "FIRDatabaseConfig.h"
#import "FIRDatabaseConfig_Private.h"
#import "FIRDatabaseReference.h"
#import "FIRRetryHelper.h"
#import "FIndex.h"
#import "FPersistentConnection.h"
#import "FQueryParams.h"
#import "FQuerySpec.h"
#import "FRangeMerge.h"
#import "FSnapshotUtilities.h"
#import "FSyncTree.h"
#import "FTupleCallbackStatus.h"
#import "FTupleOnDisconnect.h"
#import "FUtilities.h"
#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
#import "FirebaseDatabase/Sources/Api/FIRDatabaseConfig.h"
#import "FirebaseDatabase/Sources/Constants/FConstants.h"
#import "FirebaseDatabase/Sources/Core/FCompoundHash.h"
#import "FirebaseDatabase/Sources/Core/FPersistentConnection.h"
#import "FirebaseDatabase/Sources/Core/FQueryParams.h"
#import "FirebaseDatabase/Sources/Core/FQuerySpec.h"
#import "FirebaseDatabase/Sources/Core/FRangeMerge.h"
#import "FirebaseDatabase/Sources/Core/FSyncTree.h"
#import "FirebaseDatabase/Sources/Core/Utilities/FIRRetryHelper.h"
#import "FirebaseDatabase/Sources/FIRDatabaseConfig_Private.h"
#import "FirebaseDatabase/Sources/FIndex.h"
#import "FirebaseDatabase/Sources/Login/FAuthTokenProvider.h"
#import "FirebaseDatabase/Sources/Public/FIRDatabaseReference.h"
#import "FirebaseDatabase/Sources/Snapshot/FSnapshotUtilities.h"
#import "FirebaseDatabase/Sources/Utilities/FAtomicNumber.h"
#import "FirebaseDatabase/Sources/Utilities/FUtilities.h"
#import "FirebaseDatabase/Sources/Utilities/Tuples/FTupleCallbackStatus.h"
#import "FirebaseDatabase/Sources/Utilities/Tuples/FTupleOnDisconnect.h"
#import <SystemConfiguration/SystemConfiguration.h>
#import <dlfcn.h>
#import <netinet/in.h>
Expand Down
Loading