Skip to content

Commit d14ddbe

Browse files
zoontekzoontek
committed
Fix iOS example
1 parent baee70b commit d14ddbe

File tree

4 files changed

+125
-32
lines changed

4 files changed

+125
-32
lines changed

‎RCTConvert+RNPStatus.m‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
@implementation RCTConvert (RNPStatus)
1212

13-
1413
RCT_ENUM_CONVERTER(RNPType, (@{ @"location" : @(RNPTypeLocation),
1514
@"camera" : @(RNPTypeCamera),
1615
@"microphone" : @(RNPTypeMicrophone),

‎ReactNativePermissions.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,4 @@
1616

1717
@interface ReactNativePermissions : NSObject <RCTBridgeModule>
1818

19-
2019
@end

‎ReactNativePermissions.m‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#import "RCTBridge.h"
1919
#endif
2020

21-
2221
#if __has_include(<React/RCTConvert.h>)
2322
#import <React/RCTConvert.h>
2423
#elif __has_include("React/RCTConvert.h")

‎example/ios/Example.xcodeproj/project.pbxproj‎

Lines changed: 125 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
2D02E4C61E0B4AEC006451C7 /* libRCTSettings-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3E901DF850E9000B6D8A /* libRCTSettings-tvOS.a */; };
3333
2D02E4C71E0B4AEC006451C7 /* libRCTText-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3E941DF850E9000B6D8A /* libRCTText-tvOS.a */; };
3434
2D02E4C81E0B4AEC006451C7 /* libRCTWebSocket-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3E991DF850E9000B6D8A /* libRCTWebSocket-tvOS.a */; };
35-
2D02E4C91E0B4AEC006451C7 /* libReact-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3EA31DF850E9000B6D8A /* libReact-tvOS.a */; };
35+
2D02E4C91E0B4AEC006451C7 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3EA31DF850E9000B6D8A /* libReact.a */; };
3636
2DCD954D1E0B4F2C00145EB5 /* ExampleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* ExampleTests.m */; };
3737
5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
38-
66F16C091FC608C600E71FEB /* libReactNativePermissions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 66F16C071FC608A900E71FEB /* libReactNativePermissions.a */; };
38+
661E35741FD3114100C328EA /* libReactNativePermissions.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 661E35731FD3113500C328EA /* libReactNativePermissions.a */; };
3939
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
4040
ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; };
4141
/* End PBXBuildFile section */
@@ -216,6 +216,55 @@
216216
remoteGlobalIDString = 2D2A28201D9B03D100D4039D;
217217
remoteInfo = "RCTAnimation-tvOS";
218218
};
219+
661E35331FD3107F00C328EA /* PBXContainerItemProxy */ = {
220+
isa = PBXContainerItemProxy;
221+
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
222+
proxyType = 2;
223+
remoteGlobalIDString = 139D7ECE1E25DB7D00323FB7;
224+
remoteInfo = "third-party";
225+
};
226+
661E35351FD3107F00C328EA /* PBXContainerItemProxy */ = {
227+
isa = PBXContainerItemProxy;
228+
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
229+
proxyType = 2;
230+
remoteGlobalIDString = 3D383D3C1EBD27B6005632C8;
231+
remoteInfo = "third-party-tvOS";
232+
};
233+
661E35371FD3107F00C328EA /* PBXContainerItemProxy */ = {
234+
isa = PBXContainerItemProxy;
235+
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
236+
proxyType = 2;
237+
remoteGlobalIDString = 139D7E881E25C6D100323FB7;
238+
remoteInfo = "double-conversion";
239+
};
240+
661E35391FD3107F00C328EA /* PBXContainerItemProxy */ = {
241+
isa = PBXContainerItemProxy;
242+
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
243+
proxyType = 2;
244+
remoteGlobalIDString = 3D383D621EBD27B9005632C8;
245+
remoteInfo = "double-conversion-tvOS";
246+
};
247+
661E353B1FD3107F00C328EA /* PBXContainerItemProxy */ = {
248+
isa = PBXContainerItemProxy;
249+
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
250+
proxyType = 2;
251+
remoteGlobalIDString = 9936F3131F5F2E4B0010BF04;
252+
remoteInfo = privatedata;
253+
};
254+
661E353D1FD3107F00C328EA /* PBXContainerItemProxy */ = {
255+
isa = PBXContainerItemProxy;
256+
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
257+
proxyType = 2;
258+
remoteGlobalIDString = 9936F32F1F5F2E5B0010BF04;
259+
remoteInfo = "privatedata-tvOS";
260+
};
261+
661E35721FD3113500C328EA /* PBXContainerItemProxy */ = {
262+
isa = PBXContainerItemProxy;
263+
containerPortal = A04BD34DF4564A4A8E4497EC /* ReactNativePermissions.xcodeproj */;
264+
proxyType = 2;
265+
remoteGlobalIDString = 9D23B34F1C767B80008B4819;
266+
remoteInfo = ReactNativePermissions;
267+
};
219268
66F16BED1FC608A800E71FEB /* PBXContainerItemProxy */ = {
220269
isa = PBXContainerItemProxy;
221270
containerPortal = ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */;
@@ -237,13 +286,6 @@
237286
remoteGlobalIDString = 3DBE0D0D1F3B181C0099AA32;
238287
remoteInfo = "fishhook-tvOS";
239288
};
240-
66F16C061FC608A900E71FEB /* PBXContainerItemProxy */ = {
241-
isa = PBXContainerItemProxy;
242-
containerPortal = 0D173517D64E4E0C9D1491B9 /* ReactNativePermissions.xcodeproj */;
243-
proxyType = 2;
244-
remoteGlobalIDString = 9D23B34F1C767B80008B4819;
245-
remoteInfo = ReactNativePermissions;
246-
};
247289
78C398B81ACF4ADC00677621 /* PBXContainerItemProxy */ = {
248290
isa = PBXContainerItemProxy;
249291
containerPortal = 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */;
@@ -277,7 +319,6 @@
277319
00E356EE1AD99517003FC87E /* ExampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ExampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
278320
00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
279321
00E356F21AD99517003FC87E /* ExampleTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ExampleTests.m; sourceTree = "<group>"; };
280-
0D173517D64E4E0C9D1491B9 /* ReactNativePermissions.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = ReactNativePermissions.xcodeproj; path = "../node_modules/react-native-permissions/ReactNativePermissions.xcodeproj"; sourceTree = "<group>"; };
281322
139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTSettings.xcodeproj; path = "../node_modules/react-native/Libraries/Settings/RCTSettings.xcodeproj"; sourceTree = "<group>"; };
282323
139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocket.xcodeproj; path = "../node_modules/react-native/Libraries/WebSocket/RCTWebSocket.xcodeproj"; sourceTree = "<group>"; };
283324
13B07F961A680F5B00A75B9A /* Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -293,6 +334,7 @@
293334
5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = "<group>"; };
294335
78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
295336
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
337+
A04BD34DF4564A4A8E4497EC /* ReactNativePermissions.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = ReactNativePermissions.xcodeproj; path = "../node_modules/react-native-permissions/ReactNativePermissions.xcodeproj"; sourceTree = "<group>"; };
296338
ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBlob.xcodeproj; path = "../node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj"; sourceTree = "<group>"; };
297339
/* End PBXFileReference section */
298340

@@ -322,15 +364,15 @@
322364
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */,
323365
00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */,
324366
139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */,
325-
66F16C091FC608C600E71FEB /* libReactNativePermissions.a in Frameworks */,
367+
661E35741FD3114100C328EA /* libReactNativePermissions.a in Frameworks */,
326368
);
327369
runOnlyForDeploymentPostprocessing = 0;
328370
};
329371
2D02E4781E0B4A5D006451C7 /* Frameworks */ = {
330372
isa = PBXFrameworksBuildPhase;
331373
buildActionMask = 2147483647;
332374
files = (
333-
2D02E4C91E0B4AEC006451C7 /* libReact-tvOS.a in Frameworks */,
375+
2D02E4C91E0B4AEC006451C7 /* libReact.a in Frameworks */,
334376
2D02E4C21E0B4AEC006451C7 /* libRCTAnimation.a in Frameworks */,
335377
2D02E4C31E0B4AEC006451C7 /* libRCTImage-tvOS.a in Frameworks */,
336378
2D02E4C41E0B4AEC006451C7 /* libRCTLinking-tvOS.a in Frameworks */,
@@ -448,13 +490,19 @@
448490
isa = PBXGroup;
449491
children = (
450492
146834041AC3E56700842450 /* libReact.a */,
493+
3DAD3EA31DF850E9000B6D8A /* libReact.a */,
451494
3DAD3EA51DF850E9000B6D8A /* libyoga.a */,
452495
3DAD3EA71DF850E9000B6D8A /* libyoga.a */,
453496
3DAD3EA91DF850E9000B6D8A /* libcxxreact.a */,
454497
3DAD3EAB1DF850E9000B6D8A /* libcxxreact.a */,
455498
3DAD3EAD1DF850E9000B6D8A /* libjschelpers.a */,
456499
3DAD3EAF1DF850E9000B6D8A /* libjschelpers.a */,
457-
3DAD3EA31DF850E9000B6D8A /* libReact-tvOS.a */,
500+
661E35341FD3107F00C328EA /* libthird-party.a */,
501+
661E35361FD3107F00C328EA /* libthird-party.a */,
502+
661E35381FD3107F00C328EA /* libdouble-conversion.a */,
503+
661E353A1FD3107F00C328EA /* libdouble-conversion.a */,
504+
661E353C1FD3107F00C328EA /* libprivatedata.a */,
505+
661E353E1FD3107F00C328EA /* libprivatedata-tvOS.a */,
458506
);
459507
name = Products;
460508
sourceTree = "<group>";
@@ -468,10 +516,10 @@
468516
name = Products;
469517
sourceTree = "<group>";
470518
};
471-
66F16C031FC608A800E71FEB /* Products */ = {
519+
661E356F1FD3113500C328EA /* Products */ = {
472520
isa = PBXGroup;
473521
children = (
474-
66F16C071FC608A900E71FEB /* libReactNativePermissions.a */,
522+
661E35731FD3113500C328EA /* libReactNativePermissions.a */,
475523
);
476524
name = Products;
477525
sourceTree = "<group>";
@@ -507,7 +555,7 @@
507555
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */,
508556
00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */,
509557
139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */,
510-
0D173517D64E4E0C9D1491B9 /* ReactNativePermissions.xcodeproj */,
558+
A04BD34DF4564A4A8E4497EC /* ReactNativePermissions.xcodeproj */,
511559
);
512560
name = Libraries;
513561
sourceTree = "<group>";
@@ -724,8 +772,8 @@
724772
ProjectRef = 146833FF1AC3E56700842450 /* React.xcodeproj */;
725773
},
726774
{
727-
ProductGroup = 66F16C031FC608A800E71FEB /* Products */;
728-
ProjectRef = 0D173517D64E4E0C9D1491B9 /* ReactNativePermissions.xcodeproj */;
775+
ProductGroup = 661E356F1FD3113500C328EA /* Products */;
776+
ProjectRef = A04BD34DF4564A4A8E4497EC /* ReactNativePermissions.xcodeproj */;
729777
},
730778
);
731779
projectRoot = "";
@@ -837,10 +885,10 @@
837885
remoteRef = 3DAD3E981DF850E9000B6D8A /* PBXContainerItemProxy */;
838886
sourceTree = BUILT_PRODUCTS_DIR;
839887
};
840-
3DAD3EA31DF850E9000B6D8A /* libReact-tvOS.a */ = {
888+
3DAD3EA31DF850E9000B6D8A /* libReact.a */ = {
841889
isa = PBXReferenceProxy;
842890
fileType = archive.ar;
843-
path = "libReact-tvOS.a";
891+
path = libReact.a;
844892
remoteRef = 3DAD3EA21DF850E9000B6D8A /* PBXContainerItemProxy */;
845893
sourceTree = BUILT_PRODUCTS_DIR;
846894
};
@@ -900,6 +948,55 @@
900948
remoteRef = 5E9157341DD0AC6500FF2AA8 /* PBXContainerItemProxy */;
901949
sourceTree = BUILT_PRODUCTS_DIR;
902950
};
951+
661E35341FD3107F00C328EA /* libthird-party.a */ = {
952+
isa = PBXReferenceProxy;
953+
fileType = archive.ar;
954+
path = "libthird-party.a";
955+
remoteRef = 661E35331FD3107F00C328EA /* PBXContainerItemProxy */;
956+
sourceTree = BUILT_PRODUCTS_DIR;
957+
};
958+
661E35361FD3107F00C328EA /* libthird-party.a */ = {
959+
isa = PBXReferenceProxy;
960+
fileType = archive.ar;
961+
path = "libthird-party.a";
962+
remoteRef = 661E35351FD3107F00C328EA /* PBXContainerItemProxy */;
963+
sourceTree = BUILT_PRODUCTS_DIR;
964+
};
965+
661E35381FD3107F00C328EA /* libdouble-conversion.a */ = {
966+
isa = PBXReferenceProxy;
967+
fileType = archive.ar;
968+
path = "libdouble-conversion.a";
969+
remoteRef = 661E35371FD3107F00C328EA /* PBXContainerItemProxy */;
970+
sourceTree = BUILT_PRODUCTS_DIR;
971+
};
972+
661E353A1FD3107F00C328EA /* libdouble-conversion.a */ = {
973+
isa = PBXReferenceProxy;
974+
fileType = archive.ar;
975+
path = "libdouble-conversion.a";
976+
remoteRef = 661E35391FD3107F00C328EA /* PBXContainerItemProxy */;
977+
sourceTree = BUILT_PRODUCTS_DIR;
978+
};
979+
661E353C1FD3107F00C328EA /* libprivatedata.a */ = {
980+
isa = PBXReferenceProxy;
981+
fileType = archive.ar;
982+
path = libprivatedata.a;
983+
remoteRef = 661E353B1FD3107F00C328EA /* PBXContainerItemProxy */;
984+
sourceTree = BUILT_PRODUCTS_DIR;
985+
};
986+
661E353E1FD3107F00C328EA /* libprivatedata-tvOS.a */ = {
987+
isa = PBXReferenceProxy;
988+
fileType = archive.ar;
989+
path = "libprivatedata-tvOS.a";
990+
remoteRef = 661E353D1FD3107F00C328EA /* PBXContainerItemProxy */;
991+
sourceTree = BUILT_PRODUCTS_DIR;
992+
};
993+
661E35731FD3113500C328EA /* libReactNativePermissions.a */ = {
994+
isa = PBXReferenceProxy;
995+
fileType = archive.ar;
996+
path = libReactNativePermissions.a;
997+
remoteRef = 661E35721FD3113500C328EA /* PBXContainerItemProxy */;
998+
sourceTree = BUILT_PRODUCTS_DIR;
999+
};
9031000
66F16BEE1FC608A800E71FEB /* libRCTBlob-tvOS.a */ = {
9041001
isa = PBXReferenceProxy;
9051002
fileType = archive.ar;
@@ -921,13 +1018,6 @@
9211018
remoteRef = 66F16C011FC608A800E71FEB /* PBXContainerItemProxy */;
9221019
sourceTree = BUILT_PRODUCTS_DIR;
9231020
};
924-
66F16C071FC608A900E71FEB /* libReactNativePermissions.a */ = {
925-
isa = PBXReferenceProxy;
926-
fileType = archive.ar;
927-
path = libReactNativePermissions.a;
928-
remoteRef = 66F16C061FC608A900E71FEB /* PBXContainerItemProxy */;
929-
sourceTree = BUILT_PRODUCTS_DIR;
930-
};
9311021
78C398B91ACF4ADC00677621 /* libRCTLinking.a */ = {
9321022
isa = PBXReferenceProxy;
9331023
fileType = archive.ar;
@@ -1098,6 +1188,7 @@
10981188
LIBRARY_SEARCH_PATHS = (
10991189
"$(inherited)",
11001190
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1191+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
11011192
);
11021193
OTHER_LDFLAGS = (
11031194
"-ObjC",
@@ -1124,6 +1215,7 @@
11241215
LIBRARY_SEARCH_PATHS = (
11251216
"$(inherited)",
11261217
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1218+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
11271219
);
11281220
OTHER_LDFLAGS = (
11291221
"-ObjC",
@@ -1195,13 +1287,14 @@
11951287
GCC_NO_COMMON_BLOCKS = YES;
11961288
HEADER_SEARCH_PATHS = (
11971289
"$(inherited)",
1198-
"$(SRCROOT)/../node_modules/react-native-permissions/**",
1290+
"$(SRCROOT)/../node_modules/react-native-permissions",
11991291
);
12001292
INFOPLIST_FILE = "Example-tvOS/Info.plist";
12011293
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
12021294
LIBRARY_SEARCH_PATHS = (
12031295
"$(inherited)",
12041296
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1297+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
12051298
);
12061299
OTHER_LDFLAGS = (
12071300
"-ObjC",
@@ -1229,13 +1322,14 @@
12291322
GCC_NO_COMMON_BLOCKS = YES;
12301323
HEADER_SEARCH_PATHS = (
12311324
"$(inherited)",
1232-
"$(SRCROOT)/../node_modules/react-native-permissions/**",
1325+
"$(SRCROOT)/../node_modules/react-native-permissions",
12331326
);
12341327
INFOPLIST_FILE = "Example-tvOS/Info.plist";
12351328
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
12361329
LIBRARY_SEARCH_PATHS = (
12371330
"$(inherited)",
12381331
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1332+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
12391333
);
12401334
OTHER_LDFLAGS = (
12411335
"-ObjC",
@@ -1265,6 +1359,7 @@
12651359
LIBRARY_SEARCH_PATHS = (
12661360
"$(inherited)",
12671361
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1362+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
12681363
);
12691364
PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.Example-tvOSTests";
12701365
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1290,6 +1385,7 @@
12901385
LIBRARY_SEARCH_PATHS = (
12911386
"$(inherited)",
12921387
"\"$(SRCROOT)/$(TARGET_NAME)\"",
1388+
"\"$(SRCROOT)/$(TARGET_NAME)\"",
12931389
);
12941390
PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.Example-tvOSTests";
12951391
PRODUCT_NAME = "$(TARGET_NAME)";

0 commit comments

Comments
 (0)