Skip to content
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

Jump to bottom

Move Timestamp class from Firestore to Firebase Core #13221

Merged
merged 8 commits into from
Jul 12, 2024
Merged

Move Timestamp class from Firestore to Firebase Core #13221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
21d16d3
Move timestamp API file
cherylEnkidu May 27, 2024
39be5aa
move files
cherylEnkidu May 27, 2024
0d94e75
Fix brokenTests
cherylEnkidu May 28, 2024
52c1845
fix including files
cherylEnkidu May 28, 2024
efe8cb9
change includes
cherylEnkidu May 29, 2024
15140a1
Add changelog
cherylEnkidu Jul 3, 2024
9dc30c5
merge master branch
cherylEnkidu Jul 12, 2024
eb79b0b
Merge branch 'master' into cheryllin/moveTimestamp
cherylEnkidu Jul 12, 2024
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
2 changes: 2 additions & 0 deletions FirebaseCore/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
XCFrameworks.
- Update underlying FIRLogger implementation from `asl` to `os_log`.
- Remove `FIRLoggerForceSTDERR` configuration option.
- [changed] Move `Timestamp` class into `FirebaseCore`. `FirebaseFirestore.Timestamp`
was changed to `FirebaseCore.Timestamp`. (#13221)
Comment on lines +20 to +21
Copy link
Member

@ncooke3 ncooke3 Jul 16, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

FirebaseFirestore.Timestamp was changed to FirebaseCore.Timestamp.

@paulb777 – This is a small break, but I believe we could add:

@_exported import class FirebaseCore.Timestamp

to selectively import and re-export that class so it stills appears under the FirebaseFirestore namespace (like what was done with Swift extensions post-consolidation). This would make the move non-breaking.

Copy link
Member

Choose a reason for hiding this comment

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

SGTM. It should minimize the break.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Should I create a new PR to add this line in FirebaseFirestoreSwift.swift or there is a pr working in progress?

Copy link
Member

Choose a reason for hiding this comment

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

@cherylEnkidu, sure! I haven't started anything. For all the files in this PR where you needed to add import FirebaseCore, I think you should be able to just replace those with @_exported import class FirebaseCore.Timestamp.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Got it, I will send you a PR shortly.


# Firebase 10.25.0
- [changed] Firebase now requires at least Xcode 15.2. See
Expand Down
2 changes: 1 addition & 1 deletion Firestore/Source/API/FIRTimestamp.m → FirebaseCore/Sources/FIRTimestamp.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 "Firestore/Source/API/FIRTimestamp+Internal.h"
#import "FirebaseCore/Sources/FIRTimestampInternal.h"

NS_ASSUME_NONNULL_BEGIN

Expand Down
2 changes: 1 addition & 1 deletion Firestore/Source/API/FIRTimestamp+Internal.h → FirebaseCore/Sources/FIRTimestampInternal.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 "FIRTimestamp.h"
#import "FirebaseCore/Sources/Public/FirebaseCore/FIRTimestamp.h"

NS_ASSUME_NONNULL_BEGIN

Expand Down
0 ...e/Public/FirebaseFirestore/FIRTimestamp.h → ...ources/Public/FirebaseCore/FIRTimestamp.h
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions FirebaseCore/Sources/Public/FirebaseCore/FirebaseCore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@
#import "FIRConfiguration.h"
#import "FIRLoggerLevel.h"
#import "FIROptions.h"
#import "FIRTimestamp.h"
#import "FIRVersion.h"
2 changes: 1 addition & 1 deletion ...tore/Example/Tests/API/FIRTimestampTest.m → FirebaseCore/Tests/Unit/FIRTimestampTest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#import <XCTest/XCTest.h>

#import "Firestore/Source/API/FIRTimestamp+Internal.h"
#import "FirebaseCore/Sources/FIRTimestampInternal.h"

NS_ASSUME_NONNULL_BEGIN

Expand Down
15 changes: 0 additions & 15 deletions FirebaseFirestoreInternal/FirebaseFirestore/FIRTimestamp.h
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions Firestore/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
instructions.
- [changed] **Breaking change**: LRU Garbage Collector is now the default GC for memory cache, eager GC is now
opt-in (via MemoryCacheSettings(garbageCollectorSettings: MemoryEagerGCSettings())) instead of the default one.
- [changed] Move `Timestamp` class into `FirebaseCore`. `FirebaseFirestore.Timestamp`
was changed to `FirebaseCore.Timestamp`. (#13221)

# 10.25.0
- [fixed] Allow blob of data with zero length. (#11773, #12620)
Expand Down
14 changes: 0 additions & 14 deletions Firestore/Example/Firestore.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@
01D9704C3AAA13FAD2F962AB /* statusor_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 54A0352D20A3B3D7003E0143 /* statusor_test.cc */; };
020AFD89BB40E5175838BB76 /* local_serializer_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = F8043813A5D16963EC02B182 /* local_serializer_test.cc */; };
022BA1619A576F6818B212C5 /* remote_store_spec_test.json in Resources */ = {isa = PBXBuildFile; fileRef = 3B843E4A1F3930A400548890 /* remote_store_spec_test.json */; };
02B83EB79020AE6CBA60A410 /* FIRTimestampTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B65D34A7203C99090076A5E1 /* FIRTimestampTest.m */; };
02C953A7B0FA5EF87DB0361A /* FSTIntegrationTestCase.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5491BC711FB44593008B3588 /* FSTIntegrationTestCase.mm */; };
02EB33CC2590E1484D462912 /* annotations.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 618BBE9520B89AAC00B5BCE7 /* annotations.pb.cc */; };
035034AB3797D1E5E0112EC3 /* Validation_BloomFilterTest_MD5_1_1_bloom_filter_proto.json in Resources */ = {isa = PBXBuildFile; fileRef = 3FDD0050CA08C8302400C5FB /* Validation_BloomFilterTest_MD5_1_1_bloom_filter_proto.json */; };
035DE410628A8F804F6F2790 /* target_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 526D755F65AC676234F57125 /* target_test.cc */; };
03AEB9E07A605AE1B5827548 /* field_index_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = BF76A8DA34B5B67B4DD74666 /* field_index_test.cc */; };
041CF73F67F6A22BF317625A /* FIRTimestampTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B65D34A7203C99090076A5E1 /* FIRTimestampTest.m */; };
043C7B3DECB94F69F28BB798 /* Validation_BloomFilterTest_MD5_5000_01_bloom_filter_proto.json in Resources */ = {isa = PBXBuildFile; fileRef = 57F8EE51B5EFC9FAB185B66C /* Validation_BloomFilterTest_MD5_5000_01_bloom_filter_proto.json */; };
0455FC6E2A281BD755FD933A /* precondition_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 549CCA5520A36E1F00BCEB75 /* precondition_test.cc */; };
04887E378B39FB86A8A5B52B /* leveldb_local_store_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5FF903AEFA7A3284660FA4C5 /* leveldb_local_store_test.cc */; };
Expand Down Expand Up @@ -359,7 +357,6 @@
35FEB53E165518C0DE155CB0 /* target_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 526D755F65AC676234F57125 /* target_test.cc */; };
360EB1D691F9C19A21D0916F /* Validation_BloomFilterTest_MD5_500_0001_bloom_filter_proto.json in Resources */ = {isa = PBXBuildFile; fileRef = D22D4C211AC32E4F8B4883DA /* Validation_BloomFilterTest_MD5_500_0001_bloom_filter_proto.json */; };
36999FC1F37930E8C9B6DA25 /* stream_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5B5414D28802BC76FDADABD6 /* stream_test.cc */; };
36E174A66C323891AEA16A2A /* FIRTimestampTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B65D34A7203C99090076A5E1 /* FIRTimestampTest.m */; };
36FD4CE79613D18BC783C55B /* string_apple_test.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0EE5300F8233D14025EF0456 /* string_apple_test.mm */; };
37286D731E432CB873354357 /* remote_event_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 584AE2C37A55B408541A6FF3 /* remote_event_test.cc */; };
37461AF1ACC2E64DF1709736 /* Validation_BloomFilterTest_MD5_1_01_bloom_filter_proto.json in Resources */ = {isa = PBXBuildFile; fileRef = 0D964D4936953635AC7E0834 /* Validation_BloomFilterTest_MD5_1_01_bloom_filter_proto.json */; };
Expand Down Expand Up @@ -1202,7 +1199,6 @@
B60BAF9ED610F9D4E245EEB3 /* Validation_BloomFilterTest_MD5_5000_1_membership_test_result.json in Resources */ = {isa = PBXBuildFile; fileRef = 1A7D48A017ECB54FD381D126 /* Validation_BloomFilterTest_MD5_5000_1_membership_test_result.json */; };
B6152AD7202A53CB000E5744 /* document_key_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = B6152AD5202A5385000E5744 /* document_key_test.cc */; };
B63D84B2980C7DEE7E6E4708 /* view_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = C7429071B33BDF80A7FA2F8A /* view_test.cc */; };
B65D34A9203C995B0076A5E1 /* FIRTimestampTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B65D34A7203C99090076A5E1 /* FIRTimestampTest.m */; };
B667366CB06893DFF472902E /* field_transform_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7515B47C92ABEEC66864B55C /* field_transform_test.cc */; };
B686F2AF2023DDEE0028D6BE /* field_path_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = B686F2AD2023DDB20028D6BE /* field_path_test.cc */; };
B686F2B22025000D0028D6BE /* resource_path_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = B686F2B02024FFD70028D6BE /* resource_path_test.cc */; };
Expand Down Expand Up @@ -1338,7 +1334,6 @@
CBDCA7829AAFEB4853C15517 /* bundle_serializer_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = B5C2A94EE24E60543F62CC35 /* bundle_serializer_test.cc */; };
CC94A33318F983907E9ED509 /* resume_token_spec_test.json in Resources */ = {isa = PBXBuildFile; fileRef = 54DA12A41F315EE100DD57A1 /* resume_token_spec_test.json */; };
CCE596E8654A4D2EEA75C219 /* index_backfiller_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 1F50E872B3F117A674DA8E94 /* index_backfiller_test.cc */; };
CD0AA9E5D83C00CAAE7C2F67 /* FIRTimestampTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B65D34A7203C99090076A5E1 /* FIRTimestampTest.m */; };
CD1E2F356FC71D7E74FCD26C /* leveldb_remote_document_cache_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0840319686A223CC4AD3FAB1 /* leveldb_remote_document_cache_test.cc */; };
CD226D868CEFA9D557EF33A1 /* query_listener_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7C3F995E040E9E9C5E8514BB /* query_listener_test.cc */; };
CD78EEAA1CD36BE691CA3427 /* hashing_test_apple.mm in Sources */ = {isa = PBXBuildFile; fileRef = B69CF3F02227386500B281C8 /* hashing_test_apple.mm */; };
Expand Down Expand Up @@ -1605,7 +1600,6 @@
FD365D6DFE9511D3BA2C74DF /* hard_assert_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 444B7AB3F5A2929070CB1363 /* hard_assert_test.cc */; };
FD6F5B4497D670330E7F89DA /* document_overlay_cache_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = FFCA39825D9678A03D1845D0 /* document_overlay_cache_test.cc */; };
FD8EA96A604E837092ACA51D /* ordered_code_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = AB380D03201BC6E400D97691 /* ordered_code_test.cc */; };
FE1C0263F6570DAC54A60F5C /* FIRTimestampTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B65D34A7203C99090076A5E1 /* FIRTimestampTest.m */; };
FE20E696E014CDCE918E91D6 /* md5_testing.cc in Sources */ = {isa = PBXBuildFile; fileRef = E2E39422953DE1D3C7B97E77 /* md5_testing.cc */; };
FE701C2D739A5371BCBD62B9 /* leveldb_mutation_queue_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5C7942B6244F4C416B11B86C /* leveldb_mutation_queue_test.cc */; };
FE9131E2D84A560D287B6F90 /* resource.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 1C3F7302BF4AE6CBC00ECDD0 /* resource.pb.cc */; };
Expand Down Expand Up @@ -2003,7 +1997,6 @@
B5C37696557C81A6C2B7271A /* target_cache_test.cc */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.cpp.cpp; path = target_cache_test.cc; sourceTree = "<group>"; };
B6152AD5202A5385000E5744 /* document_key_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = document_key_test.cc; sourceTree = "<group>"; };
B629525F7A1AAC1AB765C74F /* leveldb_lru_garbage_collector_test.cc */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.cpp.cpp; path = leveldb_lru_garbage_collector_test.cc; sourceTree = "<group>"; };
B65D34A7203C99090076A5E1 /* FIRTimestampTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FIRTimestampTest.m; sourceTree = "<group>"; };
B686F2AD2023DDB20028D6BE /* field_path_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = field_path_test.cc; sourceTree = "<group>"; };
B686F2B02024FFD70028D6BE /* resource_path_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resource_path_test.cc; sourceTree = "<group>"; };
B68B1E002213A764008977EF /* to_string_apple_test.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = to_string_apple_test.mm; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2924,7 +2917,6 @@
5492E04F202154AA00B64F25 /* FIRQuerySnapshotTests.mm */,
FF73B39D04D1760190E6B84A /* FIRQueryUnitTests.mm */,
5492E04D202154AA00B64F25 /* FIRSnapshotMetadataTests.mm */,
B65D34A7203C99090076A5E1 /* FIRTimestampTest.m */,
CF39ECA1293D21A0A2AB2626 /* FIRTransactionOptionsTests.mm */,
5492E047202154AA00B64F25 /* FSTAPIHelpers.h */,
5492E04E202154AA00B64F25 /* FSTAPIHelpers.mm */,
Expand Down Expand Up @@ -4118,7 +4110,6 @@
113190791F42202FDE1ABC14 /* FIRQuerySnapshotTests.mm in Sources */,
D39F0216BF1EA8CD54C76CF8 /* FIRQueryUnitTests.mm in Sources */,
2EAD77559EC654E6CA4D3E21 /* FIRSnapshotMetadataTests.mm in Sources */,
CD0AA9E5D83C00CAAE7C2F67 /* FIRTimestampTest.m in Sources */,
16FF9073CA381CA43CA9BF29 /* FIRTransactionOptionsTests.mm in Sources */,
9D71628E38D9F64C965DF29E /* FSTAPIHelpers.mm in Sources */,
F4F00BF4E87D7F0F0F8831DB /* FSTEventAccumulator.mm in Sources */,
Expand Down Expand Up @@ -4336,7 +4327,6 @@
17638F813B9B556FE7718C0C /* FIRQuerySnapshotTests.mm in Sources */,
518BF03D57FBAD7C632D18F8 /* FIRQueryUnitTests.mm in Sources */,
ED420D8F49DA5C41EEF93913 /* FIRSnapshotMetadataTests.mm in Sources */,
36E174A66C323891AEA16A2A /* FIRTimestampTest.m in Sources */,
DBFE8B2E803C1D0DECB71FF6 /* FIRTransactionOptionsTests.mm in Sources */,
6E4854B19B120C6F0F8192CC /* FSTAPIHelpers.mm in Sources */,
73E42D984FB36173A2BDA57C /* FSTEventAccumulator.mm in Sources */,
Expand Down Expand Up @@ -4567,7 +4557,6 @@
9A8B01AF6F19D248202FBC0A /* FIRQueryUnitTests.mm in Sources */,
FA7837C5CDFB273DE447E447 /* FIRServerTimestampTests.mm in Sources */,
67BC2B77C1CC47388E79D774 /* FIRSnapshotMetadataTests.mm in Sources */,
041CF73F67F6A22BF317625A /* FIRTimestampTest.m in Sources */,
58B84B550725D9812729C7F7 /* FIRTransactionOptionsTests.mm in Sources */,
75D124966E727829A5F99249 /* FIRTypeTests.mm in Sources */,
12DB753599571E24DCED0C2C /* FIRValidationTests.mm in Sources */,
Expand Down Expand Up @@ -4808,7 +4797,6 @@
298E0F8F6EB27AA36BA1CE76 /* FIRQueryUnitTests.mm in Sources */,
27E46C94AAB087C80A97FF7F /* FIRServerTimestampTests.mm in Sources */,
59F512D155DE361095A04ED4 /* FIRSnapshotMetadataTests.mm in Sources */,
FE1C0263F6570DAC54A60F5C /* FIRTimestampTest.m in Sources */,
339D4DD13E1518BA79FF12EA /* FIRTransactionOptionsTests.mm in Sources */,
5F05A801B1EA44BC1264E55A /* FIRTypeTests.mm in Sources */,
8403D519C916C72B9C7F2FA1 /* FIRValidationTests.mm in Sources */,
Expand Down Expand Up @@ -5046,7 +5034,6 @@
5492E059202154AB00B64F25 /* FIRQuerySnapshotTests.mm in Sources */,
CB2C731116D6C9464220626F /* FIRQueryUnitTests.mm in Sources */,
5492E057202154AB00B64F25 /* FIRSnapshotMetadataTests.mm in Sources */,
B65D34A9203C995B0076A5E1 /* FIRTimestampTest.m in Sources */,
85A33A9CE33207C2333DDD32 /* FIRTransactionOptionsTests.mm in Sources */,
5492E058202154AB00B64F25 /* FSTAPIHelpers.mm in Sources */,
5492E03E2021401F00B64F25 /* FSTEventAccumulator.mm in Sources */,
Expand Down Expand Up @@ -5296,7 +5283,6 @@
82E3634FCF4A882948B81839 /* FIRQueryUnitTests.mm in Sources */,
5492E077202154D600B64F25 /* FIRServerTimestampTests.mm in Sources */,
716289F99B5316B3CC5E5CE9 /* FIRSnapshotMetadataTests.mm in Sources */,
02B83EB79020AE6CBA60A410 /* FIRTimestampTest.m in Sources */,
913C2DB6951A2ED24778686C /* FIRTransactionOptionsTests.mm in Sources */,
5492E07A202154D600B64F25 /* FIRTypeTests.mm in Sources */,
5492E076202154D600B64F25 /* FIRValidationTests.mm in Sources */,
Expand Down
22 changes: 9 additions & 13 deletions ...tore/Example/Firestore.xcodeproj/xcshareddata/xcschemes/Firestore_Benchmarks_iOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,15 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5CAE131820FFFED600BE9A4A"
BuildableName = "Firestore_Benchmarks_iOS.xctest"
BlueprintName = "Firestore_Benchmarks_iOS"
ReferencedContainer = "container:Firestore.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -53,17 +62,6 @@
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5CAE131820FFFED600BE9A4A"
BuildableName = "Firestore_Benchmarks_iOS.xctest"
BlueprintName = "Firestore_Benchmarks_iOS"
ReferencedContainer = "container:Firestore.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -84,8 +82,6 @@
ReferencedContainer = "container:Firestore.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
3 changes: 2 additions & 1 deletion Firestore/Example/Tests/API/FSTUserDataReaderTests.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@

