Skip to content

Commit ae746d4

Browse files
cherylEnkiducherylEnkidu
authored
Merge eb79b0b into b207f06 
2 parents b207f06 + eb79b0b commit ae746d4

32 files changed

+48
-74
lines changed

‎FirebaseCore/CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
XCFrameworks.
1818
- Update underlying FIRLogger implementation from `asl` to `os_log`.
1919
- Remove `FIRLoggerForceSTDERR` configuration option.
20+
- [changed] Move `Timestamp` class into `FirebaseCore`. `FirebaseFirestore.Timestamp`
21+
was changed to `FirebaseCore.Timestamp`. (#13221)
2022

2123
# Firebase 10.25.0
2224
- [changed] Firebase now requires at least Xcode 15.2. See

‎Firestore/Source/API/FIRTimestamp.m‎ renamed to ‎FirebaseCore/Sources/FIRTimestamp.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

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

1919
NS_ASSUME_NONNULL_BEGIN
2020

‎Firestore/Source/API/FIRTimestamp+Internal.h‎ renamed to ‎FirebaseCore/Sources/FIRTimestampInternal.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
#import "FIRTimestamp.h"
17+
#import "FirebaseCore/Sources/Public/FirebaseCore/FIRTimestamp.h"
1818

1919
NS_ASSUME_NONNULL_BEGIN
2020

‎Firestore/Source/Public/FirebaseFirestore/FIRTimestamp.h‎ renamed to ‎FirebaseCore/Sources/Public/FirebaseCore/FIRTimestamp.h‎

File renamed without changes.

‎FirebaseCore/Sources/Public/FirebaseCore/FirebaseCore.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@
1818
#import "FIRConfiguration.h"
1919
#import "FIRLoggerLevel.h"
2020
#import "FIROptions.h"
21+
#import "FIRTimestamp.h"
2122
#import "FIRVersion.h"

‎Firestore/Example/Tests/API/FIRTimestampTest.m‎ renamed to ‎FirebaseCore/Tests/Unit/FIRTimestampTest.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#import <XCTest/XCTest.h>
1818

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

2121
NS_ASSUME_NONNULL_BEGIN
2222

‎FirebaseFirestoreInternal/FirebaseFirestore/FIRTimestamp.h‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎Firestore/CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
instructions.
66
- [changed] **Breaking change**: LRU Garbage Collector is now the default GC for memory cache, eager GC is now
77
opt-in (via MemoryCacheSettings(garbageCollectorSettings: MemoryEagerGCSettings())) instead of the default one.
8+
- [changed] Move `Timestamp` class into `FirebaseCore`. `FirebaseFirestore.Timestamp`
9+
was changed to `FirebaseCore.Timestamp`. (#13221)
810

911
# 10.25.0
1012
- [fixed] Allow blob of data with zero length. (#11773, #12620)

‎Firestore/Example/Firestore.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,11 @@
2222
01D9704C3AAA13FAD2F962AB /* statusor_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 54A0352D20A3B3D7003E0143 /* statusor_test.cc */; };
2323
020AFD89BB40E5175838BB76 /* local_serializer_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = F8043813A5D16963EC02B182 /* local_serializer_test.cc */; };
2424
022BA1619A576F6818B212C5 /* remote_store_spec_test.json in Resources */ = {isa = PBXBuildFile; fileRef = 3B843E4A1F3930A400548890 /* remote_store_spec_test.json */; };
25-
02B83EB79020AE6CBA60A410 /* FIRTimestampTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B65D34A7203C99090076A5E1 /* FIRTimestampTest.m */; };
2625
02C953A7B0FA5EF87DB0361A /* FSTIntegrationTestCase.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5491BC711FB44593008B3588 /* FSTIntegrationTestCase.mm */; };
2726
02EB33CC2590E1484D462912 /* annotations.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 618BBE9520B89AAC00B5BCE7 /* annotations.pb.cc */; };
2827
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 */; };
2928
035DE410628A8F804F6F2790 /* target_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 526D755F65AC676234F57125 /* target_test.cc */; };
3029
03AEB9E07A605AE1B5827548 /* field_index_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = BF76A8DA34B5B67B4DD74666 /* field_index_test.cc */; };
31-
041CF73F67F6A22BF317625A /* FIRTimestampTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B65D34A7203C99090076A5E1 /* FIRTimestampTest.m */; };
3230
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 */; };
3331
0455FC6E2A281BD755FD933A /* precondition_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 549CCA5520A36E1F00BCEB75 /* precondition_test.cc */; };
3432
04887E378B39FB86A8A5B52B /* leveldb_local_store_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5FF903AEFA7A3284660FA4C5 /* leveldb_local_store_test.cc */; };
@@ -359,7 +357,6 @@
359357
35FEB53E165518C0DE155CB0 /* target_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 526D755F65AC676234F57125 /* target_test.cc */; };
360358
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 */; };
361359
36999FC1F37930E8C9B6DA25 /* stream_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5B5414D28802BC76FDADABD6 /* stream_test.cc */; };
362-
36E174A66C323891AEA16A2A /* FIRTimestampTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B65D34A7203C99090076A5E1 /* FIRTimestampTest.m */; };
363360
36FD4CE79613D18BC783C55B /* string_apple_test.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0EE5300F8233D14025EF0456 /* string_apple_test.mm */; };
364361
37286D731E432CB873354357 /* remote_event_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 584AE2C37A55B408541A6FF3 /* remote_event_test.cc */; };
365362
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 */; };
@@ -1202,7 +1199,6 @@
12021199
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 */; };
12031200
B6152AD7202A53CB000E5744 /* document_key_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = B6152AD5202A5385000E5744 /* document_key_test.cc */; };
12041201
B63D84B2980C7DEE7E6E4708 /* view_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = C7429071B33BDF80A7FA2F8A /* view_test.cc */; };
1205-
B65D34A9203C995B0076A5E1 /* FIRTimestampTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B65D34A7203C99090076A5E1 /* FIRTimestampTest.m */; };
12061202
B667366CB06893DFF472902E /* field_transform_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7515B47C92ABEEC66864B55C /* field_transform_test.cc */; };
12071203
B686F2AF2023DDEE0028D6BE /* field_path_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = B686F2AD2023DDB20028D6BE /* field_path_test.cc */; };
12081204
B686F2B22025000D0028D6BE /* resource_path_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = B686F2B02024FFD70028D6BE /* resource_path_test.cc */; };
@@ -1338,7 +1334,6 @@
13381334
CBDCA7829AAFEB4853C15517 /* bundle_serializer_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = B5C2A94EE24E60543F62CC35 /* bundle_serializer_test.cc */; };
13391335
CC94A33318F983907E9ED509 /* resume_token_spec_test.json in Resources */ = {isa = PBXBuildFile; fileRef = 54DA12A41F315EE100DD57A1 /* resume_token_spec_test.json */; };
13401336
CCE596E8654A4D2EEA75C219 /* index_backfiller_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 1F50E872B3F117A674DA8E94 /* index_backfiller_test.cc */; };
1341-
CD0AA9E5D83C00CAAE7C2F67 /* FIRTimestampTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B65D34A7203C99090076A5E1 /* FIRTimestampTest.m */; };
13421337
CD1E2F356FC71D7E74FCD26C /* leveldb_remote_document_cache_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 0840319686A223CC4AD3FAB1 /* leveldb_remote_document_cache_test.cc */; };
13431338
CD226D868CEFA9D557EF33A1 /* query_listener_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7C3F995E040E9E9C5E8514BB /* query_listener_test.cc */; };
13441339
CD78EEAA1CD36BE691CA3427 /* hashing_test_apple.mm in Sources */ = {isa = PBXBuildFile; fileRef = B69CF3F02227386500B281C8 /* hashing_test_apple.mm */; };
@@ -1605,7 +1600,6 @@
16051600
FD365D6DFE9511D3BA2C74DF /* hard_assert_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 444B7AB3F5A2929070CB1363 /* hard_assert_test.cc */; };
16061601
FD6F5B4497D670330E7F89DA /* document_overlay_cache_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = FFCA39825D9678A03D1845D0 /* document_overlay_cache_test.cc */; };
16071602
FD8EA96A604E837092ACA51D /* ordered_code_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = AB380D03201BC6E400D97691 /* ordered_code_test.cc */; };
1608-
FE1C0263F6570DAC54A60F5C /* FIRTimestampTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B65D34A7203C99090076A5E1 /* FIRTimestampTest.m */; };
16091603
FE20E696E014CDCE918E91D6 /* md5_testing.cc in Sources */ = {isa = PBXBuildFile; fileRef = E2E39422953DE1D3C7B97E77 /* md5_testing.cc */; };
16101604
FE701C2D739A5371BCBD62B9 /* leveldb_mutation_queue_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5C7942B6244F4C416B11B86C /* leveldb_mutation_queue_test.cc */; };
16111605
FE9131E2D84A560D287B6F90 /* resource.pb.cc in Sources */ = {isa = PBXBuildFile; fileRef = 1C3F7302BF4AE6CBC00ECDD0 /* resource.pb.cc */; };
@@ -2003,7 +1997,6 @@
20031997
B5C37696557C81A6C2B7271A /* target_cache_test.cc */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.cpp.cpp; path = target_cache_test.cc; sourceTree = "<group>"; };
20041998
B6152AD5202A5385000E5744 /* document_key_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = document_key_test.cc; sourceTree = "<group>"; };
20051999
B629525F7A1AAC1AB765C74F /* leveldb_lru_garbage_collector_test.cc */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.cpp.cpp; path = leveldb_lru_garbage_collector_test.cc; sourceTree = "<group>"; };
2006-
B65D34A7203C99090076A5E1 /* FIRTimestampTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FIRTimestampTest.m; sourceTree = "<group>"; };
20072000
B686F2AD2023DDB20028D6BE /* field_path_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = field_path_test.cc; sourceTree = "<group>"; };
20082001
B686F2B02024FFD70028D6BE /* resource_path_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resource_path_test.cc; sourceTree = "<group>"; };
20092002
B68B1E002213A764008977EF /* to_string_apple_test.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = to_string_apple_test.mm; sourceTree = "<group>"; };
@@ -2924,7 +2917,6 @@
29242917
5492E04F202154AA00B64F25 /* FIRQuerySnapshotTests.mm */,
29252918
FF73B39D04D1760190E6B84A /* FIRQueryUnitTests.mm */,
29262919
5492E04D202154AA00B64F25 /* FIRSnapshotMetadataTests.mm */,
2927-
B65D34A7203C99090076A5E1 /* FIRTimestampTest.m */,
29282920
CF39ECA1293D21A0A2AB2626 /* FIRTransactionOptionsTests.mm */,
29292921
5492E047202154AA00B64F25 /* FSTAPIHelpers.h */,
29302922
5492E04E202154AA00B64F25 /* FSTAPIHelpers.mm */,
@@ -4118,7 +4110,6 @@
41184110
113190791F42202FDE1ABC14 /* FIRQuerySnapshotTests.mm in Sources */,
41194111
D39F0216BF1EA8CD54C76CF8 /* FIRQueryUnitTests.mm in Sources */,
41204112
2EAD77559EC654E6CA4D3E21 /* FIRSnapshotMetadataTests.mm in Sources */,
4121-
CD0AA9E5D83C00CAAE7C2F67 /* FIRTimestampTest.m in Sources */,
41224113
16FF9073CA381CA43CA9BF29 /* FIRTransactionOptionsTests.mm in Sources */,
41234114
9D71628E38D9F64C965DF29E /* FSTAPIHelpers.mm in Sources */,
41244115
F4F00BF4E87D7F0F0F8831DB /* FSTEventAccumulator.mm in Sources */,
@@ -4336,7 +4327,6 @@
43364327
17638F813B9B556FE7718C0C /* FIRQuerySnapshotTests.mm in Sources */,
43374328
518BF03D57FBAD7C632D18F8 /* FIRQueryUnitTests.mm in Sources */,
43384329
ED420D8F49DA5C41EEF93913 /* FIRSnapshotMetadataTests.mm in Sources */,
4339-
36E174A66C323891AEA16A2A /* FIRTimestampTest.m in Sources */,
43404330
DBFE8B2E803C1D0DECB71FF6 /* FIRTransactionOptionsTests.mm in Sources */,
43414331
6E4854B19B120C6F0F8192CC /* FSTAPIHelpers.mm in Sources */,
43424332
73E42D984FB36173A2BDA57C /* FSTEventAccumulator.mm in Sources */,
@@ -4567,7 +4557,6 @@
45674557
9A8B01AF6F19D248202FBC0A /* FIRQueryUnitTests.mm in Sources */,
45684558
FA7837C5CDFB273DE447E447 /* FIRServerTimestampTests.mm in Sources */,
45694559
67BC2B77C1CC47388E79D774 /* FIRSnapshotMetadataTests.mm in Sources */,
4570-
041CF73F67F6A22BF317625A /* FIRTimestampTest.m in Sources */,
45714560
58B84B550725D9812729C7F7 /* FIRTransactionOptionsTests.mm in Sources */,
45724561
75D124966E727829A5F99249 /* FIRTypeTests.mm in Sources */,
45734562
12DB753599571E24DCED0C2C /* FIRValidationTests.mm in Sources */,
@@ -4808,7 +4797,6 @@
48084797
298E0F8F6EB27AA36BA1CE76 /* FIRQueryUnitTests.mm in Sources */,
48094798
27E46C94AAB087C80A97FF7F /* FIRServerTimestampTests.mm in Sources */,
48104799
59F512D155DE361095A04ED4 /* FIRSnapshotMetadataTests.mm in Sources */,
4811-
FE1C0263F6570DAC54A60F5C /* FIRTimestampTest.m in Sources */,
48124800
339D4DD13E1518BA79FF12EA /* FIRTransactionOptionsTests.mm in Sources */,
48134801
5F05A801B1EA44BC1264E55A /* FIRTypeTests.mm in Sources */,
48144802
8403D519C916C72B9C7F2FA1 /* FIRValidationTests.mm in Sources */,
@@ -5046,7 +5034,6 @@
50465034
5492E059202154AB00B64F25 /* FIRQuerySnapshotTests.mm in Sources */,
50475035
CB2C731116D6C9464220626F /* FIRQueryUnitTests.mm in Sources */,
50485036
5492E057202154AB00B64F25 /* FIRSnapshotMetadataTests.mm in Sources */,
5049-
B65D34A9203C995B0076A5E1 /* FIRTimestampTest.m in Sources */,
50505037
85A33A9CE33207C2333DDD32 /* FIRTransactionOptionsTests.mm in Sources */,
50515038
5492E058202154AB00B64F25 /* FSTAPIHelpers.mm in Sources */,
50525039
5492E03E2021401F00B64F25 /* FSTEventAccumulator.mm in Sources */,
@@ -5296,7 +5283,6 @@
52965283
82E3634FCF4A882948B81839 /* FIRQueryUnitTests.mm in Sources */,
52975284
5492E077202154D600B64F25 /* FIRServerTimestampTests.mm in Sources */,
52985285
716289F99B5316B3CC5E5CE9 /* FIRSnapshotMetadataTests.mm in Sources */,
5299-
02B83EB79020AE6CBA60A410 /* FIRTimestampTest.m in Sources */,
53005286
913C2DB6951A2ED24778686C /* FIRTransactionOptionsTests.mm in Sources */,
53015287
5492E07A202154D600B64F25 /* FIRTypeTests.mm in Sources */,
53025288
5492E076202154D600B64F25 /* FIRValidationTests.mm in Sources */,

