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

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

# Conflicts:
#	ios/RNFirebase/admob/RNFirebaseAdMob.m
#	ios/RNFirebase/database/RNFirebaseDatabase.h
#	ios/RNFirebase/database/RNFirebaseDatabaseReference.m
#	lib/modules/admob/index.js
#	tests/ios/Podfile.lock
This commit is contained in:
Salakar 2017-08-11 17:37:12 +01:00
parent 70b6983583 184a0981ea
commit ac258681bc
19 changed files with 115 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ios/RNFirebase/RNFirebase.h
View File

@ -1,5 +1,6 @@
#ifndef RNFirebase_h
#define RNFirebase_h
#import <Foundation/Foundation.h>
#import <React/RCTEventEmitter.h>
#import <React/RCTBridgeModule.h>

3
ios/RNFirebase/admob/NativeExpressComponent.h
View File

@ -23,8 +23,7 @@
@end
#else
@interface NativeExpressComponent : NSObject {
}
@interface NativeExpressComponent : NSObject
@end
#endif

7
ios/RNFirebase/admob/RNFirebaseAdMob.h
View File

@ -1,11 +1,11 @@
#ifndef RNFirebaseAdMob_h
#define RNFirebaseAdMob_h
#import <React/RCTBridgeModule.h>
#import <Foundation/Foundation.h>
#if __has_include(<GoogleMobileAds/GADMobileAds.h>)
#import "Firebase.h"
#import "RNFirebaseEvents.h"
#import <React/RCTBridgeModule.h>
#import "React/RCTEventEmitter.h"
#import "GoogleMobileAds/GADInterstitialDelegate.h"
#import "GoogleMobileAds/GADRewardBasedVideoAdDelegate.h"
@ -23,8 +23,7 @@
@end
#else
@interface RNFirebaseAdMob : NSObject {
}
@interface RNFirebaseAdMob : NSObject
@end
#endif

6
ios/RNFirebase/admob/RNFirebaseAdMob.m
View File