#import <FirebaseFirestore/FIRFieldValue.h>
#import <FirebaseFirestore/FIRGeoPoint.h>
#import <FirebaseFirestore/FIRTimestamp.h>
#import <XCTest/XCTest.h>

#import "FirebaseCore/FIRTimestamp.h"

#import "Firestore/Example/Tests/Util/FSTHelpers.h"
#import "Firestore/Source/API/converters.h"

Expand Down
3 changes: 3 additions & 0 deletions Firestore/Example/Tests/Integration/API/FIRCompositeIndexQueryTests.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
*/

#import <FirebaseFirestore/FirebaseFirestore.h>

#import "FirebaseCore/FIRTimestamp.h"

#import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h"

#include "Firestore/core/src/util/autoid.h"
Expand Down
2 changes: 2 additions & 0 deletions Firestore/Example/Tests/Integration/API/FIRCursorTests.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

#import <XCTest/XCTest.h>

#import "FirebaseCore/FIRTimestamp.h"

#import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h"

@interface FIRCursorTests : FSTIntegrationTestCase
Expand Down
2 changes: 2 additions & 0 deletions Firestore/Example/Tests/Integration/API/FIRDatabaseTests.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@

#import <XCTest/XCTest.h>

#import "FirebaseCore/FIRTimestamp.h"

