diff --git a/.clang-format b/.clang-format index 7fbcb06cbf..4f536701f8 100644 --- a/.clang-format +++ b/.clang-format @@ -6,3 +6,4 @@ ObjCSpaceBeforeProtocolList: true SpacesInContainerLiterals: true PointerAlignment: Right AllowShortFunctionsOnASingleLine: None +IncludeBlocks: Preserve diff --git a/Crashlytics/Crashlytics/Components/FIRCLSBinaryImage.h b/Crashlytics/Crashlytics/Components/FIRCLSBinaryImage.h index 75929df675..f3c0bd7186 100644 --- a/Crashlytics/Crashlytics/Components/FIRCLSBinaryImage.h +++ b/Crashlytics/Crashlytics/Components/FIRCLSBinaryImage.h @@ -14,13 +14,13 @@ #pragma once +#include +#include + #include "FIRCLSFeatures.h" #include "FIRCLSFile.h" #include "FIRCLSMachO.h" -#include -#include - __BEGIN_DECLS // Typically, apps seem to have ~300 binary images loaded diff --git a/Crashlytics/Crashlytics/Components/FIRCLSHost.h b/Crashlytics/Crashlytics/Components/FIRCLSHost.h index 31dfc24b10..24b1acd13e 100644 --- a/Crashlytics/Crashlytics/Components/FIRCLSHost.h +++ b/Crashlytics/Crashlytics/Components/FIRCLSHost.h @@ -14,11 +14,11 @@ #pragma once -#include "FIRCLSFile.h" - #include #include +#include "FIRCLSFile.h" + typedef struct { const char* documentDirectoryPath; vm_size_t pageSize; diff --git a/Crashlytics/Crashlytics/Components/FIRCLSProcess.h b/Crashlytics/Crashlytics/Components/FIRCLSProcess.h index c12fd73877..dbe758ffd9 100644 --- a/Crashlytics/Crashlytics/Components/FIRCLSProcess.h +++ b/Crashlytics/Crashlytics/Components/FIRCLSProcess.h @@ -14,11 +14,11 @@ #pragma once -#include "FIRCLSFile.h" - #include #include +#include "FIRCLSFile.h" + typedef struct { // task info mach_port_t task; diff --git a/Crashlytics/Crashlytics/Handlers/FIRCLSHandler.h b/Crashlytics/Crashlytics/Handlers/FIRCLSHandler.h index 2940de2a56..7ce03e4164 100644 --- a/Crashlytics/Crashlytics/Handlers/FIRCLSHandler.h +++ b/Crashlytics/Crashlytics/Handlers/FIRCLSHandler.h @@ -14,10 +14,10 @@ #pragma once -#include "FIRCLSFile.h" - #include +#include "FIRCLSFile.h" + __BEGIN_DECLS void FIRCLSHandler(FIRCLSFile* file, thread_t crashedThread, void* uapVoid); diff --git a/Crashlytics/Crashlytics/Unwind/Compact/FIRCLSCompactUnwind.h b/Crashlytics/Crashlytics/Unwind/Compact/FIRCLSCompactUnwind.h index 3701e35687..1698e75850 100644 --- a/Crashlytics/Crashlytics/Unwind/Compact/FIRCLSCompactUnwind.h +++ b/Crashlytics/Crashlytics/Unwind/Compact/FIRCLSCompactUnwind.h @@ -14,12 +14,12 @@ #pragma once -#include "FIRCLSFeatures.h" -#include "FIRCLSThreadState.h" - #include #include +#include "FIRCLSFeatures.h" +#include "FIRCLSThreadState.h" + // We have to pack the arrays defined in this header, so // we can reason about pointer math. #pragma pack(push) diff --git a/Crashlytics/Crashlytics/Unwind/Dwarf/FIRCLSDataParsing.h b/Crashlytics/Crashlytics/Unwind/Dwarf/FIRCLSDataParsing.h index 44c8a28702..8a6e966170 100644 --- a/Crashlytics/Crashlytics/Unwind/Dwarf/FIRCLSDataParsing.h +++ b/Crashlytics/Crashlytics/Unwind/Dwarf/FIRCLSDataParsing.h @@ -14,10 +14,10 @@ #pragma once -#include "FIRCLSFeatures.h" - #include +#include "FIRCLSFeatures.h" + #if CLS_DWARF_UNWINDING_SUPPORTED #if CLS_CPU_64BIT diff --git a/Crashlytics/Crashlytics/Unwind/Dwarf/FIRCLSDwarfUnwind.h b/Crashlytics/Crashlytics/Unwind/Dwarf/FIRCLSDwarfUnwind.h index c7307fde8f..bbb28805bb 100644 --- a/Crashlytics/Crashlytics/Unwind/Dwarf/FIRCLSDwarfUnwind.h +++ b/Crashlytics/Crashlytics/Unwind/Dwarf/FIRCLSDwarfUnwind.h @@ -14,13 +14,13 @@ #pragma once -#include "FIRCLSDwarfUnwindRegisters.h" -#include "FIRCLSThreadState.h" - #include #include #include +#include "FIRCLSDwarfUnwindRegisters.h" +#include "FIRCLSThreadState.h" + #if CLS_DWARF_UNWINDING_SUPPORTED #pragma mark Structures diff --git a/Crashlytics/Crashlytics/Unwind/FIRCLSUnwind.h b/Crashlytics/Crashlytics/Unwind/FIRCLSUnwind.h index 08b23ead39..a92a2871d7 100644 --- a/Crashlytics/Crashlytics/Unwind/FIRCLSUnwind.h +++ b/Crashlytics/Crashlytics/Unwind/FIRCLSUnwind.h @@ -19,11 +19,11 @@ #if CLS_COMPACT_UNWINDING_SUPPORTED #include "FIRCLSCompactUnwind.h" #endif -#include "FIRCLSUnwind_arch.h" - #include #include +#include "FIRCLSUnwind_arch.h" + extern const uint32_t FIRCLSUnwindMaxFrames; extern const uint32_t FIRCLSUnwindInfiniteRecursionCountThreshold; diff --git a/Crashlytics/Crashlytics/Unwind/FIRCLSUnwind_arch.h b/Crashlytics/Crashlytics/Unwind/FIRCLSUnwind_arch.h index dc5e29692d..3accd40ea3 100644 --- a/Crashlytics/Crashlytics/Unwind/FIRCLSUnwind_arch.h +++ b/Crashlytics/Crashlytics/Unwind/FIRCLSUnwind_arch.h @@ -15,7 +15,6 @@ #pragma once #include "FIRCLSFeatures.h" - #include "FIRCLSThreadState.h" #if CLS_COMPACT_UNWINDING_SUPPORTED #include "FIRCLSCompactUnwind.h" diff --git a/Firestore/Example/FuzzTests/FuzzingTargets/FSTFuzzTestFieldPath.h b/Firestore/Example/FuzzTests/FuzzingTargets/FSTFuzzTestFieldPath.h index 3835ff964a..d35b131c0f 100644 --- a/Firestore/Example/FuzzTests/FuzzingTargets/FSTFuzzTestFieldPath.h +++ b/Firestore/Example/FuzzTests/FuzzingTargets/FSTFuzzTestFieldPath.h @@ -18,6 +18,7 @@ #define FIRESTORE_EXAMPLE_FUZZTESTS_FUZZINGTARGETS_FSTFUZZTESTFIELDPATH_H_ #import + #include namespace firebase { diff --git a/Firestore/Example/FuzzTests/FuzzingTargets/FSTFuzzTestSerializer.h b/Firestore/Example/FuzzTests/FuzzingTargets/FSTFuzzTestSerializer.h index 29540a1e26..720cf22105 100644 --- a/Firestore/Example/FuzzTests/FuzzingTargets/FSTFuzzTestSerializer.h +++ b/Firestore/Example/FuzzTests/FuzzingTargets/FSTFuzzTestSerializer.h @@ -18,6 +18,7 @@ #define FIRESTORE_EXAMPLE_FUZZTESTS_FUZZINGTARGETS_FSTFUZZTESTSERIALIZER_H_ #import + #include namespace firebase { diff --git a/Firestore/Example/Tests/Integration/API/FIRDatabaseTests.mm b/Firestore/Example/Tests/Integration/API/FIRDatabaseTests.mm index 2f1f71a965..c45ef72eec 100644 --- a/Firestore/Example/Tests/Integration/API/FIRDatabaseTests.mm +++ b/Firestore/Example/Tests/Integration/API/FIRDatabaseTests.mm @@ -1227,7 +1227,7 @@ using firebase::firestore::util::TimerId; FIRFirestore *firestore = doc.firestore; [self writeDocumentRef:doc data:@{@"foo" : @"bar"}]; - [firestore workerQueue] -> RunScheduledOperationsUntil(TimerId::WriteStreamIdle); + [firestore workerQueue]->RunScheduledOperationsUntil(TimerId::WriteStreamIdle); [self writeDocumentRef:doc data:@{@"foo" : @"bar"}]; } @@ -1236,7 +1236,7 @@ using firebase::firestore::util::TimerId; FIRFirestore *firestore = doc.firestore; [self readSnapshotForRef:[self documentRef] requireOnline:YES]; - [firestore workerQueue] -> RunScheduledOperationsUntil(TimerId::ListenStreamIdle); + [firestore workerQueue]->RunScheduledOperationsUntil(TimerId::ListenStreamIdle); [self readSnapshotForRef:[self documentRef] requireOnline:YES]; } diff --git a/Firestore/Example/Tests/Integration/FSTTransactionTests.mm b/Firestore/Example/Tests/Integration/FSTTransactionTests.mm index e59ffbba15..b949d98ec3 100644 --- a/Firestore/Example/Tests/Integration/FSTTransactionTests.mm +++ b/Firestore/Example/Tests/Integration/FSTTransactionTests.mm @@ -398,7 +398,7 @@ TransactionStage get = ^(FIRTransaction *transaction, FIRDocumentReference *doc) [self writeDocumentRef:doc data:@{@"count" : @(5.0)}]; // Skip backoff delays. - [firestore workerQueue] -> SkipDelaysForTimerId(TimerId::RetryTransaction); + [firestore workerQueue]->SkipDelaysForTimerId(TimerId::RetryTransaction); // Make 3 transactions that will all increment. int total = 3; @@ -443,7 +443,7 @@ TransactionStage get = ^(FIRTransaction *transaction, FIRDocumentReference *doc) [self writeDocumentRef:doc data:@{@"count" : @(5.0), @"other" : @"yes"}]; // Skip backoff delays. - [firestore workerQueue] -> SkipDelaysForTimerId(TimerId::RetryTransaction); + [firestore workerQueue]->SkipDelaysForTimerId(TimerId::RetryTransaction); // Make 3 transactions that will all increment. int total = 3; @@ -492,7 +492,7 @@ TransactionStage get = ^(FIRTransaction *transaction, FIRDocumentReference *doc) [self writeDocumentRef:doc1 data:@{@"count" : @(15.0)}]; // Skip backoff delays. - [firestore workerQueue] -> SkipDelaysForTimerId(TimerId::RetryTransaction); + [firestore workerQueue]->SkipDelaysForTimerId(TimerId::RetryTransaction); XCTestExpectation *expectation = [self expectationWithDescription:@"transaction"]; [firestore @@ -537,7 +537,7 @@ TransactionStage get = ^(FIRTransaction *transaction, FIRDocumentReference *doc) [self writeDocumentRef:doc data:@{@"count" : @(15.0)}]; // Skip backoff delays. - [firestore workerQueue] -> SkipDelaysForTimerId(TimerId::RetryTransaction); + [firestore workerQueue]->SkipDelaysForTimerId(TimerId::RetryTransaction); XCTestExpectation *expectation = [self expectationWithDescription:@"transaction"]; [firestore diff --git a/Firestore/core/.clang-format b/Firestore/core/.clang-format index 62293e07cd..c6701e8850 100644 --- a/Firestore/core/.clang-format +++ b/Firestore/core/.clang-format @@ -7,3 +7,4 @@ SpacesInContainerLiterals: true DerivePointerAlignment: false PointerAlignment: Left AllowShortFunctionsOnASingleLine: None +IncludeBlocks: Preserve diff --git a/Firestore/core/src/firebase/firestore/core/event_manager.cc b/Firestore/core/src/firebase/firestore/core/event_manager.cc index 25ae06391f..7c32c44705 100644 --- a/Firestore/core/src/firebase/firestore/core/event_manager.cc +++ b/Firestore/core/src/firebase/firestore/core/event_manager.cc @@ -14,9 +14,10 @@ * limitations under the License. */ +#include "Firestore/core/src/firebase/firestore/core/event_manager.h" + #include -#include "Firestore/core/src/firebase/firestore/core/event_manager.h" #include "Firestore/core/src/firebase/firestore/core/query_listener.h" #include "Firestore/core/src/firebase/firestore/core/sync_engine.h" #include "Firestore/core/src/firebase/firestore/util/hard_assert.h" diff --git a/Firestore/core/src/firebase/firestore/core/target_id_generator.cc b/Firestore/core/src/firebase/firestore/core/target_id_generator.cc index 4265247df0..a99f3ba273 100644 --- a/Firestore/core/src/firebase/firestore/core/target_id_generator.cc +++ b/Firestore/core/src/firebase/firestore/core/target_id_generator.cc @@ -15,6 +15,7 @@ */ #include "Firestore/core/src/firebase/firestore/core/target_id_generator.h" + #include "Firestore/core/src/firebase/firestore/util/hard_assert.h" using firebase::firestore::model::TargetId; diff --git a/Firestore/core/src/firebase/firestore/core/transaction_runner.cc b/Firestore/core/src/firebase/firestore/core/transaction_runner.cc index a62953d9bc..5c8b7a4f22 100644 --- a/Firestore/core/src/firebase/firestore/core/transaction_runner.cc +++ b/Firestore/core/src/firebase/firestore/core/transaction_runner.cc @@ -14,9 +14,10 @@ * limitations under the License. */ +#include "Firestore/core/src/firebase/firestore/core/transaction_runner.h" + #include -#include "Firestore/core/src/firebase/firestore/core/transaction_runner.h" #include "Firestore/core/src/firebase/firestore/remote/exponential_backoff.h" #include "absl/algorithm/container.h" diff --git a/Firestore/core/src/firebase/firestore/local/index_free_query_engine.h b/Firestore/core/src/firebase/firestore/local/index_free_query_engine.h index 71e61cea7e..df88a53b5c 100644 --- a/Firestore/core/src/firebase/firestore/local/index_free_query_engine.h +++ b/Firestore/core/src/firebase/firestore/local/index_free_query_engine.h @@ -18,7 +18,6 @@ #define FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_LOCAL_INDEX_FREE_QUERY_ENGINE_H_ #include "Firestore/core/src/firebase/firestore/local/query_engine.h" - #include "Firestore/core/src/firebase/firestore/model/model_fwd.h" namespace firebase { diff --git a/Firestore/core/src/firebase/firestore/local/leveldb_remote_document_cache.cc b/Firestore/core/src/firebase/firestore/local/leveldb_remote_document_cache.cc index 92e5dae9a7..8ee06d1449 100644 --- a/Firestore/core/src/firebase/firestore/local/leveldb_remote_document_cache.cc +++ b/Firestore/core/src/firebase/firestore/local/leveldb_remote_document_cache.cc @@ -21,7 +21,6 @@ #include #include "Firestore/Protos/nanopb/firestore/local/maybe_document.nanopb.h" - #include "Firestore/core/src/firebase/firestore/core/query.h" #include "Firestore/core/src/firebase/firestore/local/leveldb_key.h" #include "Firestore/core/src/firebase/firestore/local/leveldb_persistence.h" diff --git a/Firestore/core/src/firebase/firestore/remote/grpc_connection.h b/Firestore/core/src/firebase/firestore/remote/grpc_connection.h index 694e06a012..2d2584fff7 100644 --- a/Firestore/core/src/firebase/firestore/remote/grpc_connection.h +++ b/Firestore/core/src/firebase/firestore/remote/grpc_connection.h @@ -1,5 +1,5 @@ /* - * Copyright 2018 Google + * Copyright 2018 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,8 +22,6 @@ #include #include -#include "Firestore/core/src/firebase/firestore/util/warnings.h" - #include "Firestore/core/src/firebase/firestore/auth/token.h" #include "Firestore/core/src/firebase/firestore/core/database_info.h" #include "Firestore/core/src/firebase/firestore/remote/connectivity_monitor.h" @@ -33,10 +31,12 @@ #include "Firestore/core/src/firebase/firestore/remote/grpc_streaming_reader.h" #include "Firestore/core/src/firebase/firestore/remote/grpc_unary_call.h" #include "Firestore/core/src/firebase/firestore/util/path.h" +#include "Firestore/core/src/firebase/firestore/util/warnings.h" #include "absl/strings/string_view.h" #include "grpcpp/channel.h" #include "grpcpp/client_context.h" #include "grpcpp/completion_queue.h" + SUPPRESS_DOCUMENTATION_WARNINGS_BEGIN() #include "grpcpp/generic/generic_stub.h" SUPPRESS_END() diff --git a/Firestore/core/src/firebase/firestore/remote/grpc_root_certificates_generated.cc b/Firestore/core/src/firebase/firestore/remote/grpc_root_certificates_generated.cc index 51b2861f44..c69414b43f 100644 --- a/Firestore/core/src/firebase/firestore/remote/grpc_root_certificates_generated.cc +++ b/Firestore/core/src/firebase/firestore/remote/grpc_root_certificates_generated.cc @@ -1,9 +1,9 @@ // Copyright 2019 Google Inc. All Rights Reserved. -#include - #include "Firestore/core/src/firebase/firestore/remote/grpc_root_certificates_generated.h" +#include + namespace firebase { namespace firestore { namespace remote { diff --git a/Firestore/core/src/firebase/firestore/remote/grpc_stream.h b/Firestore/core/src/firebase/firestore/remote/grpc_stream.h index ca1c4972e4..313d471970 100644 --- a/Firestore/core/src/firebase/firestore/remote/grpc_stream.h +++ b/Firestore/core/src/firebase/firestore/remote/grpc_stream.h @@ -1,5 +1,5 @@ /* - * Copyright 2018 Google + * Copyright 2018 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,19 +25,19 @@ #include #include -#include "Firestore/core/src/firebase/firestore/util/warnings.h" - #include "Firestore/core/src/firebase/firestore/remote/grpc_call.h" #include "Firestore/core/src/firebase/firestore/remote/grpc_completion.h" #include "Firestore/core/src/firebase/firestore/remote/grpc_stream_observer.h" #include "Firestore/core/src/firebase/firestore/util/async_queue.h" #include "Firestore/core/src/firebase/firestore/util/status_fwd.h" +#include "Firestore/core/src/firebase/firestore/util/warnings.h" #include "absl/types/optional.h" #include "grpcpp/client_context.h" +#include "grpcpp/support/byte_buffer.h" + SUPPRESS_DOCUMENTATION_WARNINGS_BEGIN() #include "grpcpp/generic/generic_stub.h" SUPPRESS_END() -#include "grpcpp/support/byte_buffer.h" namespace firebase { namespace firestore { diff --git a/Firestore/core/src/firebase/firestore/remote/grpc_streaming_reader.h b/Firestore/core/src/firebase/firestore/remote/grpc_streaming_reader.h index ca662576dc..d043808625 100644 --- a/Firestore/core/src/firebase/firestore/remote/grpc_streaming_reader.h +++ b/Firestore/core/src/firebase/firestore/remote/grpc_streaming_reader.h @@ -1,5 +1,5 @@ /* - * Copyright 2018 Google + * Copyright 2018 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,16 +22,16 @@ #include #include -#include "Firestore/core/src/firebase/firestore/util/warnings.h" - #include "Firestore/core/src/firebase/firestore/remote/grpc_stream.h" #include "Firestore/core/src/firebase/firestore/remote/grpc_stream_observer.h" #include "Firestore/core/src/firebase/firestore/util/status_fwd.h" +#include "Firestore/core/src/firebase/firestore/util/warnings.h" #include "grpcpp/client_context.h" +#include "grpcpp/support/byte_buffer.h" + SUPPRESS_DOCUMENTATION_WARNINGS_BEGIN() #include "grpcpp/generic/generic_stub.h" SUPPRESS_END() -#include "grpcpp/support/byte_buffer.h" namespace firebase { namespace firestore { diff --git a/Firestore/core/src/firebase/firestore/remote/grpc_unary_call.h b/Firestore/core/src/firebase/firestore/remote/grpc_unary_call.h index 8d4f8aaa44..0ec5be4ef5 100644 --- a/Firestore/core/src/firebase/firestore/remote/grpc_unary_call.h +++ b/Firestore/core/src/firebase/firestore/remote/grpc_unary_call.h @@ -1,5 +1,5 @@ /* - * Copyright 2018 Google + * Copyright 2018 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,17 +21,17 @@ #include #include -#include "Firestore/core/src/firebase/firestore/util/warnings.h" - #include "Firestore/core/src/firebase/firestore/remote/grpc_call.h" #include "Firestore/core/src/firebase/firestore/remote/grpc_completion.h" #include "Firestore/core/src/firebase/firestore/util/async_queue.h" #include "Firestore/core/src/firebase/firestore/util/status_fwd.h" +#include "Firestore/core/src/firebase/firestore/util/warnings.h" #include "grpcpp/client_context.h" +#include "grpcpp/support/byte_buffer.h" + SUPPRESS_DOCUMENTATION_WARNINGS_BEGIN() #include "grpcpp/generic/generic_stub.h" SUPPRESS_END() -#include "grpcpp/support/byte_buffer.h" namespace firebase { namespace firestore { diff --git a/Firestore/core/src/firebase/firestore/remote/watch_stream.cc b/Firestore/core/src/firebase/firestore/remote/watch_stream.cc index 57edc0f95e..411297a0b8 100644 --- a/Firestore/core/src/firebase/firestore/remote/watch_stream.cc +++ b/Firestore/core/src/firebase/firestore/remote/watch_stream.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include - #include "Firestore/core/src/firebase/firestore/remote/watch_stream.h" +#include + #include "Firestore/core/src/firebase/firestore/model/mutation.h" #include "Firestore/core/src/firebase/firestore/nanopb/message.h" #include "Firestore/core/src/firebase/firestore/nanopb/reader.h" diff --git a/Firestore/core/src/firebase/firestore/remote/write_stream.cc b/Firestore/core/src/firebase/firestore/remote/write_stream.cc index 58965a7b22..e732f0d091 100644 --- a/Firestore/core/src/firebase/firestore/remote/write_stream.cc +++ b/Firestore/core/src/firebase/firestore/remote/write_stream.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include - #include "Firestore/core/src/firebase/firestore/remote/write_stream.h" +#include + #include "Firestore/core/src/firebase/firestore/model/mutation.h" #include "Firestore/core/src/firebase/firestore/nanopb/message.h" #include "Firestore/core/src/firebase/firestore/nanopb/reader.h" diff --git a/Firestore/core/src/firebase/firestore/util/secure_random.h b/Firestore/core/src/firebase/firestore/util/secure_random.h index f030b5e2d0..cda5fe19f7 100644 --- a/Firestore/core/src/firebase/firestore/util/secure_random.h +++ b/Firestore/core/src/firebase/firestore/util/secure_random.h @@ -18,7 +18,6 @@ #define FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_UTIL_SECURE_RANDOM_H_ #include - #include namespace firebase { diff --git a/Firestore/core/src/firebase/firestore/util/statusor.cc b/Firestore/core/src/firebase/firestore/util/statusor.cc index 586d7d6e37..0c6e0a264e 100644 --- a/Firestore/core/src/firebase/firestore/util/statusor.cc +++ b/Firestore/core/src/firebase/firestore/util/statusor.cc @@ -15,6 +15,7 @@ */ #include "Firestore/core/src/firebase/firestore/util/statusor.h" + #include "Firestore/core/src/firebase/firestore/util/hard_assert.h" namespace firebase { diff --git a/Firestore/core/test/firebase/firestore/core/field_filter_test.cc b/Firestore/core/test/firebase/firestore/core/field_filter_test.cc index 348b029f4a..810b80f8db 100644 --- a/Firestore/core/test/firebase/firestore/core/field_filter_test.cc +++ b/Firestore/core/test/firebase/firestore/core/field_filter_test.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "Firestore/core/src/firebase/firestore/core/filter.h" - #include "Firestore/core/src/firebase/firestore/core/field_filter.h" + +#include "Firestore/core/src/firebase/firestore/core/filter.h" #include "Firestore/core/test/firebase/firestore/testutil/testutil.h" #include "gtest/gtest.h" diff --git a/Firestore/core/test/firebase/firestore/core/query_listener_test.cc b/Firestore/core/test/firebase/firestore/core/query_listener_test.cc index 23987f48ac..6d057ee10a 100644 --- a/Firestore/core/test/firebase/firestore/core/query_listener_test.cc +++ b/Firestore/core/test/firebase/firestore/core/query_listener_test.cc @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "Firestore/core/src/firebase/firestore/core/query_listener.h" + #include // NOLINT(build/c++11) #include #include @@ -22,7 +24,6 @@ #include "Firestore/core/include/firebase/firestore/firestore_errors.h" #include "Firestore/core/src/firebase/firestore/core/event_listener.h" #include "Firestore/core/src/firebase/firestore/core/listen_options.h" -#include "Firestore/core/src/firebase/firestore/core/query_listener.h" #include "Firestore/core/src/firebase/firestore/core/view.h" #include "Firestore/core/src/firebase/firestore/core/view_snapshot.h" #include "Firestore/core/src/firebase/firestore/model/document_set.h" diff --git a/Firestore/core/test/firebase/firestore/core/view_snapshot_test.cc b/Firestore/core/test/firebase/firestore/core/view_snapshot_test.cc index 843ddcb8aa..c7a5012101 100644 --- a/Firestore/core/test/firebase/firestore/core/view_snapshot_test.cc +++ b/Firestore/core/test/firebase/firestore/core/view_snapshot_test.cc @@ -14,9 +14,10 @@ * limitations under the License. */ +#include "Firestore/core/src/firebase/firestore/core/view_snapshot.h" + #include -#include "Firestore/core/src/firebase/firestore/core/view_snapshot.h" #include "Firestore/core/src/firebase/firestore/model/document_set.h" #include "Firestore/core/test/firebase/firestore/testutil/testutil.h" #include "gtest/gtest.h" diff --git a/Firestore/core/test/firebase/firestore/core/view_test.cc b/Firestore/core/test/firebase/firestore/core/view_test.cc index 600d2cf111..3062cbc774 100644 --- a/Firestore/core/test/firebase/firestore/core/view_test.cc +++ b/Firestore/core/test/firebase/firestore/core/view_test.cc @@ -14,13 +14,14 @@ * limitations under the License. */ +#include "Firestore/core/src/firebase/firestore/core/view.h" + #include #include #include #include "Firestore/core/src/firebase/firestore/core/field_filter.h" #include "Firestore/core/src/firebase/firestore/core/filter.h" -#include "Firestore/core/src/firebase/firestore/core/view.h" #include "Firestore/core/src/firebase/firestore/core/view_snapshot.h" #include "Firestore/core/src/firebase/firestore/model/document_key_set.h" #include "Firestore/core/src/firebase/firestore/model/document_set.h" diff --git a/Firestore/core/test/firebase/firestore/immutable/array_sorted_map_test.cc b/Firestore/core/test/firebase/firestore/immutable/array_sorted_map_test.cc index 956c866ee4..f70b030b9d 100644 --- a/Firestore/core/test/firebase/firestore/immutable/array_sorted_map_test.cc +++ b/Firestore/core/test/firebase/firestore/immutable/array_sorted_map_test.cc @@ -21,7 +21,6 @@ #include #include "Firestore/core/src/firebase/firestore/util/secure_random.h" - #include "Firestore/core/test/firebase/firestore/immutable/testing.h" #include "gtest/gtest.h" diff --git a/Firestore/core/test/firebase/firestore/immutable/sorted_map_test.cc b/Firestore/core/test/firebase/firestore/immutable/sorted_map_test.cc index 1ead22afee..f431521f11 100644 --- a/Firestore/core/test/firebase/firestore/immutable/sorted_map_test.cc +++ b/Firestore/core/test/firebase/firestore/immutable/sorted_map_test.cc @@ -32,7 +32,6 @@ #include "Firestore/core/src/firebase/firestore/immutable/array_sorted_map.h" #include "Firestore/core/src/firebase/firestore/immutable/tree_sorted_map.h" #include "Firestore/core/src/firebase/firestore/util/secure_random.h" - #include "Firestore/core/test/firebase/firestore/immutable/testing.h" #include "gtest/gtest.h" diff --git a/Firestore/core/test/firebase/firestore/local/leveldb_key_test.cc b/Firestore/core/test/firebase/firestore/local/leveldb_key_test.cc index 968f345ef0..9eda3b6b67 100644 --- a/Firestore/core/test/firebase/firestore/local/leveldb_key_test.cc +++ b/Firestore/core/test/firebase/firestore/local/leveldb_key_test.cc @@ -15,6 +15,7 @@ */ #include "Firestore/core/src/firebase/firestore/local/leveldb_key.h" + #include "Firestore/core/src/firebase/firestore/model/maybe_document.h" #include "Firestore/core/src/firebase/firestore/util/string_util.h" #include "Firestore/core/test/firebase/firestore/testutil/testutil.h" diff --git a/Firestore/core/test/firebase/firestore/local/leveldb_migrations_test.cc b/Firestore/core/test/firebase/firestore/local/leveldb_migrations_test.cc index 6f700f4448..e6ec3e00c9 100644 --- a/Firestore/core/test/firebase/firestore/local/leveldb_migrations_test.cc +++ b/Firestore/core/test/firebase/firestore/local/leveldb_migrations_test.cc @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "Firestore/core/src/firebase/firestore/local/leveldb_migrations.h" + #include #include #include @@ -21,7 +23,6 @@ #include "Firestore/Protos/nanopb/firestore/local/mutation.nanopb.h" #include "Firestore/core/src/firebase/firestore/local/leveldb_key.h" -#include "Firestore/core/src/firebase/firestore/local/leveldb_migrations.h" #include "Firestore/core/src/firebase/firestore/local/leveldb_target_cache.h" #include "Firestore/core/src/firebase/firestore/nanopb/message.h" #include "Firestore/core/src/firebase/firestore/util/ordered_code.h" diff --git a/Firestore/core/test/firebase/firestore/local/leveldb_mutation_queue_test.cc b/Firestore/core/test/firebase/firestore/local/leveldb_mutation_queue_test.cc index e53c3ac700..6e5decbc9d 100644 --- a/Firestore/core/test/firebase/firestore/local/leveldb_mutation_queue_test.cc +++ b/Firestore/core/test/firebase/firestore/local/leveldb_mutation_queue_test.cc @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "Firestore/core/src/firebase/firestore/local/leveldb_mutation_queue.h" + #include #include @@ -21,7 +23,6 @@ #include "Firestore/Protos/nanopb/google/protobuf/empty.nanopb.h" #include "Firestore/core/src/firebase/firestore/auth/user.h" #include "Firestore/core/src/firebase/firestore/local/leveldb_key.h" -#include "Firestore/core/src/firebase/firestore/local/leveldb_mutation_queue.h" #include "Firestore/core/src/firebase/firestore/local/leveldb_persistence.h" #include "Firestore/core/src/firebase/firestore/local/reference_set.h" #include "Firestore/core/src/firebase/firestore/nanopb/byte_string.h" diff --git a/Firestore/core/test/firebase/firestore/local/leveldb_remote_document_cache_test.cc b/Firestore/core/test/firebase/firestore/local/leveldb_remote_document_cache_test.cc index 5f26abb0d0..62ad78116e 100644 --- a/Firestore/core/test/firebase/firestore/local/leveldb_remote_document_cache_test.cc +++ b/Firestore/core/test/firebase/firestore/local/leveldb_remote_document_cache_test.cc @@ -14,12 +14,13 @@ * limitations under the License. */ +#include "Firestore/core/src/firebase/firestore/local/leveldb_remote_document_cache.h" + #include #include #include #include "Firestore/core/src/firebase/firestore/local/leveldb_persistence.h" -#include "Firestore/core/src/firebase/firestore/local/leveldb_remote_document_cache.h" #include "Firestore/core/src/firebase/firestore/local/remote_document_cache.h" #include "Firestore/core/src/firebase/firestore/util/ordered_code.h" #include "Firestore/core/test/firebase/firestore/local/persistence_testing.h" diff --git a/Firestore/core/test/firebase/firestore/local/leveldb_target_cache_test.cc b/Firestore/core/test/firebase/firestore/local/leveldb_target_cache_test.cc index a9a59dc431..39a88a0d48 100644 --- a/Firestore/core/test/firebase/firestore/local/leveldb_target_cache_test.cc +++ b/Firestore/core/test/firebase/firestore/local/leveldb_target_cache_test.cc @@ -15,6 +15,7 @@ */ #include "Firestore/core/src/firebase/firestore/local/leveldb_target_cache.h" + #include "Firestore/core/include/firebase/firestore/timestamp.h" #include "Firestore/core/src/firebase/firestore/local/leveldb_persistence.h" #include "Firestore/core/src/firebase/firestore/local/persistence.h" diff --git a/Firestore/core/test/firebase/firestore/local/leveldb_util_test.cc b/Firestore/core/test/firebase/firestore/local/leveldb_util_test.cc index 1f4cfa3718..5e44240c67 100644 --- a/Firestore/core/test/firebase/firestore/local/leveldb_util_test.cc +++ b/Firestore/core/test/firebase/firestore/local/leveldb_util_test.cc @@ -15,8 +15,8 @@ */ #include "Firestore/core/src/firebase/firestore/local/leveldb_util.h" -#include "Firestore/core/src/firebase/firestore/util/status.h" +#include "Firestore/core/src/firebase/firestore/util/status.h" #include "gtest/gtest.h" namespace firebase { diff --git a/Firestore/core/test/firebase/firestore/local/memory_remote_document_cache_test.cc b/Firestore/core/test/firebase/firestore/local/memory_remote_document_cache_test.cc index 98601c078a..a1b8bb0ffe 100644 --- a/Firestore/core/test/firebase/firestore/local/memory_remote_document_cache_test.cc +++ b/Firestore/core/test/firebase/firestore/local/memory_remote_document_cache_test.cc @@ -14,10 +14,11 @@ * limitations under the License. */ +#include "Firestore/core/src/firebase/firestore/local/memory_remote_document_cache.h" + #include #include "Firestore/core/src/firebase/firestore/local/memory_persistence.h" -#include "Firestore/core/src/firebase/firestore/local/memory_remote_document_cache.h" #include "Firestore/core/src/firebase/firestore/local/reference_delegate.h" #include "Firestore/core/src/firebase/firestore/local/remote_document_cache.h" #include "Firestore/core/test/firebase/firestore/local/persistence_testing.h" diff --git a/Firestore/core/test/firebase/firestore/local/reference_set_test.cc b/Firestore/core/test/firebase/firestore/local/reference_set_test.cc index 7c7a98b9a3..b50da5bf0a 100644 --- a/Firestore/core/test/firebase/firestore/local/reference_set_test.cc +++ b/Firestore/core/test/firebase/firestore/local/reference_set_test.cc @@ -18,7 +18,6 @@ #include "Firestore/core/src/firebase/firestore/model/document_key.h" #include "Firestore/core/test/firebase/firestore/testutil/testutil.h" - #include "gtest/gtest.h" namespace firebase { diff --git a/Firestore/core/test/firebase/firestore/model/document_key_test.cc b/Firestore/core/test/firebase/firestore/model/document_key_test.cc index 0c88b1be00..daede8b46a 100644 --- a/Firestore/core/test/firebase/firestore/model/document_key_test.cc +++ b/Firestore/core/test/firebase/firestore/model/document_key_test.cc @@ -14,12 +14,13 @@ * limitations under the License. */ +#include "Firestore/core/src/firebase/firestore/model/document_key.h" + #include #include #include #include -#include "Firestore/core/src/firebase/firestore/model/document_key.h" #include "Firestore/core/src/firebase/firestore/model/resource_path.h" #include "Firestore/core/src/firebase/firestore/util/comparison.h" #include "Firestore/core/test/firebase/firestore/testutil/testutil.h" diff --git a/Firestore/core/test/firebase/firestore/model/document_test.cc b/Firestore/core/test/firebase/firestore/model/document_test.cc index 584ffe3de4..7ef18ffd56 100644 --- a/Firestore/core/test/firebase/firestore/model/document_test.cc +++ b/Firestore/core/test/firebase/firestore/model/document_test.cc @@ -20,7 +20,6 @@ #include "Firestore/core/src/firebase/firestore/model/field_value.h" #include "Firestore/core/src/firebase/firestore/model/unknown_document.h" #include "Firestore/core/test/firebase/firestore/testutil/testutil.h" - #include "absl/strings/string_view.h" #include "gtest/gtest.h" diff --git a/Firestore/core/test/firebase/firestore/model/no_document_test.cc b/Firestore/core/test/firebase/firestore/model/no_document_test.cc index eba475c30c..93fd3d608e 100644 --- a/Firestore/core/test/firebase/firestore/model/no_document_test.cc +++ b/Firestore/core/test/firebase/firestore/model/no_document_test.cc @@ -17,7 +17,6 @@ #include "Firestore/core/src/firebase/firestore/model/no_document.h" #include "Firestore/core/src/firebase/firestore/model/unknown_document.h" - #include "absl/strings/string_view.h" #include "gtest/gtest.h" diff --git a/Firestore/core/test/firebase/firestore/model/precondition_test.cc b/Firestore/core/test/firebase/firestore/model/precondition_test.cc index 26d71c07d2..4e96e634cc 100644 --- a/Firestore/core/test/firebase/firestore/model/precondition_test.cc +++ b/Firestore/core/test/firebase/firestore/model/precondition_test.cc @@ -20,7 +20,6 @@ #include "Firestore/core/src/firebase/firestore/model/no_document.h" #include "Firestore/core/src/firebase/firestore/model/snapshot_version.h" #include "Firestore/core/test/firebase/firestore/testutil/testutil.h" - #include "gtest/gtest.h" namespace firebase { diff --git a/Firestore/core/test/firebase/firestore/nanopb/message_test.cc b/Firestore/core/test/firebase/firestore/nanopb/message_test.cc index 95931ef497..8dba7cb5cb 100644 --- a/Firestore/core/test/firebase/firestore/nanopb/message_test.cc +++ b/Firestore/core/test/firebase/firestore/nanopb/message_test.cc @@ -14,12 +14,13 @@ * limitations under the License. */ +#include "Firestore/core/src/firebase/firestore/nanopb/message.h" + #include #include #include #include "Firestore/Protos/nanopb/google/firestore/v1/firestore.nanopb.h" -#include "Firestore/core/src/firebase/firestore/nanopb/message.h" #include "Firestore/core/src/firebase/firestore/nanopb/nanopb_util.h" #include "Firestore/core/src/firebase/firestore/nanopb/writer.h" #include "Firestore/core/src/firebase/firestore/remote/grpc_nanopb.h" diff --git a/Firestore/core/test/firebase/firestore/remote/datastore_test.cc b/Firestore/core/test/firebase/firestore/remote/datastore_test.cc index 30087332a8..a9c19f9fef 100644 --- a/Firestore/core/test/firebase/firestore/remote/datastore_test.cc +++ b/Firestore/core/test/firebase/firestore/remote/datastore_test.cc @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "Firestore/core/src/firebase/firestore/remote/datastore.h" + #include #include #include @@ -23,7 +25,6 @@ #include "Firestore/core/src/firebase/firestore/model/mutation.h" #include "Firestore/core/src/firebase/firestore/nanopb/message.h" #include "Firestore/core/src/firebase/firestore/nanopb/nanopb_util.h" -#include "Firestore/core/src/firebase/firestore/remote/datastore.h" #include "Firestore/core/src/firebase/firestore/remote/grpc_nanopb.h" #include "Firestore/core/src/firebase/firestore/remote/serializer.h" #include "Firestore/core/src/firebase/firestore/util/async_queue.h" diff --git a/Firestore/core/test/firebase/firestore/remote/exponential_backoff_test.cc b/Firestore/core/test/firebase/firestore/remote/exponential_backoff_test.cc index 958a7969b3..27fe5db269 100644 --- a/Firestore/core/test/firebase/firestore/remote/exponential_backoff_test.cc +++ b/Firestore/core/test/firebase/firestore/remote/exponential_backoff_test.cc @@ -14,9 +14,10 @@ * limitations under the License. */ +#include "Firestore/core/src/firebase/firestore/remote/exponential_backoff.h" + #include // NOLINT(build/c++11) -#include "Firestore/core/src/firebase/firestore/remote/exponential_backoff.h" #include "Firestore/core/src/firebase/firestore/util/async_queue.h" #include "Firestore/core/src/firebase/firestore/util/executor.h" #include "Firestore/core/test/firebase/firestore/testutil/async_testing.h" diff --git a/Firestore/core/test/firebase/firestore/remote/grpc_connection_test.cc b/Firestore/core/test/firebase/firestore/remote/grpc_connection_test.cc index d037ecd652..36b61a58c1 100644 --- a/Firestore/core/test/firebase/firestore/remote/grpc_connection_test.cc +++ b/Firestore/core/test/firebase/firestore/remote/grpc_connection_test.cc @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "Firestore/core/src/firebase/firestore/remote/grpc_connection.h" + #include #include #include @@ -21,7 +23,6 @@ #include "Firestore/core/src/firebase/firestore/auth/token.h" #include "Firestore/core/src/firebase/firestore/remote/connectivity_monitor.h" -#include "Firestore/core/src/firebase/firestore/remote/grpc_connection.h" #include "Firestore/core/src/firebase/firestore/util/async_queue.h" #include "Firestore/core/src/firebase/firestore/util/status.h" #include "Firestore/core/src/firebase/firestore/util/statusor.h" diff --git a/Firestore/core/test/firebase/firestore/remote/grpc_unary_call_test.cc b/Firestore/core/test/firebase/firestore/remote/grpc_unary_call_test.cc index 4e82485a0d..61daab674e 100644 --- a/Firestore/core/test/firebase/firestore/remote/grpc_unary_call_test.cc +++ b/Firestore/core/test/firebase/firestore/remote/grpc_unary_call_test.cc @@ -14,11 +14,12 @@ * limitations under the License. */ +#include "Firestore/core/src/firebase/firestore/remote/grpc_unary_call.h" + #include #include #include "Firestore/core/src/firebase/firestore/remote/connectivity_monitor.h" -#include "Firestore/core/src/firebase/firestore/remote/grpc_unary_call.h" #include "Firestore/core/src/firebase/firestore/util/async_queue.h" #include "Firestore/core/src/firebase/firestore/util/status.h" #include "Firestore/core/src/firebase/firestore/util/statusor.h" diff --git a/Firestore/core/test/firebase/firestore/remote/remote_event_test.cc b/Firestore/core/test/firebase/firestore/remote/remote_event_test.cc index d6fc1545ad..953d3c5d3e 100644 --- a/Firestore/core/test/firebase/firestore/remote/remote_event_test.cc +++ b/Firestore/core/test/firebase/firestore/remote/remote_event_test.cc @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "Firestore/core/src/firebase/firestore/remote/remote_event.h" + #include #include #include @@ -24,7 +26,6 @@ #include "Firestore/core/src/firebase/firestore/model/no_document.h" #include "Firestore/core/src/firebase/firestore/model/types.h" #include "Firestore/core/src/firebase/firestore/remote/existence_filter.h" -#include "Firestore/core/src/firebase/firestore/remote/remote_event.h" #include "Firestore/core/src/firebase/firestore/remote/watch_change.h" #include "Firestore/core/test/firebase/firestore/remote/fake_target_metadata_provider.h" #include "Firestore/core/test/firebase/firestore/testutil/testutil.h" diff --git a/Firestore/core/test/firebase/firestore/remote/serializer_test.cc b/Firestore/core/test/firebase/firestore/remote/serializer_test.cc index 3b705dd4f2..c6816018bf 100644 --- a/Firestore/core/test/firebase/firestore/remote/serializer_test.cc +++ b/Firestore/core/test/firebase/firestore/remote/serializer_test.cc @@ -29,6 +29,7 @@ #include #include + #include #include #include diff --git a/Firestore/core/test/firebase/firestore/remote/stream_test.cc b/Firestore/core/test/firebase/firestore/remote/stream_test.cc index 8e0371e296..fdc75a18b4 100644 --- a/Firestore/core/test/firebase/firestore/remote/stream_test.cc +++ b/Firestore/core/test/firebase/firestore/remote/stream_test.cc @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "Firestore/core/src/firebase/firestore/remote/stream.h" + #include #include #include @@ -24,7 +26,6 @@ #include "Firestore/core/src/firebase/firestore/remote/grpc_completion.h" #include "Firestore/core/src/firebase/firestore/remote/grpc_connection.h" #include "Firestore/core/src/firebase/firestore/remote/grpc_stream.h" -#include "Firestore/core/src/firebase/firestore/remote/stream.h" #include "Firestore/core/src/firebase/firestore/util/async_queue.h" #include "Firestore/core/test/firebase/firestore/testutil/async_testing.h" #include "Firestore/core/test/firebase/firestore/util/create_noop_connectivity_monitor.h" diff --git a/Firestore/core/test/firebase/firestore/testutil/status_testing.h b/Firestore/core/test/firebase/firestore/testutil/status_testing.h index a67bb2c997..bef57dc420 100644 --- a/Firestore/core/test/firebase/firestore/testutil/status_testing.h +++ b/Firestore/core/test/firebase/firestore/testutil/status_testing.h @@ -19,7 +19,6 @@ #include "Firestore/core/include/firebase/firestore/firestore_errors.h" #include "Firestore/core/src/firebase/firestore/util/status_fwd.h" - #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/Firestore/core/test/firebase/firestore/util/async_queue_test.h b/Firestore/core/test/firebase/firestore/util/async_queue_test.h index 669e9f8e8a..20eef4b648 100644 --- a/Firestore/core/test/firebase/firestore/util/async_queue_test.h +++ b/Firestore/core/test/firebase/firestore/util/async_queue_test.h @@ -1,5 +1,5 @@ /* - * Copyright 2018 Google + * Copyright 2018 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,12 +17,12 @@ #ifndef FIRESTORE_CORE_TEST_FIREBASE_FIRESTORE_UTIL_ASYNC_QUEUE_TEST_H_ #define FIRESTORE_CORE_TEST_FIREBASE_FIRESTORE_UTIL_ASYNC_QUEUE_TEST_H_ +#include "Firestore/core/src/firebase/firestore/util/async_queue.h" + #include -#include "gtest/gtest.h" - -#include "Firestore/core/src/firebase/firestore/util/async_queue.h" #include "Firestore/core/test/firebase/firestore/testutil/async_testing.h" +#include "gtest/gtest.h" namespace firebase { namespace firestore { diff --git a/Firestore/core/test/firebase/firestore/util/executor_std_test.cc b/Firestore/core/test/firebase/firestore/util/executor_std_test.cc index 17bf8bf976..ba0d1c1874 100644 --- a/Firestore/core/test/firebase/firestore/util/executor_std_test.cc +++ b/Firestore/core/test/firebase/firestore/util/executor_std_test.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "Firestore/core/test/firebase/firestore/util/executor_test.h" +#include "Firestore/core/src/firebase/firestore/util/executor_std.h" #include // NOLINT(build/c++11) #include @@ -22,9 +22,9 @@ #include #include // NOLINT(build/c++11) -#include "Firestore/core/src/firebase/firestore/util/executor_std.h" #include "Firestore/core/test/firebase/firestore/testutil/async_testing.h" #include "Firestore/core/test/firebase/firestore/testutil/time_testing.h" +#include "Firestore/core/test/firebase/firestore/util/executor_test.h" #include "absl/memory/memory.h" #include "gtest/gtest.h" diff --git a/Firestore/core/test/firebase/firestore/util/executor_test.h b/Firestore/core/test/firebase/firestore/util/executor_test.h index bd9f1cbaf8..a0a2ef5cc4 100644 --- a/Firestore/core/test/firebase/firestore/util/executor_test.h +++ b/Firestore/core/test/firebase/firestore/util/executor_test.h @@ -19,10 +19,9 @@ #include -#include "gtest/gtest.h" - #include "Firestore/core/src/firebase/firestore/util/executor.h" #include "Firestore/core/test/firebase/firestore/testutil/async_testing.h" +#include "gtest/gtest.h" namespace firebase { namespace firestore { diff --git a/Firestore/core/test/firebase/firestore/util/hard_assert_test.cc b/Firestore/core/test/firebase/firestore/util/hard_assert_test.cc index 1c17189c73..cd063da688 100644 --- a/Firestore/core/test/firebase/firestore/util/hard_assert_test.cc +++ b/Firestore/core/test/firebase/firestore/util/hard_assert_test.cc @@ -14,9 +14,10 @@ * limitations under the License. */ +#include "Firestore/core/src/firebase/firestore/util/hard_assert.h" + #include -#include "Firestore/core/src/firebase/firestore/util/hard_assert.h" #include "gtest/gtest.h" namespace firebase { diff --git a/Firestore/core/test/firebase/firestore/util/statusor_test.cc b/Firestore/core/test/firebase/firestore/util/statusor_test.cc index 555319c7fd..4b47265bae 100644 --- a/Firestore/core/test/firebase/firestore/util/statusor_test.cc +++ b/Firestore/core/test/firebase/firestore/util/statusor_test.cc @@ -17,6 +17,7 @@ // Unit tests for StatusOr #include "Firestore/core/src/firebase/firestore/util/statusor.h" + #include "gtest/gtest.h" namespace firebase { diff --git a/Firestore/core/test/firebase/firestore/util/to_string_test.cc b/Firestore/core/test/firebase/firestore/util/to_string_test.cc index 2d22f4388f..b64ebe1f63 100644 --- a/Firestore/core/test/firebase/firestore/util/to_string_test.cc +++ b/Firestore/core/test/firebase/firestore/util/to_string_test.cc @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "Firestore/core/src/firebase/firestore/util/to_string.h" + #include #include #include @@ -25,9 +27,7 @@ #include "Firestore/core/src/firebase/firestore/immutable/sorted_map.h" #include "Firestore/core/src/firebase/firestore/immutable/sorted_set.h" #include "Firestore/core/src/firebase/firestore/model/document_key.h" -#include "Firestore/core/src/firebase/firestore/util/to_string.h" #include "absl/types/optional.h" - #include "gtest/gtest.h" namespace firebase { diff --git a/README.md b/README.md index 36c083db34..6c777a7a45 100644 --- a/README.md +++ b/README.md @@ -123,7 +123,7 @@ Travis will verify that any code changes are done in a style compliant way. Inst These commands will get the right versions: ``` -brew upgrade https://raw.githubusercontent.com/Homebrew/homebrew-core/e3496d9/Formula/clang-format.rb +brew upgrade https://raw.githubusercontent.com/Homebrew/homebrew-core/c6f1cbd/Formula/clang-format.rb brew upgrade https://raw.githubusercontent.com/Homebrew/homebrew-core/c13eda8/Formula/swiftformat.rb ``` diff --git a/scripts/binary_to_array.py b/scripts/binary_to_array.py index 2eaf78d4b9..3101806f9f 100755 --- a/scripts/binary_to_array.py +++ b/scripts/binary_to_array.py @@ -159,9 +159,9 @@ def source(namespaces, array_name, array_size_name, fileid, filename, data.extend([ "// Copyright 2019 Google Inc. All Rights Reserved.", "", - "#include ", - "", "#include \"%s\"" % include_name, + "", + "#include ", "" ]) if namespaces: diff --git a/scripts/setup_check.sh b/scripts/setup_check.sh index d6393da60c..7c4d0176cf 100755 --- a/scripts/setup_check.sh +++ b/scripts/setup_check.sh @@ -21,7 +21,7 @@ set -euo pipefail export HOMEBREW_NO_ANALYTICS=1 export HOMEBREW_NO_AUTO_UPDATE=1 -brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/e3496d9/Formula/clang-format.rb +brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/c6f1cbd/Formula/clang-format.rb brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/c13eda8/Formula/swiftformat.rb pip install flake8 diff --git a/scripts/style.sh b/scripts/style.sh index ef4d0a165c..5908245eb9 100755 --- a/scripts/style.sh +++ b/scripts/style.sh @@ -39,7 +39,7 @@ version="${version/ (*)/}" version="${version/.*/}" case "$version" in - 8) + 9) ;; google3-trunk) echo "Please use a publicly released clang-format; a recent LLVM release" @@ -48,9 +48,9 @@ case "$version" in exit 1 ;; *) - echo "Please upgrade to clang-format version 8." + echo "Please upgrade to clang-format version 9." echo "If it's installed via homebrew you can run:" - echo "brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/e3496d9/Formula/clang-format.rb" + echo "brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/c6f1cbd/Formula/clang-format.rb" exit 1 ;; esac @@ -67,8 +67,8 @@ if [[ "$system" == "Darwin" ]]; then # travis runs 0.35.7. We may need to be more strict about version checks in # the future if we run into different versions making incompatible format # changes. - if [[ ! "$version" =~ ^0.3[5-9] && ! "$version" =~ ^0.[4-9] ]]; then - echo "Version $version installed. Please upgrade to at least swiftformat 0.35.0" + if [[ ! "$version" =~ ^0.[4-9] ]]; then + echo "Version $version installed. Please upgrade to at least swiftformat 0.44.6" echo "If it's installed via homebrew you can run: brew upgrade swiftformat" exit 1 fi