‎Firestore/Example/Firestore.xcodeproj/xcshareddata/xcschemes/Firestore_Benchmarks_iOS.xcscheme‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,15 @@
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
4343
shouldUseLaunchSchemeArgsEnv = "YES">
44+
<MacroExpansion>
45+
<BuildableReference
46+
BuildableIdentifier = "primary"
47+
BlueprintIdentifier = "5CAE131820FFFED600BE9A4A"
48+
BuildableName = "Firestore_Benchmarks_iOS.xctest"
49+
BlueprintName = "Firestore_Benchmarks_iOS"
50+
ReferencedContainer = "container:Firestore.xcodeproj">
51+
</BuildableReference>
52+
</MacroExpansion>
4453
<Testables>
4554
<TestableReference
4655
skipped = "NO">
@@ -53,17 +62,6 @@
5362
</BuildableReference>
5463
</TestableReference>
5564
</Testables>
56-
<MacroExpansion>
57-
<BuildableReference
58-
BuildableIdentifier = "primary"
59-
BlueprintIdentifier = "5CAE131820FFFED600BE9A4A"
60-
BuildableName = "Firestore_Benchmarks_iOS.xctest"
61-
BlueprintName = "Firestore_Benchmarks_iOS"
62-
ReferencedContainer = "container:Firestore.xcodeproj">
63-
</BuildableReference>
64-
</MacroExpansion>
65-
<AdditionalOptions>
66-
</AdditionalOptions>
6765
</TestAction>
6866
<LaunchAction
6967
buildConfiguration = "Debug"
@@ -84,8 +82,6 @@
8482
ReferencedContainer = "container:Firestore.xcodeproj">
8583
</BuildableReference>
8684
</MacroExpansion>
87-
<AdditionalOptions>
88-
</AdditionalOptions>
8985
</LaunchAction>
9086
<ProfileAction
9187
buildConfiguration = "Release"

0 commit comments

Comments
 (0)