#import "FirebaseCore/Extension/FIRAppInternal.h"
#import "Firestore/Example/Tests/Util/FSTEventAccumulator.h"
#import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h"
Expand Down
3 changes: 2 additions & 1 deletion Firestore/Example/Tests/Integration/API/FIRFieldsTests.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@
* limitations under the License.
*/

#import <FirebaseFirestore/FIRTimestamp.h>
#import <FirebaseFirestore/FirebaseFirestore.h>

#import <XCTest/XCTest.h>

#import "FirebaseCore/FIRTimestamp.h"

#import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h"

NS_ASSUME_NONNULL_BEGIN
Expand Down
2 changes: 2 additions & 0 deletions Firestore/Example/Tests/Integration/API/FIRServerTimestampTests.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

#import <XCTest/XCTest.h>

#import "FirebaseCore/FIRTimestamp.h"

#import "Firestore/Example/Tests/Util/FSTEventAccumulator.h"
#import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h"
#import "Firestore/Source/API/FIRFirestore+Internal.h"
Expand Down
2 changes: 2 additions & 0 deletions Firestore/Example/Tests/Integration/API/FIRTypeTests.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

#import <XCTest/XCTest.h>

#import "FirebaseCore/FIRTimestamp.h"

#import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h"

@interface FIRTypeTests : FSTIntegrationTestCase
Expand Down
3 changes: 2 additions & 1 deletion Firestore/Example/Tests/Integration/FSTDatastoreTests.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,13 @@

