From fb2111c027dd354200f6b22f04bda0da88a70161 Mon Sep 17 00:00:00 2001 From: Gustavo Perdomo Date: Tue, 14 Feb 2017 12:31:41 -0300 Subject: [PATCH 1/3] Add support to RN 0.40 --- .travis.yml | 2 +- RNNotifications/RNNotifications.h | 4 ++++ RNNotifications/RNNotifications.m | 16 ++++++++++++---- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4909f83..0fe294a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,3 @@ language: node_js node_js: - - "6" + - "7" diff --git a/RNNotifications/RNNotifications.h b/RNNotifications/RNNotifications.h index f72b424..117a569 100644 --- a/RNNotifications/RNNotifications.h +++ b/RNNotifications/RNNotifications.h @@ -1,6 +1,10 @@ @import UIKit; +#ifdef __has_include() +#import +#else #import "RCTBridgeModule.h" +#endif #import @interface RNNotifications : NSObject diff --git a/RNNotifications/RNNotifications.m b/RNNotifications/RNNotifications.m index 1f8f906..10ac4d3 100644 --- a/RNNotifications/RNNotifications.m +++ b/RNNotifications/RNNotifications.m @@ -1,11 +1,19 @@ #import #import -#import "RCTBridge.h" -#import "RCTEventDispatcher.h" +#if __has_include() +#import +#import #import "RNNotifications.h" -#import "RCTConvert.h" -#import "RCTUtils.h" +#import +#import +#else + #import "RCTBridge.h" + #import "RCTEventDispatcher.h" + #import "RNNotifications.h" + #import "RCTConvert.h" + #import "RCTUtils.h" +#endif #import "RNNotificationsBridgeQueue.h" NSString* const RNNotificationCreateAction = @"CREATE"; From c9e349f94a478145f369199b216b01899a34f249 Mon Sep 17 00:00:00 2001 From: Amit Davidi Date: Wed, 22 Mar 2017 11:54:30 +0200 Subject: [PATCH 2/3] Fix rn-0.40 support PR's usage of __has_include --- RNNotifications/RNNotifications.h | 6 +++--- RNNotifications/RNNotifications.m | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/RNNotifications/RNNotifications.h b/RNNotifications/RNNotifications.h index 117a569..13e6094 100644 --- a/RNNotifications/RNNotifications.h +++ b/RNNotifications/RNNotifications.h @@ -1,9 +1,9 @@ @import UIKit; -#ifdef __has_include() -#import +#if __has_include() + #import #else -#import "RCTBridgeModule.h" + #import "RCTBridgeModule.h" #endif #import diff --git a/RNNotifications/RNNotifications.m b/RNNotifications/RNNotifications.m index 10ac4d3..8c7959d 100644 --- a/RNNotifications/RNNotifications.m +++ b/RNNotifications/RNNotifications.m @@ -2,11 +2,11 @@ #import #import #if __has_include() -#import -#import -#import "RNNotifications.h" -#import -#import + #import + #import + #import "RNNotifications.h" + #import + #import #else #import "RCTBridge.h" #import "RCTEventDispatcher.h" From e4cd4b913a9ac7cde249e70919e8ab2c69bc6889 Mon Sep 17 00:00:00 2001 From: Amit Davidi Date: Wed, 22 Mar 2017 12:29:09 +0200 Subject: [PATCH 3/3] 1.1.9 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2db17ec..b77a044 100644 --- a/package.json +++ b/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 ", "license": "MIT",