Merge branch 'master' of github.com:invertase/react-native-firebase

This commit is contained in:
Elliot Hesp 2017-08-11 10:51:45 +01:00
commit 7c4c2a2517
2 changed files with 9 additions and 4 deletions

View File

@ -2,8 +2,6 @@
#if __has_include(<GoogleMobileAds/GADMobileAds.h>) #if __has_include(<GoogleMobileAds/GADMobileAds.h>)
#import "GoogleMobileAds/GADMobileAds.h"
#import "RNFirebaseAdMobInterstitial.h" #import "RNFirebaseAdMobInterstitial.h"
#import "RNFirebaseAdMobRewardedVideo.h" #import "RNFirebaseAdMobRewardedVideo.h"
@ -225,4 +223,4 @@ RCT_EXPORT_METHOD(clearInterstitial:
} }
@end @end
#endif #endif

View File

@ -1,6 +1,6 @@
{ {
"name": "react-native-firebase", "name": "react-native-firebase",
"version": "2.1.0", "version": "2.1.1",
"author": "Invertase <contact@invertase.io> (http://invertase.io)", "author": "Invertase <contact@invertase.io> (http://invertase.io)",
"description": "A well tested, feature rich Firebase implementation for React Native, supporting iOS & Android. Individual module support for Auth, Database, Messaging (FCM), Remote Config, Storage, Admob, Analytics, Crash Reporting, and Performance.", "description": "A well tested, feature rich Firebase implementation for React Native, supporting iOS & Android. Individual module support for Auth, Database, Messaging (FCM), Remote Config, Storage, Admob, Analytics, Crash Reporting, and Performance.",
"main": "index", "main": "index",
@ -77,5 +77,12 @@
"dependencies": { "dependencies": {
"bows": "^1.6.0", "bows": "^1.6.0",
"prop-types": "^15.5.10" "prop-types": "^15.5.10"
},
"rnpm": {
"android": {
"buildPatch": " compile(project(':react-native-firebase')) {\n transitive = false\n }\n",
"packageImportPath": "import io.invertase.firebase.RNFirebasePackage;\nimport io.invertase.firebase.analytics.RNFirebaseAnalyticsPackage;",
"packageInstance": "new RNFirebasePackage(),\n new RNFirebaseAnalyticsPackage()"
}
} }
} }