#import <FirebaseFirestore/FirebaseFirestore.h>

#import <FirebaseFirestore/FIRTimestamp.h>
#import <XCTest/XCTest.h>

#include <memory>
#include <vector>

#import "FirebaseCore/FIRTimestamp.h"

#import "Firestore/Source/API/FIRDocumentReference+Internal.h"
#import "Firestore/Source/API/FSTUserDataReader.h"

Expand Down
3 changes: 2 additions & 1 deletion Firestore/Source/API/FIRDocumentSnapshot.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,15 @@
#include <utility>
#include <vector>

#import "FirebaseCore/FIRTimestamp.h"

#include "Firestore/core/src/util/warnings.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/FIRGeoPoint+Internal.h"
#import "Firestore/Source/API/FIRSnapshotMetadata+Internal.h"
#import "Firestore/Source/API/FIRTimestamp+Internal.h"
#import "Firestore/Source/API/FSTUserDataWriter.h"
#import "Firestore/Source/API/converters.h"

Expand Down
2 changes: 1 addition & 1 deletion Firestore/Source/API/FSTUserDataReader.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <vector>

#import "FIRGeoPoint.h"
#import "FIRTimestamp.h"
#import "FirebaseCore/FIRTimestamp.h"

#import "Firestore/Source/API/FIRDocumentReference+Internal.h"
#import "Firestore/Source/API/FIRFieldPath+Internal.h"
Expand Down
2 changes: 1 addition & 1 deletion Firestore/Source/API/converters.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <utility>