@ -2,7 +2,6 @@
#if __has_include(<GoogleMobileAds/GADMobileAds.h>)
#import "RNFirebaseAdMobInterstitial.h"
#import "RNFirebaseAdMobRewardedVideo.h"
@ -220,8 +219,7 @@ RCT_EXPORT_METHOD(clearInterstitial:
#else
@interface RNFirebaseAdMobRewardedVideo : NSObject <RCTBridgeModule> {
}
@implementation RNFirebaseAdMob
@end
#endif
#endif

7
ios/RNFirebase/analytics/RNFirebaseAnalytics.h
View File

@ -1,6 +1,8 @@
#ifndef RNFirebaseAnalytics_h
#define RNFirebaseAnalytics_h
#import <Foundation/Foundation.h>
#if __has_include(<FirebaseAnalytics/FIRAnalytics.h>)
#import <React/RCTBridgeModule.h>
@interface RNFirebaseAnalytics : NSObject <RCTBridgeModule> {
@ -9,4 +11,9 @@
@end
#else
@interface RNFirebaseAnalytics : NSObject
@end
#endif
#endif

7
ios/RNFirebase/auth/RNFirebaseAuth.h
View File

@ -1,10 +1,10 @@
#ifndef RNFirebaseAuth_h
#define RNFirebaseAuth_h
#import <React/RCTBridgeModule.h>
#import <Foundation/Foundation.h>
#if __has_include(<FirebaseAuth/FIRAuth.h>)
#import "Firebase.h"
#import <React/RCTBridgeModule.h>
#import <React/RCTEventEmitter.h>
@interface RNFirebaseAuth : RCTEventEmitter <RCTBridgeModule> {};
@ -13,8 +13,7 @@
@end
#else
@interface RNFirebaseAuth : NSObject <RCTBridgeModule> {
}
@interface RNFirebaseAuth : NSObject
@end
#endif

7
ios/RNFirebase/config/RNFirebaseRemoteConfig.h
View File

@ -1,10 +1,17 @@
#ifndef RNFirebaseRemoteConfig_h
#define RNFirebaseRemoteConfig_h
#import <Foundation/Foundation.h>
#if __has_include(<FirebaseRemoteConfig/FirebaseRemoteConfig.h>)
#import <React/RCTBridgeModule.h>
@interface RNFirebaseRemoteConfig : NSObject <RCTBridgeModule>
@end
#else
@interface RNFirebaseRemoteConfig : NSObject
@end
#endif
#endif

7
ios/RNFirebase/crash/RNFirebaseCrash.h
View File

@ -1,6 +1,8 @@
#ifndef RNFirebaseCrash_h
#define RNFirebaseCrash_h
#import <Foundation/Foundation.h>
#if __has_include(<FirebaseCrash/FIRCrashLog.h>)
#import <React/RCTBridgeModule.h>
@interface RNFirebaseCrash : NSObject <RCTBridgeModule> {
@ -9,4 +11,9 @@
@end
#else
@interface RNFirebaseCrash : NSObject
@end
#endif
#endif

7
ios/RNFirebase/database/RNFirebaseDatabase.h
View File

@ -1,10 +1,9 @@
#ifndef RNFirebaseDatabase_h
#define RNFirebaseDatabase_h
#import <React/RCTBridgeModule.h>
#import <Foundation/Foundation.h>
#if __has_include(<FirebaseDatabase/FIRDatabase.h>)
#import "Firebase.h"
#import <React/RCTBridgeModule.h>
#import <React/RCTEventEmitter.h>
@interface RNFirebaseDatabase : RCTEventEmitter<RCTBridgeModule> {}
@ -20,7 +19,7 @@
@end
#else
@interface RNFirebaseDatabase : NSObject<RCTBridgeModule> {}
@interface RNFirebaseDatabase : NSObject
@end
#endif

2
ios/RNFirebase/database/RNFirebaseDatabaseReference.h
View File

@ -1,7 +1,9 @@
#ifndef RNFirebaseDatabaseReference_h
#define RNFirebaseDatabaseReference_h
#import <Foundation/Foundation.h>
#if __has_include(<FirebaseDatabase/FIRDatabase.h>)
#import "RNFirebaseEvents.h"
#import <React/RCTEventEmitter.h>
#import "Firebase.h"

23
ios/RNFirebase/database/RNFirebaseDatabaseReference.m
View File

@ -1,11 +1,9 @@
#import "RNFirebaseDatabaseReference.h"
#if __has_include(<FirebaseDatabase/FIRDatabase.h>)
#import "RNFirebaseDatabase.h"
#import "RNFirebaseEvents.h"
@implementation RNFirebaseDatabaseReference
#if __has_include(<FirebaseDatabase/FIRDatabase.h>)
- (id)initWithPathAndModifiers:(RCTEventEmitter *)emitter
app:(NSString *) app
refId:(NSNumber *) refId
@ -17,10 +15,10 @@
_app = app;
_refId = refId;
_path = refPath;
// TODO: Only create if needed
_listeners = [[NSMutableDictionary alloc] init];
_query = [self buildQueryAtPathWithModifiers:refPath modifiers:modifiers];
}
return self;
@ -75,7 +73,7 @@
listenerId:(NSNumber *) listenerId {
NSMutableDictionary *snapshot = [[NSMutableDictionary alloc] init];
NSMutableDictionary *eventMap = [[NSMutableDictionary alloc] init];
[snapshot setValue:dataSnapshot.key forKey:@"key"];
[snapshot setValue:@(dataSnapshot.exists) forKey:@"exists"];
[snapshot setValue:@(dataSnapshot.hasChildren) forKey:@"hasChildren"];
@ -83,14 +81,14 @@
[snapshot setValue:dataSnapshot.value forKey:@"value"];
[snapshot setValue:[RNFirebaseDatabaseReference getChildKeys:dataSnapshot] forKey:@"childKeys"];
[snapshot setValue:dataSnapshot.priority forKey:@"priority"];
[eventMap setValue:refId forKey:@"refId"];
[eventMap setValue:path forKey:@"path"];
[eventMap setValue:snapshot forKey:@"snapshot"];
[eventMap setValue:eventName forKey:@"eventName"];
[eventMap setValue:listenerId forKey:@"listenerId"];
[eventMap setValue:previousChildName forKey:@"previousChildName"];
return eventMap;
}
@ -239,9 +237,6 @@
return eventType;
}
@end
#else
@implementation RNFirebaseDatabase
@end
#endif
@end

6
ios/RNFirebase/messaging/RNFirebaseMessaging.h
View File

@ -1,10 +1,10 @@
#ifndef RNFirebaseMessaging_h
#define RNFirebaseMessaging_h
#import <React/RCTBridgeModule.h>
#import <Foundation/Foundation.h>
#if __has_include(<FirebaseMessaging/FirebaseMessaging.h>)
#import <FirebaseMessaging/FirebaseMessaging.h>
#import <React/RCTBridgeModule.h>
#import <React/RCTEventEmitter.h>
@import UserNotifications;
@ -28,7 +28,7 @@ typedef void (^RCTNotificationResponseCallback)();
@end
#else
@interface RNFirebaseMessaging : NSObject<RCTBridgeModule>
@interface RNFirebaseMessaging : NSObject
@end
#endif

7
ios/RNFirebase/perf/RNFirebasePerformance.h
View File

@ -1,6 +1,8 @@
#ifndef RNFirebasePerformance_h
#define RNFirebasePerformance_h
#import <Foundation/Foundation.h>
#if __has_include(<FirebasePerformance/FIRPerformance.h>)
#import <React/RCTBridgeModule.h>
@interface RNFirebasePerformance : NSObject <RCTBridgeModule> {
@ -11,4 +13,9 @@
@end
#else
@interface RNFirebasePerformance : NSObject
@end
#endif
#endif

6
ios/RNFirebase/storage/RNFirebaseStorage.h
View File

@ -1,9 +1,9 @@
#ifndef RNFirebaseStorage_h
#define RNFirebaseStorage_h
#import <React/RCTBridgeModule.h>
#import <Foundation/Foundation.h>
#if __has_include(<FirebaseStorage/FIRStorage.h>)
#import <React/RCTBridgeModule.h>
#import <React/RCTEventEmitter.h>
@interface RNFirebaseStorage : RCTEventEmitter<RCTBridgeModule> {
@ -13,7 +13,7 @@
@end
#else
@interface RNFirebaseStorage : NSObject<RCTBridgeModule>
@interface RNFirebaseStorage : NSObject
@end
#endif

4
lib/modules/admob/index.js
View File

@ -68,8 +68,8 @@ export default class Admob extends ModuleBase {
return new RewardedVideo(this, adUnit);
}
static get statics() {
return statics;
get namespace(): string {
return 'firebase:admob';
}
}

9
package.json
View File

@ -1,6 +1,6 @@
{
"name": "react-native-firebase",
"version": "2.1.0",
"version": "2.1.2",
"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.",
"main": "index",
@ -77,5 +77,12 @@
"dependencies": {
"bows": "^1.6.0",
"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()"
}
}
}

2
tests/android/app/build.gradle
View File

@ -133,7 +133,7 @@ android {
}
}
project.ext.firebaseVersion = '11.0.0'
project.ext.firebaseVersion = '11.0.4'
dependencies {
compile(project(':react-native-firebase')) {

77
tests/ios/Podfile.lock
View File

@ -1,37 +1,37 @@
PODS:
- Firebase/AdMob (4.0.2):
- Firebase/AdMob (4.0.4):
- Firebase/Core
- Google-Mobile-Ads-SDK (= 7.20.0)
- Firebase/Analytics (4.0.2):
- Google-Mobile-Ads-SDK (= 7.21.0)
- Firebase/Analytics (4.0.4):
- Firebase/Core
- Firebase/Auth (4.0.2):
- Firebase/Auth (4.0.4):
- Firebase/Core
- FirebaseAuth (= 4.0.0)
- Firebase/Core (4.0.2):
- FirebaseAnalytics (= 4.0.1)
- FirebaseCore (= 4.0.2)
- Firebase/Crash (4.0.2):
- Firebase/Core (4.0.4):
- FirebaseAnalytics (= 4.0.2)
- FirebaseCore (= 4.0.4)
- Firebase/Crash (4.0.4):
- Firebase/Core
- FirebaseCrash (= 2.0.0)
- Firebase/Database (4.0.2):
- Firebase/Database (4.0.4):
- Firebase/Core
- FirebaseDatabase (= 4.0.0)
- Firebase/DynamicLinks (4.0.2):
- Firebase/DynamicLinks (4.0.4):
- Firebase/Core
- FirebaseDynamicLinks (= 2.0.0)
- Firebase/Messaging (4.0.2):
- Firebase/Messaging (4.0.4):
- Firebase/Core
- FirebaseMessaging (= 2.0.0)
- Firebase/Performance (4.0.2):
- Firebase/Performance (4.0.4):
- Firebase/Core
- FirebasePerformance (= 1.0.2)
- Firebase/RemoteConfig (4.0.2):
- FirebasePerformance (= 1.0.3)
- Firebase/RemoteConfig (4.0.4):
- Firebase/Core
- FirebaseRemoteConfig (= 2.0.0)
- Firebase/Storage (4.0.2):
- FirebaseRemoteConfig (= 2.0.1)
- Firebase/Storage (4.0.4):
- Firebase/Core
- FirebaseStorage (= 2.0.0)
- FirebaseAnalytics (4.0.1):
- FirebaseAnalytics (4.0.2):
- FirebaseCore (~> 4.0)
- FirebaseInstanceID (~> 2.0)
- GoogleToolboxForMac/NSData+zlib (~> 2.1)
@ -39,8 +39,9 @@ PODS:
- FirebaseAnalytics (~> 4.0)
- GoogleToolboxForMac/NSDictionary+URLArguments (~> 2.1)
- GTMSessionFetcher/Core (~> 1.1)
- FirebaseCore (4.0.2):
- FirebaseCore (4.0.4):
- GoogleToolboxForMac/NSData+zlib (~> 2.1)
- nanopb (~> 0.3)
- FirebaseCrash (2.0.0):
- FirebaseAnalytics (~> 4.0)
- FirebaseInstanceID (~> 2.0)
@ -59,14 +60,14 @@ PODS:
- FirebaseInstanceID (~> 2.0)
- GoogleToolboxForMac/Logger (~> 2.1)
- Protobuf (~> 3.1)
- FirebasePerformance (1.0.2):
- FirebasePerformance (1.0.3):
- FirebaseAnalytics (~> 4.0)
- FirebaseInstanceID (~> 2.0)
- GoogleToolboxForMac/Logger (~> 2.1)
- GoogleToolboxForMac/NSData+zlib (~> 2.1)
- GTMSessionFetcher/Core (~> 1.1)
- Protobuf (~> 3.1)
- FirebaseRemoteConfig (2.0.0):
- FirebaseRemoteConfig (2.0.1):
- FirebaseAnalytics (~> 4.0)
- FirebaseInstanceID (~> 2.0)
- GoogleToolboxForMac/NSData+zlib (~> 2.1)
@ -75,7 +76,7 @@ PODS:
- FirebaseAnalytics (~> 4.0)
- FirebaseCore (~> 4.0)
- GTMSessionFetcher/Core (~> 1.1)
- Google-Mobile-Ads-SDK (7.20.0)
- Google-Mobile-Ads-SDK (7.21.0)
- GoogleToolboxForMac/DebugUtils (2.1.1):
- GoogleToolboxForMac/Defines (= 2.1.1)
- GoogleToolboxForMac/Defines (2.1.1)
@ -88,7 +89,12 @@ PODS:
- GoogleToolboxForMac/Defines (= 2.1.1)
- GoogleToolboxForMac/NSString+URLArguments (= 2.1.1)
- GoogleToolboxForMac/NSString+URLArguments (2.1.1)
- GTMSessionFetcher/Core (1.1.10)
- GTMSessionFetcher/Core (1.1.11)
- nanopb (0.3.8):
- nanopb/decode (= 0.3.8)
- nanopb/encode (= 0.3.8)
- nanopb/decode (0.3.8)
- nanopb/encode (0.3.8)
- Protobuf (3.3.0)
- React (0.44.3):
- React/Core (= 0.44.3)
@ -98,7 +104,7 @@ PODS:
- React/cxxreact (0.44.3):
- React/jschelpers
- React/jschelpers (0.44.3)
- RNFirebase (2.0.4):
- RNFirebase (2.1.0):
- React
- Yoga (0.44.3.React)
@ -120,33 +126,34 @@ DEPENDENCIES:
EXTERNAL SOURCES:
React:
:path: "../node_modules/react-native"
:path: ../node_modules/react-native
RNFirebase:
:path: "./../../"
:path: ./../../
Yoga:
:path: "../node_modules/react-native/ReactCommon/yoga"
:path: ../node_modules/react-native/ReactCommon/yoga
SPEC CHECKSUMS:
Firebase: c7ad0731eab26d18a3fc547dd048b0f7cd9c63ae
FirebaseAnalytics: 4d7040fefc3cd8b291cde35f12cf063d7963f15d
Firebase: 1492bf04e1b73a7353b4fb2cf5a20bac9692f341
FirebaseAnalytics: ad41720e3e67fc63fbe3d2948d3e26932a8de311
FirebaseAuth: ebb6abcbabae00fc47446d690c19ce68d8484fde
FirebaseCore: 1a8bf6c795ad07d2918278657954ffd2552e9c17
FirebaseCore: cfc042628ef9f20debe09c0eb683135fcd404cb4
FirebaseCrash: 600ec2cbd8e10c3064a42de2c6ee7687bd02a076
FirebaseDatabase: d829b3a8c3e2ac7a16773c5df226966b0805dfc2
FirebaseDynamicLinks: ad3bef2e8addfa1490af9db02201429c5c9447dd
FirebaseInstanceID: 9fbf536668f4d3f0880e7438456dabd1376e294b
FirebaseMessaging: 227406c05b0dc9290702d2e9f18ab5528f0c2cf2
FirebasePerformance: 51a400fba288e43258b94128f2a649faeec5d909
FirebaseRemoteConfig: b1bde8c572a1ca13558b5b179f4563cb877aa34b
FirebasePerformance: 36bdb0500213b459ae991766801d5dc5399ff231
FirebaseRemoteConfig: 328244399f64226cfdfa32efee596bb010ef5665
FirebaseStorage: 8110a1ed2034c8fbfd83890d2acc9cdbbd99afec
Google-Mobile-Ads-SDK: 168312cdc167fa22746d4ea8e839fc4825dd2966
Google-Mobile-Ads-SDK: 4a6f1b43c8cc0e1e95a3b59d9f52a01671c6f9f3
GoogleToolboxForMac: 8e329f1b599f2512c6b10676d45736bcc2cbbeb0
GTMSessionFetcher: 30d874b96d0d76028f61fbd122801e3f030d47db
GTMSessionFetcher: 5ad62e8200fa00ed011fe5e08d27fef72c5b1429
nanopb: 5601e6bca2dbf1ed831b519092ec110f66982ca3
Protobuf: d582fecf68201eac3d79ed61369ef45734394b9c
React: 6361345ebeb769a929e10a06baf0c868d6d03ad5
RNFirebase: 3e5a3ff431c5c8a997152f5f19d354e1ca66f65d
RNFirebase: aef6fb5e509449546aa65cef2efae02d903c5fce
Yoga: c90474ca3ec1edba44c97b6c381f03e222a9e287
PODFILE CHECKSUM: 45666f734ebfc8b3b0f2be0a83bc2680caeb502f
COCOAPODS: 1.2.1
COCOAPODS: 1.3.1

5
tests/ios/ReactNativeFirebaseDemo.xcodeproj/project.pbxproj
View File

@ -1053,13 +1053,16 @@
files = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-ReactNativeFirebaseDemo-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
2D02E4CB1E0B4B27006451C7 /* Bundle React Native Code And Images */ = {