Skip to content

Commit 0af1a22

Browse files
authored
Merge pull request #85 from alextkd/master
add support for newer react-native versions and backwards compatibility for previous
2 parents 41d08c6 + 994944a commit 0af1a22

File tree

3 files changed

+27
-6
lines changed

3 files changed

+27
-6
lines changed

RCTConvert+RNPStatus.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66
// Copyright © 2016 Yonah Forst. All rights reserved.
77
//
88

9-
#import <React/RCTConvert.h>
9+
#if __has_include("RCTConvert.h")
10+
#import "RCTConvert.h"
11+
#else
12+
#import <React/RCTConvert.h>
13+
#endif
1014

1115
static NSString* RNPStatusUndetermined = @"undetermined";
1216
static NSString* RNPStatusDenied = @"denied";

ReactNativePermissions.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,12 @@
55
// Created by Yonah Forst on 18/02/16.
66
// Copyright © 2016 Yonah Forst. All rights reserved.
77
//
8-
#import <React/RCTBridgeModule.h>
98

10-
#import <Foundation/Foundation.h>
9+
#if __has_include("RCTBridgeModule.h")
10+
#import "RCTBridgeModule.h"
11+
#else
12+
#import <React/RCTBridgeModule.h>
13+
#endif
1114

1215
@interface ReactNativePermissions : NSObject <RCTBridgeModule>
1316

ReactNativePermissions.m

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,23 @@
1010

1111
#import "ReactNativePermissions.h"
1212

13-
#import <React/RCTBridge.h>
14-
#import <React/RCTConvert.h>
15-
#import <React/RCTEventDispatcher.h>
13+
#if __has_include("RCTBridge.h")
14+
#import "RCTBridge.h"
15+
#else
16+
#import <React/RCTBridge.h>
17+
#endif
18+
19+
#if __has_include("RCTConvert.h")
20+
#import "RCTConvert.h"
21+
#else
22+
#import <React/RCTConvert.h>
23+
#endif
24+
25+
#if __has_include("RCTEventDispatcher.h")
26+
#import "RCTEventDispatcher.h"
27+
#else
28+
#import <React/RCTEventDispatcher.h>
29+
#endif
1630

1731
#import "RNPLocation.h"
1832
#import "RNPBluetooth.h"

0 commit comments

Comments
 (0)