Skip to content

Update error messages with new Swift syntax #336

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 5, 2017
Merged

Update error messages with new Swift syntax #336

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef4d823
Update error messages with new Swift Syntax
ryanwilson Oct 4, 2017
6e8725f
Run scripts/style.sh
wilhuff Oct 5, 2017
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
8 changes: 4 additions & 4 deletions Firestore/Source/API/FIRFirestore.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ + (instancetype)firestore {
if (!app) {
FSTThrowInvalidUsage(
@"FIRAppNotConfiguredException",
@"Failed to get FIRApp instance. Please call FIRApp.configure() before using FIRFirestore");
@"Failed to get FirebaseApp instance. Please call FirebaseApp.configure() before using Firestore");
}
return [self firestoreForApp:app database:kDefaultDatabaseID];
}
Expand Down Expand Up @@ -102,7 +102,7 @@ + (instancetype)firestoreForApp:(FIRApp *)app database:(NSString *)database {
FIRFirestore *firestore = instances[key];
if (!firestore) {
NSString *projectID = app.options.projectID;
FSTAssert(projectID, @"FIROptions.projectID cannot be nil.");
FSTAssert(projectID, @"FirebaseOptions.projectID cannot be nil.");

FSTDispatchQueue *workerDispatchQueue = [FSTDispatchQueue
queueWith:dispatch_queue_create("com.google.firebase.firestore", DISPATCH_QUEUE_SERIAL)];
Expand Down Expand Up @@ -177,8 +177,8 @@ - (void)setSettings:(FIRFirestoreSettings *)settings {
- (instancetype)firestoreWithConfiguredClient {
if (!_client) {
// These values are validated elsewhere; this is just double-checking:
FSTAssert(_settings.host, @"FIRFirestoreSettings.host cannot be nil.");
FSTAssert(_settings.dispatchQueue, @"FIRFirestoreSettings.dispatchQueue cannot be nil.");
FSTAssert(_settings.host, @"FirestoreSettings.host cannot be nil.");
FSTAssert(_settings.dispatchQueue, @"FirestoreSettings.dispatchQueue cannot be nil.");

FSTDatabaseInfo *databaseInfo =
[FSTDatabaseInfo databaseInfoWithDatabaseID:_databaseID
Expand Down