status-im
/
react-native-firebase
mirror of
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix merge conflict

This commit is contained in:
Elliot Hesp 2017-05-23 14:10:07 +01:00
parent 25e8bb6d5a 279a9753ea
commit fb90f444d9
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
android/build.gradle
View File

@ -2,6 +2,8 @@
// YES, jcenter is required twice - it somehow tricks studio into compiling deps below // YES, jcenter is required twice - it somehow tricks studio into compiling deps below
// doesn't break anything anywhere else and projects using this lib work as normal // doesn't break anything anywhere else and projects using this lib work as normal
buildscript { buildscript {
ext.firebaseVersion = '10.2.6'
repositories { repositories {
jcenter() jcenter()
} }
@ -46,14 +48,14 @@ dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs') compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.facebook.react:react-native:+' compile 'com.facebook.react:react-native:+'
compile 'me.leolin:ShortcutBadger:1.1.10@aar' compile 'me.leolin:ShortcutBadger:1.1.10@aar'
compile 'com.google.android.gms:play-services-base:10.2.0' compile "com.google.android.gms:play-services-base:$firebaseVersion"
compile 'com.google.firebase:firebase-core:10.2.0' compile "com.google.firebase:firebase-core:$firebaseVersion"
compile 'com.google.firebase:firebase-config:10.2.0' compile "com.google.firebase:firebase-config:$firebaseVersion"
compile 'com.google.firebase:firebase-auth:10.2.0' compile "com.google.firebase:firebase-auth:$firebaseVersion"
compile 'com.google.firebase:firebase-analytics:10.2.0' compile "com.google.firebase:firebase-analytics:$firebaseVersion"
compile 'com.google.firebase:firebase-database:10.2.0' compile "com.google.firebase:firebase-database:$firebaseVersion"
compile 'com.google.firebase:firebase-storage:10.2.0' compile "com.google.firebase:firebase-storage:$firebaseVersion"
compile 'com.google.firebase:firebase-messaging:10.2.0' compile "com.google.firebase:firebase-messaging:$firebaseVersion"
compile 'com.google.firebase:firebase-crash:10.2.0' compile "com.google.firebase:firebase-crash:$firebaseVersion"
compile 'com.google.firebase:firebase-config:10.2.0' compile "com.google.firebase:firebase-config:$firebaseVersion"
} }

2
docs/usage.md
View File

@ -20,6 +20,8 @@ const firebase = RNFirebase.initializeApp({
|----------------|----------|-------------------------|----------------------------------------| |----------------|----------|-------------------------|----------------------------------------|
| debug | bool | false | When set to true, RNFirebase will log messages to the console and fire `debug` events we can listen to in `js` | | debug | bool | false | When set to true, RNFirebase will log messages to the console and fire `debug` events we can listen to in `js` |
| persistence | bool | false | When set to true, database persistence will be enabled. | | persistence | bool | false | When set to true, database persistence will be enabled. |
| errorOnMissingPlayServices | bool | true | (Android only) When set to true, will throw an error if Google Play Services isn't installed. |
| promptOnMissingPlayServices | bool | true | (Android only) When set to true, will prompt the user to install Google Play Services if it isn't installed. This takes precedence over `errorOnMissingPlayServices`.|
For instance: For instance:

4
ios/RNFirebase/RNFirebaseStorage.m
View File

@ -302,8 +302,8 @@ RCT_EXPORT_METHOD(putFile:(NSString *) path localPath:(NSString *)localPath meta
}]; }];
} }
} else { } else {
NSURL *fileUrl = [NSURL fileURLWithPath:localPath]; NSData *data = [[NSFileManager defaultManager] contentsAtPath:localPath];
[self uploadFile:fileUrl metadata:metadata path:path resolver:resolve rejecter:reject]; [self uploadData:data metadata:metadata path:path resolver:resolve rejecter:reject];
} }
} }