#import "FIRGeoPoint.h"
#import "FIRTimestamp.h"
#import "FirebaseCore/FIRTimestamp.h"

#include "Firestore/Source/API/FIRDocumentReference+Internal.h"
#include "Firestore/core/include/firebase/firestore/geo_point.h"
Expand Down
1 change: 0 additions & 1 deletion Firestore/Source/Public/FirebaseFirestore/FirebaseFirestore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
#import "FIRQuerySnapshot.h"
#import "FIRSnapshotListenOptions.h"
#import "FIRSnapshotMetadata.h"
#import "FIRTimestamp.h"
#import "FIRTransaction.h"
#import "FIRTransactionOptions.h"
#import "FIRWriteBatch.h"
1 change: 1 addition & 0 deletions Firestore/Swift/Source/Codable/CodablePassThroughTypes.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
* limitations under the License.
*/

import FirebaseCore
import FirebaseSharedSwift
import Foundation

Expand Down
6 changes: 1 addition & 5 deletions Firestore/Swift/Source/Codable/ServerTimestamp.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,7 @@
* limitations under the License.
*/

#if SWIFT_PACKAGE
@_exported import FirebaseFirestoreInternalWrapper
#else
@_exported import FirebaseFirestoreInternal
#endif // SWIFT_PACKAGE
import FirebaseCore

/// A type that can initialize itself from a Firestore Timestamp, which makes
/// it suitable for use with the `@ServerTimestamp` property wrapper.
Expand Down
6 changes: 1 addition & 5 deletions Firestore/Swift/Source/Codable/Timestamp+Codable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,7 @@
* limitations under the License.
*/

#if SWIFT_PACKAGE
@_exported import FirebaseFirestoreInternalWrapper
#else
@_exported import FirebaseFirestoreInternal
#endif // SWIFT_PACKAGE
import FirebaseCore

/**
* A protocol describing the encodable properties of a Timestamp.
Expand Down
Loading
Loading