Skip to content

Commit 80f607d

Browse files
committed
review feedback
1 parent 6fed632 commit 80f607d

File tree

4 files changed

+44
-8
lines changed

4 files changed

+44
-8
lines changed

Firestore/Example/Firestore.xcodeproj/project.pbxproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
6003F5B1195388D20070C39A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58D195388D20070C39A /* Foundation.framework */; };
132132
6003F5B2195388D20070C39A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F591195388D20070C39A /* UIKit.framework */; };
133133
6003F5BA195388D20070C39A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6003F5B8195388D20070C39A /* InfoPlist.strings */; };
134-
61287373203C92C5000EAD3F /* FIRSourceTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 61287372203C92C5000EAD3F /* FIRSourceTests.mm */; };
134+
6161B5032047140C00A99DBB /* FIRFirestoreSourceTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6161B5012047140400A99DBB /* FIRFirestoreSourceTests.mm */; };
135135
6ED54761B845349D43DB6B78 /* Pods_Firestore_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 75A6FE51C1A02DF38F62FAAD /* Pods_Firestore_Example.framework */; };
136136
71719F9F1E33DC2100824A3D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 71719F9D1E33DC2100824A3D /* LaunchScreen.storyboard */; };
137137
7346E61D20325C6900FD6CEF /* FSTDispatchQueueTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7346E61C20325C6900FD6CEF /* FSTDispatchQueueTests.mm */; };
@@ -356,7 +356,7 @@
356356
6003F5AF195388D20070C39A /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
357357
6003F5B7195388D20070C39A /* Tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Tests-Info.plist"; sourceTree = "<group>"; };
358358
6003F5B9195388D20070C39A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
359-
61287372203C92C5000EAD3F /* FIRSourceTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FIRSourceTests.mm; sourceTree = "<group>"; };
359+
6161B5012047140400A99DBB /* FIRFirestoreSourceTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FIRFirestoreSourceTests.mm; sourceTree = "<group>"; };
360360
69F6A10DBD6187489481CD76 /* Pods_Firestore_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Firestore_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
361361
71719F9E1E33DC2100824A3D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
362362
7346E61C20325C6900FD6CEF /* FSTDispatchQueueTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FSTDispatchQueueTests.mm; sourceTree = "<group>"; };
@@ -884,7 +884,7 @@
884884
DE51B1BC1F0D48AC0013853F /* API */ = {
885885
isa = PBXGroup;
886886
children = (
887-
61287372203C92C5000EAD3F /* FIRSourceTests.mm */,
887+
6161B5012047140400A99DBB /* FIRFirestoreSourceTests.mm */,
888888
5492E070202154D600B64F25 /* FIRCursorTests.mm */,
889889
5492E06C202154D500B64F25 /* FIRDatabaseTests.mm */,
890890
5492E06A202154D500B64F25 /* FIRFieldsTests.mm */,
@@ -1558,7 +1558,7 @@
15581558
isa = PBXSourcesBuildPhase;
15591559
buildActionMask = 2147483647;
15601560
files = (
1561-
61287373203C92C5000EAD3F /* FIRSourceTests.mm in Sources */,
1561+
6161B5032047140C00A99DBB /* FIRFirestoreSourceTests.mm in Sources */,
15621562
5492E076202154D600B64F25 /* FIRValidationTests.mm in Sources */,
15631563
5492E072202154D600B64F25 /* FIRQueryTests.mm in Sources */,
15641564
5491BC731FB44593008B3588 /* FSTIntegrationTestCase.mm in Sources */,

Firestore/Example/SwiftBuildTest/main.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ func main() {
3232
addDocument(to: collectionRef)
3333

3434
readDocument(at: documentRef)
35-
readDocumentWithOptions(at: documentRef)
35+
readDocumentWithSource(at: documentRef)
3636

3737
readDocuments(matching: query)
38-
readDocumentsWithOptions(matching: query)
38+
readDocumentsWithSource(matching: query)
3939

4040
listenToDocument(at: documentRef)
4141

@@ -219,7 +219,7 @@ func readDocument(at docRef: DocumentReference) {
219219
}
220220
}
221221

222-
func readDocumentWithOptions(at docRef: DocumentReference) {
222+
func readDocumentWithSource(at docRef: DocumentReference) {
223223
docRef.getDocument(source: FirestoreSource.default) { document, error in
224224
}
225225
docRef.getDocument(source: .server) { document, error in
@@ -238,7 +238,7 @@ func readDocuments(matching query: Query) {
238238
}
239239
}
240240

241-
func readDocumentsWithOptions(matching query: Query) {
241+
func readDocumentsWithSource(matching query: Query) {
242242
query.getDocuments(source: FirestoreSource.default) { querySnapshot, error in
243243
}
244244
query.getDocuments(source: .server) { querySnapshot, error in
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
This file is a concatenation of one or more certificates from this directory.
2+
3+
Taken from testCA:
4+
-----BEGIN CERTIFICATE-----
5+
MIICSzCCAbSgAwIBAgIIJNkBrvjQ374wDQYJKoZIhvcNAQELBQAwKjEXMBUGA1UE
6+
ChMOR29vZ2xlIFRFU1RJTkcxDzANBgNVBAMTBnRlc3RDQTAeFw0xNTAxMDEwMDAw
7+
MDBaFw0yNTAxMDEwMDAwMDBaMCoxFzAVBgNVBAoTDkdvb2dsZSBURVNUSU5HMQ8w
8+
DQYDVQQDEwZ0ZXN0Q0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKmf9KWw
9+
EujPluTN3wTP+kOU4oTDVn5w+BXNhcxi+19ZkdloJkg3NJ5EwfxAl/4rNJGeuR7X
10+
nry/+dzkWG+olRTX7dZaV3GzvfFovplqqxDHR76k8i8L4BLE0/Csn3VOamz4zGx8
11+
r5wyclC8GyMioieGrvi4Wan/SWEKo0/u7wqLAgMBAAGjejB4MA4GA1UdDwEB/wQE
12+
AwICBDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDwYDVR0TAQH/BAUw
13+
AwEB/zAZBgNVHQ4EEgQQp7JSbajiTZaIRUDSV1C81jAbBgNVHSMEFDASgBCnslJt
14+
qOJNlohFQNJXULzWMA0GCSqGSIb3DQEBCwUAA4GBAH1yvOrs6oMl3FZjpMGfIsq6
15+
kHqGU7C8XcVhAP/NQJcVT1J/WP/Lcr1e30quqDHPtkKeulBSmUziY1knMDv2NMgT
16+
LI/b3UwYepftQJoq/t6j1gc3IfVuJ6edcJOacMcdtBaohofZ6S1mnZmllIJgRnbH
17+
WrIUSk3gcvKUIAUT0myw
18+
-----END CERTIFICATE-----
19+
20+
Taken from intermediate_ca:
21+
-----BEGIN CERTIFICATE-----
22+
MIICfDCCAeWgAwIBAgIJAKJMH+7rscPcMA0GCSqGSIb3DQEBCwUAMD4xFzAVBgNV
23+
BAoTDkdvb2dsZSBURVNUSU5HMSMwIQYDVQQDExpHb29nbGUgKipUZXN0aW5nKiog
24+
Um9vdCBDQTAeFw0xNTAxMDEwMDAwMDBaFw0yNTAxMDEwMDAwMDBaMEYxFzAVBgNV
25+
BAoTDkdvb2dsZSBURVNUSU5HMSswKQYDVQQDEyJHb29nbGUgKipUZXN0aW5nKiog
26+
SW50ZXJtZWRpYXRlIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC7YtI0
27+
l8ocTYJ0gKyXTtPL4iMJCNY4OcxXl48jkncVG1HlblicgNUa1r9m9YFtVkxvBinb
28+
8dXiUpEGhVg4awRPDcatlsBSEBuJkiZGYbRcAmSuCmZYnf6u3aYQ18SU8WqVERPp
29+
E4cwVVs+6kwlzRw0+XDoZAczu8ZezVhCUc6NbQIDAQABo3oweDAOBgNVHQ8BAf8E
30+
BAMCAqQwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA8GA1UdEwEB/wQF
31+
MAMBAf8wGQYDVR0OBBIEEIwaaKi1dttdV3sfjRSyBqMwGwYDVR0jBBQwEoAQQDfX
32+
AftAL7gcflQEJ4xZATANBgkqhkiG9w0BAQsFAAOBgQDLEmJdvsRZjslPHJeoSQZ4
33+
3km6MsJ4cdCNvAR8iegYMWe8wT3+d52fJJaWTN0phjMNYoNwUTmsFJI08bkussv2
34+
mSJB5ckLJL5Ce5eRYMb4jgWKEQQJyPCQmIkGu2gbtQPfG36amVfxjsnqJCbgBIt4
35+
349bmquJfjx4kOhoPVVH9Q==
36+
-----END CERTIFICATE-----

0 commit comments

Comments
 (0)