Merge remote-tracking branch 'upstream/master'

.travis.yml

@@ -1,3 +1,3 @@
 language: node_js
 node_js:
-  - "6"
+  - "7"

RNNotifications/RNNotifications.h

@@ -1,6 +1,10 @@
 @import UIKit;
 
-#import "RCTBridgeModule.h"
+#if __has_include(<React/RCTBridgeModule.h>)
+  #import <React/RCTBridgeModule.h>
+#else
+  #import "RCTBridgeModule.h"
+#endif
 #import <PushKit/PushKit.h>
 
 @interface RNNotifications : NSObject <RCTBridgeModule>

RNNotifications/RNNotifications.m

@@ -1,11 +1,19 @@
 
 #import <UIKit/UIKit.h>
 #import <PushKit/PushKit.h>
-#import "RCTBridge.h"
-#import "RCTEventDispatcher.h"
-#import "RNNotifications.h"
-#import "RCTConvert.h"
-#import "RCTUtils.h"
+#if __has_include(<React/RCTBridge.h>)
+  #import <React/RCTBridge.h>
+  #import <React/RCTEventDispatcher.h>
+  #import "RNNotifications.h"
+  #import <React/RCTConvert.h>
+  #import <React/RCTUtils.h>
+#else
+  #import "RCTBridge.h"
+  #import "RCTEventDispatcher.h"
+  #import "RNNotifications.h"
+  #import "RCTConvert.h"
+  #import "RCTUtils.h"
+#endif
 #import "RNNotificationsBridgeQueue.h"
 
 NSString* const RNNotificationCreateAction = @"CREATE";

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-notifications",
-  "version": "1.1.8",
+  "version": "1.1.9",
   "description": "Advanced Push Notifications (Silent, interactive notifications) for iOS & Android",
   "author": "Lidan Hifi <lidan.hifi@gmail.com>",
   "license": "MIT",