Skip to content

Commit 2519141

Browse files
tran2tran2
authored
update ios header file so it'll work with expo sdk 44+ (#89)
1 parent 869fc3e commit 2519141

File tree

4 files changed

+76
-60
lines changed

4 files changed

+76
-60
lines changed

‎example/ios/Podfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@ target 'example' do
2222
#
2323
# Note that if you have use_frameworks! enabled, Flipper will not work and
2424
# you should disable the next line.
25-
use_flipper!()
25+
use_flipper!({ 'Flipper' => '0.151.0' })
2626

2727
post_install do |installer|
2828
react_native_post_install(installer)
29+
flipper_post_install(installer)
2930
end
30-
end
31+
end

‎example/ios/Podfile.lock

Lines changed: 72 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -10,55 +10,69 @@ PODS:
1010
- React-Core (= 0.64.0)
1111
- React-jsi (= 0.64.0)
1212
- ReactCommon/turbomodule/core (= 0.64.0)
13-
- Flipper (0.75.1):
14-
- Flipper-Folly (~> 2.5)
15-
- Flipper-RSocket (~> 1.3)
13+
- Flipper (0.151.0):
14+
- Flipper-Folly (~> 2.6)
15+
- Flipper-Boost-iOSX (1.76.0.1.11)
1616
- Flipper-DoubleConversion (1.1.7)
17-
- Flipper-Folly (2.5.1):
18-
- boost-for-react-native
17+
- Flipper-Fmt (7.1.7)
18+
- Flipper-Folly (2.6.10):
19+
- Flipper-Boost-iOSX
1920
- Flipper-DoubleConversion
21+
- Flipper-Fmt (= 7.1.7)
2022
- Flipper-Glog
2123
- libevent (~> 2.1.12)
22-
- OpenSSL-Universal (= 1.1.180)
24+
- OpenSSL-Universal (= 1.1.1100)
2325
- Flipper-Glog (0.3.6)
2426
- Flipper-PeerTalk (0.0.4)
25-
- Flipper-RSocket (1.3.0):
26-
- Flipper-Folly (~> 2.5)
27-
- FlipperKit (0.75.1):
28-
- FlipperKit/Core (= 0.75.1)
29-
- FlipperKit/Core (0.75.1):
30-
- Flipper (~> 0.75.1)
27+
- Flipper-RSocket (1.4.3):
28+
- Flipper-Folly (~> 2.6)
29+
- FlipperKit (0.151.0):
30+
- FlipperKit/Core (= 0.151.0)
31+
- FlipperKit/Core (0.151.0):
32+
- Flipper (~> 0.151.0)
3133
- FlipperKit/CppBridge
3234
- FlipperKit/FBCxxFollyDynamicConvert
3335
- FlipperKit/FBDefines
3436
- FlipperKit/FKPortForwarding
35-
- FlipperKit/CppBridge (0.75.1):
36-
- Flipper (~> 0.75.1)
37-
- FlipperKit/FBCxxFollyDynamicConvert (0.75.1):
38-
- Flipper-Folly (~> 2.5)
39-
- FlipperKit/FBDefines (0.75.1)
40-
- FlipperKit/FKPortForwarding (0.75.1):
37+
- SocketRocket (~> 0.6.0)
38+
- FlipperKit/CppBridge (0.151.0):
39+
- Flipper (~> 0.151.0)
40+
- FlipperKit/FBCxxFollyDynamicConvert (0.151.0):
41+
- Flipper-Folly (~> 2.6)
42+
- FlipperKit/FBDefines (0.151.0)
43+
- FlipperKit/FKPortForwarding (0.151.0):
4144
- CocoaAsyncSocket (~> 7.6)
4245
- Flipper-PeerTalk (~> 0.0.4)
43-
- FlipperKit/FlipperKitHighlightOverlay (0.75.1)
44-
- FlipperKit/FlipperKitLayoutPlugin (0.75.1):
46+
- FlipperKit/FlipperKitHighlightOverlay (0.151.0)
47+
- FlipperKit/FlipperKitLayoutHelpers (0.151.0):
48+
- FlipperKit/Core
49+
- FlipperKit/FlipperKitHighlightOverlay
50+
- FlipperKit/FlipperKitLayoutTextSearchable
51+
- FlipperKit/FlipperKitLayoutIOSDescriptors (0.151.0):
52+
- FlipperKit/Core
53+
- FlipperKit/FlipperKitHighlightOverlay
54+
- FlipperKit/FlipperKitLayoutHelpers
55+
- YogaKit (~> 1.18)
56+
- FlipperKit/FlipperKitLayoutPlugin (0.151.0):
4557
- FlipperKit/Core
4658
- FlipperKit/FlipperKitHighlightOverlay
59+
- FlipperKit/FlipperKitLayoutHelpers
60+
- FlipperKit/FlipperKitLayoutIOSDescriptors
4761
- FlipperKit/FlipperKitLayoutTextSearchable
4862
- YogaKit (~> 1.18)
49-
- FlipperKit/FlipperKitLayoutTextSearchable (0.75.1)
50-
- FlipperKit/FlipperKitNetworkPlugin (0.75.1):
63+
- FlipperKit/FlipperKitLayoutTextSearchable (0.151.0)
64+
- FlipperKit/FlipperKitNetworkPlugin (0.151.0):
5165
- FlipperKit/Core
52-
- FlipperKit/FlipperKitReactPlugin (0.75.1):
66+
- FlipperKit/FlipperKitReactPlugin (0.151.0):
5367
- FlipperKit/Core
54-
- FlipperKit/FlipperKitUserDefaultsPlugin (0.75.1):
68+
- FlipperKit/FlipperKitUserDefaultsPlugin (0.151.0):
5569
- FlipperKit/Core
56-
- FlipperKit/SKIOSNetworkPlugin (0.75.1):
70+
- FlipperKit/SKIOSNetworkPlugin (0.151.0):
5771
- FlipperKit/Core
5872
- FlipperKit/FlipperKitNetworkPlugin
5973
- glog (0.3.5)
6074
- libevent (2.1.12)
61-
- OpenSSL-Universal (1.1.180)
75+
- OpenSSL-Universal (1.1.1100)
6276
- RCT-Folly (2020.01.13.00):
6377
- boost-for-react-native
6478
- DoubleConversion
@@ -252,8 +266,8 @@ PODS:
252266
- React-jsi (= 0.64.0)
253267
- React-perflogger (= 0.64.0)
254268
- React-jsinspector (0.64.0)
255-
- react-native-progress-view (1.2.3):
256-
- React
269+
- react-native-progress-view (1.3.1):
270+
- React-Core
257271
- React-perflogger (0.64.0)
258272
- React-RCTActionSheet (0.64.0):
259273
- React-Core/RCTActionSheetHeaders (= 0.64.0)
@@ -318,6 +332,7 @@ PODS:
318332
- React-cxxreact (= 0.64.0)
319333
- React-jsi (= 0.64.0)
320334
- React-perflogger (= 0.64.0)
335+
- SocketRocket (0.6.0)
321336
- Yoga (1.14.0)
322337
- YogaKit (1.18.1):
323338
- Yoga (~> 1.14)
@@ -326,25 +341,25 @@ DEPENDENCIES:
326341
- DoubleConversion (from `../../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
327342
- FBLazyVector (from `../../node_modules/react-native/Libraries/FBLazyVector`)
328343
- FBReactNativeSpec (from `../../node_modules/react-native/React/FBReactNativeSpec`)
329-
- Flipper (~> 0.75.1)
344+
- Flipper (= 0.151.0)
330345
- Flipper-DoubleConversion (= 1.1.7)
331346
- Flipper-Folly (~> 2.5)
332347
- Flipper-Glog (= 0.3.6)
333348
- Flipper-PeerTalk (~> 0.0.4)
334349
- Flipper-RSocket (~> 1.3)
335-
- FlipperKit (~> 0.75.1)
336-
- FlipperKit/Core (~> 0.75.1)
337-
- FlipperKit/CppBridge (~> 0.75.1)
338-
- FlipperKit/FBCxxFollyDynamicConvert (~> 0.75.1)
339-
- FlipperKit/FBDefines (~> 0.75.1)
340-
- FlipperKit/FKPortForwarding (~> 0.75.1)
341-
- FlipperKit/FlipperKitHighlightOverlay (~> 0.75.1)
342-
- FlipperKit/FlipperKitLayoutPlugin (~> 0.75.1)
343-
- FlipperKit/FlipperKitLayoutTextSearchable (~> 0.75.1)
344-
- FlipperKit/FlipperKitNetworkPlugin (~> 0.75.1)
345-
- FlipperKit/FlipperKitReactPlugin (~> 0.75.1)
346-
- FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.75.1)
347-
- FlipperKit/SKIOSNetworkPlugin (~> 0.75.1)
350+
- FlipperKit (= 0.151.0)
351+
- FlipperKit/Core (= 0.151.0)
352+
- FlipperKit/CppBridge (= 0.151.0)
353+
- FlipperKit/FBCxxFollyDynamicConvert (= 0.151.0)
354+
- FlipperKit/FBDefines (= 0.151.0)
355+
- FlipperKit/FKPortForwarding (= 0.151.0)
356+
- FlipperKit/FlipperKitHighlightOverlay (= 0.151.0)
357+
- FlipperKit/FlipperKitLayoutPlugin (= 0.151.0)
358+
- FlipperKit/FlipperKitLayoutTextSearchable (= 0.151.0)
359+
- FlipperKit/FlipperKitNetworkPlugin (= 0.151.0)
360+
- FlipperKit/FlipperKitReactPlugin (= 0.151.0)
361+
- FlipperKit/FlipperKitUserDefaultsPlugin (= 0.151.0)
362+
- FlipperKit/SKIOSNetworkPlugin (= 0.151.0)
348363
- glog (from `../../node_modules/react-native/third-party-podspecs/glog.podspec`)
349364
- RCT-Folly (from `../../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
350365
- RCTRequired (from `../../node_modules/react-native/Libraries/RCTRequired`)
@@ -379,14 +394,17 @@ SPEC REPOS:
379394
- boost-for-react-native
380395
- CocoaAsyncSocket
381396
- Flipper
397+
- Flipper-Boost-iOSX
382398
- Flipper-DoubleConversion
399+
- Flipper-Fmt
383400
- Flipper-Folly
384401
- Flipper-Glog
385402
- Flipper-PeerTalk
386403
- Flipper-RSocket
387404
- FlipperKit
388405
- libevent
389406
- OpenSSL-Universal
407+
- SocketRocket
390408
- YogaKit
391409

392410
EXTERNAL SOURCES:
@@ -454,17 +472,19 @@ SPEC CHECKSUMS:
454472
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
455473
DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
456474
FBLazyVector: 49cbe4b43e445b06bf29199b6ad2057649e4c8f5
457-
FBReactNativeSpec: 6d6f0f378156a0e2ac2b56d18b0340586e088922
458-
Flipper: d3da1aa199aad94455ae725e9f3aa43f3ec17021
475+
FBReactNativeSpec: 1a75cf09493a3b41de7c2b32185977ab52d513df
476+
Flipper: aad62c5cd3f78d38e9e2f7a882f4e680f3369a36
477+
Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
459478
Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
460-
Flipper-Folly: f7a3caafbd74bda4827954fd7a6e000e36355489
479+
Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b
480+
Flipper-Folly: 584845625005ff068a6ebf41f857f468decd26b3
461481
Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6
462482
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
463-
Flipper-RSocket: 602921fee03edacf18f5d6f3d3594ba477f456e5
464-
FlipperKit: 8a20b5c5fcf9436cac58551dc049867247f64b00
483+
Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
484+
FlipperKit: feec58b1283d3560c703adc670c45ecf400c48d9
465485
glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62
466486
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
467-
OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
487+
OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
468488
RCT-Folly: ec7a233ccc97cc556cf7237f0db1ff65b986f27c
469489
RCTRequired: 2f8cb5b7533219bf4218a045f92768129cf7050a
470490
RCTTypeSafety: 512728b73549e72ad7330b92f3d42936f2a4de5b
@@ -476,7 +496,7 @@ SPEC CHECKSUMS:
476496
React-jsi: 74341196d9547cbcbcfa4b3bbbf03af56431d5a1
477497
React-jsiexecutor: 06a9c77b56902ae7ffcdd7a4905f664adc5d237b
478498
React-jsinspector: 0ae35a37b20d5e031eb020a69cc5afdbd6406301
479-
react-native-progress-view: 21b1e29e70c7559c16c9e0a04c4adc19fce6ede2
499+
react-native-progress-view: 9e6b6a5305a9115c2157ae3b8852081aba0aab7c
480500
React-perflogger: 9c547d8f06b9bf00cb447f2b75e8d7f19b7e02af
481501
React-RCTActionSheet: 3080b6e12e0e1a5b313c8c0050699b5c794a1b11
482502
React-RCTAnimation: 3f96f21a497ae7dabf4d2f150ee43f906aaf516f
@@ -489,9 +509,10 @@ SPEC CHECKSUMS:
489509
React-RCTVibration: 0fd6b21751a33cb72fce1a4a33ab9678416d307a
490510
React-runtimeexecutor: cad74a1eaa53ee6e7a3620231939d8fe2c6afcf0
491511
ReactCommon: cfe2b7fd20e0dbd2d1185cd7d8f99633fbc5ff05
512+
SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
492513
Yoga: 8c8436d4171c87504c648ae23b1d81242bdf3bbf
493514
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
494515

495-
PODFILE CHECKSUM: 1f89f5f1959c47f2b2fa363b8970139c76d0e714
516+
PODFILE CHECKSUM: a060efd7e0b44277790021106b96e96ee2918ccb
496517

497-
COCOAPODS: 1.10.1
518+
COCOAPODS: 1.11.3

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@
104104
9BB398BDBD6EDB24F839F396 /* Pods-example-exampleTests.debug.xcconfig */,
105105
434C4193B2BF512EAB431494 /* Pods-example-exampleTests.release.xcconfig */,
106106
);
107-
name = Pods;
108107
path = Pods;
109108
sourceTree = "<group>";
110109
};

‎ios/RNCProgressView.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
2-
#if __has_include("RCTBridgeModule.h")
3-
#import "RCTBridgeModule.h"
4-
#else
51
#import <React/RCTBridgeModule.h>
6-
#endif
72

83
@interface RNCProgressView : NSObject <RCTBridgeModule>
94

105
@end
11-
6+

0 commit comments

Comments
 (0)