Skip to content

Commit 4ff556c

Browse files
avishayilavishayil
committed
chore: example app compatibility with new iOS version
1 parent 4658297 commit 4ff556c

File tree

4 files changed

+61
-46
lines changed

4 files changed

+61
-46
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@
386386
);
387387
inputPaths = (
388388
"${PODS_ROOT}/Target Support Files/Pods-Example-ExampleTests/Pods-Example-ExampleTests-frameworks.sh",
389-
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL",
389+
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
390390
);
391391
name = "[CP] Embed Pods Frameworks";
392392
outputPaths = (
@@ -520,7 +520,7 @@
520520
);
521521
inputPaths = (
522522
"${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-frameworks.sh",
523-
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL",
523+
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
524524
);
525525
name = "[CP] Embed Pods Frameworks";
526526
outputPaths = (

‎Example/ios/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ target 'Example' do
1818
#
1919
# Note that if you have use_frameworks! enabled, Flipper will not work and
2020
# you should disable these next few lines.
21-
use_flipper!({ 'Flipper' => '0.74.0' })
21+
use_flipper!({'Flipper' => '0.87.0', 'Flipper-Folly' => '2.5.3', 'Flipper-RSocket' => '1.3.1'})
2222
post_install do |installer|
2323
flipper_post_install(installer)
2424
end

‎Example/ios/Podfile.lock‎

Lines changed: 54 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -10,50 +10,61 @@ PODS:
1010
- React-Core (= 0.63.4)
1111
- React-jsi (= 0.63.4)
1212
- ReactCommon/turbomodule/core (= 0.63.4)
13-
- Flipper (0.74.0):
13+
- Flipper (0.87.0):
1414
- Flipper-Folly (~> 2.5)
1515
- Flipper-RSocket (~> 1.3)
1616
- Flipper-DoubleConversion (1.1.7)
17-
- Flipper-Folly (2.5.1):
17+
- Flipper-Folly (2.5.3):
1818
- boost-for-react-native
1919
- Flipper-DoubleConversion
2020
- Flipper-Glog
2121
- libevent (~> 2.1.12)
2222
- OpenSSL-Universal (= 1.1.180)
2323
- Flipper-Glog (0.3.6)
2424
- Flipper-PeerTalk (0.0.4)
25-
- Flipper-RSocket (1.3.0):
25+
- Flipper-RSocket (1.3.1):
2626
- Flipper-Folly (~> 2.5)
27-
- FlipperKit (0.74.0):
28-
- FlipperKit/Core (= 0.74.0)
29-
- FlipperKit/Core (0.74.0):
30-
- Flipper (~> 0.74.0)
27+
- FlipperKit (0.87.0):
28+
- FlipperKit/Core (= 0.87.0)
29+
- FlipperKit/Core (0.87.0):
30+
- Flipper (~> 0.87.0)
3131
- FlipperKit/CppBridge
3232
- FlipperKit/FBCxxFollyDynamicConvert
3333
- FlipperKit/FBDefines
3434
- FlipperKit/FKPortForwarding
35-
- FlipperKit/CppBridge (0.74.0):
36-
- Flipper (~> 0.74.0)
37-
- FlipperKit/FBCxxFollyDynamicConvert (0.74.0):
35+
- FlipperKit/CppBridge (0.87.0):
36+
- Flipper (~> 0.87.0)
37+
- FlipperKit/FBCxxFollyDynamicConvert (0.87.0):
3838
- Flipper-Folly (~> 2.5)
39-
- FlipperKit/FBDefines (0.74.0)
40-
- FlipperKit/FKPortForwarding (0.74.0):
39+
- FlipperKit/FBDefines (0.87.0)
40+
- FlipperKit/FKPortForwarding (0.87.0):
4141
- CocoaAsyncSocket (~> 7.6)
4242
- Flipper-PeerTalk (~> 0.0.4)
43-
- FlipperKit/FlipperKitHighlightOverlay (0.74.0)
44-
- FlipperKit/FlipperKitLayoutPlugin (0.74.0):
43+
- FlipperKit/FlipperKitHighlightOverlay (0.87.0)
44+
- FlipperKit/FlipperKitLayoutHelpers (0.87.0):
4545
- FlipperKit/Core
4646
- FlipperKit/FlipperKitHighlightOverlay
4747
- FlipperKit/FlipperKitLayoutTextSearchable
48+
- FlipperKit/FlipperKitLayoutIOSDescriptors (0.87.0):
49+
- FlipperKit/Core
50+
- FlipperKit/FlipperKitHighlightOverlay
51+
- FlipperKit/FlipperKitLayoutHelpers
52+
- YogaKit (~> 1.18)
53+
- FlipperKit/FlipperKitLayoutPlugin (0.87.0):
54+
- FlipperKit/Core
55+
- FlipperKit/FlipperKitHighlightOverlay
56+
- FlipperKit/FlipperKitLayoutHelpers
57+
- FlipperKit/FlipperKitLayoutIOSDescriptors
58+
- FlipperKit/FlipperKitLayoutTextSearchable
4859
- YogaKit (~> 1.18)
49-
- FlipperKit/FlipperKitLayoutTextSearchable (0.74.0)
50-
- FlipperKit/FlipperKitNetworkPlugin (0.74.0):
60+
- FlipperKit/FlipperKitLayoutTextSearchable (0.87.0)
61+
- FlipperKit/FlipperKitNetworkPlugin (0.87.0):
5162
- FlipperKit/Core
52-
- FlipperKit/FlipperKitReactPlugin (0.74.0):
63+
- FlipperKit/FlipperKitReactPlugin (0.87.0):
5364
- FlipperKit/Core
54-
- FlipperKit/FlipperKitUserDefaultsPlugin (0.74.0):
65+
- FlipperKit/FlipperKitUserDefaultsPlugin (0.87.0):
5566
- FlipperKit/Core
56-
- FlipperKit/SKIOSNetworkPlugin (0.74.0):
67+
- FlipperKit/SKIOSNetworkPlugin (0.87.0):
5768
- FlipperKit/Core
5869
- FlipperKit/FlipperKitNetworkPlugin
5970
- Folly (2020.01.13.00):
@@ -234,7 +245,7 @@ PODS:
234245
- React-cxxreact (= 0.63.4)
235246
- React-jsi (= 0.63.4)
236247
- React-jsinspector (0.63.4)
237-
- react-native-restart (0.0.21):
248+
- react-native-restart (0.0.22):
238249
- React-Core
239250
- React-RCTActionSheet (0.63.4):
240251
- React-Core/RCTActionSheetHeaders (= 0.63.4)
@@ -304,25 +315,25 @@ DEPENDENCIES:
304315
- DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
305316
- FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
306317
- FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`)
307-
- Flipper (= 0.74.0)
318+
- Flipper (= 0.87.0)
308319
- Flipper-DoubleConversion (= 1.1.7)
309-
- Flipper-Folly (~> 2.2)
320+
- Flipper-Folly (= 2.5.3)
310321
- Flipper-Glog (= 0.3.6)
311322
- Flipper-PeerTalk (~> 0.0.4)
312-
- Flipper-RSocket (~> 1.1)
313-
- FlipperKit (= 0.74.0)
314-
- FlipperKit/Core (= 0.74.0)
315-
- FlipperKit/CppBridge (= 0.74.0)
316-
- FlipperKit/FBCxxFollyDynamicConvert (= 0.74.0)
317-
- FlipperKit/FBDefines (= 0.74.0)
318-
- FlipperKit/FKPortForwarding (= 0.74.0)
319-
- FlipperKit/FlipperKitHighlightOverlay (= 0.74.0)
320-
- FlipperKit/FlipperKitLayoutPlugin (= 0.74.0)
321-
- FlipperKit/FlipperKitLayoutTextSearchable (= 0.74.0)
322-
- FlipperKit/FlipperKitNetworkPlugin (= 0.74.0)
323-
- FlipperKit/FlipperKitReactPlugin (= 0.74.0)
324-
- FlipperKit/FlipperKitUserDefaultsPlugin (= 0.74.0)
325-
- FlipperKit/SKIOSNetworkPlugin (= 0.74.0)
323+
- Flipper-RSocket (= 1.3.1)
324+
- FlipperKit (= 0.87.0)
325+
- FlipperKit/Core (= 0.87.0)
326+
- FlipperKit/CppBridge (= 0.87.0)
327+
- FlipperKit/FBCxxFollyDynamicConvert (= 0.87.0)
328+
- FlipperKit/FBDefines (= 0.87.0)
329+
- FlipperKit/FKPortForwarding (= 0.87.0)
330+
- FlipperKit/FlipperKitHighlightOverlay (= 0.87.0)
331+
- FlipperKit/FlipperKitLayoutPlugin (= 0.87.0)
332+
- FlipperKit/FlipperKitLayoutTextSearchable (= 0.87.0)
333+
- FlipperKit/FlipperKitNetworkPlugin (= 0.87.0)
334+
- FlipperKit/FlipperKitReactPlugin (= 0.87.0)
335+
- FlipperKit/FlipperKitUserDefaultsPlugin (= 0.87.0)
336+
- FlipperKit/SKIOSNetworkPlugin (= 0.87.0)
326337
- Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
327338
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
328339
- RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
@@ -427,13 +438,13 @@ SPEC CHECKSUMS:
427438
DoubleConversion: cde416483dac037923206447da6e1454df403714
428439
FBLazyVector: 3bb422f41b18121b71783a905c10e58606f7dc3e
429440
FBReactNativeSpec: f2c97f2529dd79c083355182cc158c9f98f4bd6e
430-
Flipper: c1ad50344bffdce628b1906b48f6e7cd06724236
441+
Flipper: 1bd2db48dcc31e4b167b9a33ec1df01c2ded4893
431442
Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
432-
Flipper-Folly: f7a3caafbd74bda4827954fd7a6e000e36355489
443+
Flipper-Folly: 755929a4f851b2fb2c347d533a23f191b008554c
433444
Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6
434445
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
435-
Flipper-RSocket: 602921fee03edacf18f5d6f3d3594ba477f456e5
436-
FlipperKit: f42987ea58737ac0fb3fbc38f8e703452ba56940
446+
Flipper-RSocket: 127954abe8b162fcaf68d2134d34dc2bd7076154
447+
FlipperKit: 651f50a42eb95c01b3e89a60996dd6aded529eeb
437448
Folly: b73c3869541e86821df3c387eb0af5f65addfab4
438449
glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
439450
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
@@ -448,7 +459,7 @@ SPEC CHECKSUMS:
448459
React-jsi: a0418934cf48f25b485631deb27c64dc40fb4c31
449460
React-jsiexecutor: 93bd528844ad21dc07aab1c67cb10abae6df6949
450461
React-jsinspector: 58aef7155bc9a9683f5b60b35eccea8722a4f53a
451-
react-native-restart: a3447c77b45ac0b880b80043183d22957fc992d1
462+
react-native-restart: 733a51ad137f15b0f8dc34c4082e55af7da00979
452463
React-RCTActionSheet: 89a0ca9f4a06c1f93c26067af074ccdce0f40336
453464
React-RCTAnimation: 1bde3ecc0c104c55df246eda516e0deb03c4e49b
454465
React-RCTBlob: a97d378b527740cc667e03ebfa183a75231ab0f0
@@ -462,6 +473,6 @@ SPEC CHECKSUMS:
462473
Yoga: 4bd86afe9883422a7c4028c00e34790f560923d6
463474
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
464475

465-
PODFILE CHECKSUM: 3e96957c734a0bf797f21063d0bc7e818ebf3a80
476+
PODFILE CHECKSUM: fae21bfb7b6ffb6aa415a3e31f4114963fd0e951
466477

467-
COCOAPODS: 1.10.1
478+
COCOAPODS: 1.11.2

‎yarn.lock‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4635,6 +4635,10 @@ external-editor@^2.0.4:
46354635
version "2.2.0"
46364636
resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5"
46374637
integrity sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==
4638+
dependencies:
4639+
chardet "^0.4.0"
4640+
iconv-lite "^0.4.17"
4641+
tmp "^0.0.33"
46384642

46394643
external-editor@^3.0.3:
46404644
version "3.1.0"

0 commit comments

Comments
 (0)