Skip to content

Commit 7119bc6

Browse files
committed
Upgrade reanimated and fix some errors
1 parent 8e85292 commit 7119bc6

File tree

14 files changed

+16314
-1337
lines changed

14 files changed

+16314
-1337
lines changed

.vscode/launch.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
// Use IntelliSense to learn about possible attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5+
"version": "0.2.0",
6+
"configurations": [
7+
{"name":"Attach to packager","request":"attach","type":"reactnative","cwd":"${workspaceFolder}/Example"}
8+
9+
]
10+
}

.vscode/settings.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1811,5 +1811,13 @@
18111811
"node_modules/xml-name-validator": true,
18121812
"node_modules/yaml": true
18131813
},
1814-
"typescript.tsdk": "node_modules/typescript/lib"
1814+
"typescript.tsdk": "node_modules/typescript/lib",
1815+
"i18n-ally.localesPaths": [
1816+
"Example/ios/Pods/Flipper-Folly/folly/lang",
1817+
"Example/ios/Pods/Folly/folly/lang",
1818+
"Example/ios/Pods/boost-for-react-native/boost/locale",
1819+
"Example/ios/Pods/boost-for-react-native/boost/predef/language",
1820+
"Example/ios/Pods/Headers/Private/Flipper-Folly/folly/lang",
1821+
"Example/ios/Pods/Headers/Public/Flipper-Folly/folly/lang"
1822+
]
18151823
}

Example/ios/Podfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ target 'ReactNativeGalleryToolkitExample' do
1212
#
1313
# Note that if you have use_frameworks! enabled, Flipper will not work and
1414
# you should disable these next few lines.
15-
use_flipper!
16-
post_install do |installer|
17-
flipper_post_install(installer)
18-
end
15+
# use_flipper!
16+
# post_install do |installer|
17+
# flipper_post_install(installer)
18+
# end
1919
end

Example/ios/Podfile.lock

Lines changed: 18 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
PODS:
22
- boost-for-react-native (1.63.0)
3-
- CocoaAsyncSocket (7.6.4)
4-
- CocoaLibEvent (1.0.0)
53
- DoubleConversion (1.1.6)
64
- FBLazyVector (0.63.2)
75
- FBReactNativeSpec (0.63.2):
@@ -11,52 +9,6 @@ PODS:
119
- React-Core (= 0.63.2)
1210
- React-jsi (= 0.63.2)
1311
- ReactCommon/turbomodule/core (= 0.63.2)
14-
- Flipper (0.41.5):
15-
- Flipper-Folly (~> 2.2)
16-
- Flipper-RSocket (~> 1.1)
17-
- Flipper-DoubleConversion (1.1.7)
18-
- Flipper-Folly (2.2.0):
19-
- boost-for-react-native
20-
- CocoaLibEvent (~> 1.0)
21-
- Flipper-DoubleConversion
22-
- Flipper-Glog
23-
- OpenSSL-Universal (= 1.0.2.19)
24-
- Flipper-Glog (0.3.6)
25-
- Flipper-PeerTalk (0.0.4)
26-
- Flipper-RSocket (1.1.0):
27-
- Flipper-Folly (~> 2.2)
28-
- FlipperKit (0.41.5):
29-
- FlipperKit/Core (= 0.41.5)
30-
- FlipperKit/Core (0.41.5):
31-
- Flipper (~> 0.41.5)
32-
- FlipperKit/CppBridge
33-
- FlipperKit/FBCxxFollyDynamicConvert
34-
- FlipperKit/FBDefines
35-
- FlipperKit/FKPortForwarding
36-
- FlipperKit/CppBridge (0.41.5):
37-
- Flipper (~> 0.41.5)
38-
- FlipperKit/FBCxxFollyDynamicConvert (0.41.5):
39-
- Flipper-Folly (~> 2.2)
40-
- FlipperKit/FBDefines (0.41.5)
41-
- FlipperKit/FKPortForwarding (0.41.5):
42-
- CocoaAsyncSocket (~> 7.6)
43-
- Flipper-PeerTalk (~> 0.0.4)
44-
- FlipperKit/FlipperKitHighlightOverlay (0.41.5)
45-
- FlipperKit/FlipperKitLayoutPlugin (0.41.5):
46-
- FlipperKit/Core
47-
- FlipperKit/FlipperKitHighlightOverlay
48-
- FlipperKit/FlipperKitLayoutTextSearchable
49-
- YogaKit (~> 1.18)
50-
- FlipperKit/FlipperKitLayoutTextSearchable (0.41.5)
51-
- FlipperKit/FlipperKitNetworkPlugin (0.41.5):
52-
- FlipperKit/Core
53-
- FlipperKit/FlipperKitReactPlugin (0.41.5):
54-
- FlipperKit/Core
55-
- FlipperKit/FlipperKitUserDefaultsPlugin (0.41.5):
56-
- FlipperKit/Core
57-
- FlipperKit/SKIOSNetworkPlugin (0.41.5):
58-
- FlipperKit/Core
59-
- FlipperKit/FlipperKitNetworkPlugin
6012
- Folly (2020.01.13.00):
6113
- boost-for-react-native
6214
- DoubleConversion
@@ -67,18 +19,15 @@ PODS:
6719
- DoubleConversion
6820
- glog
6921
- glog (0.3.5)
70-
- libwebp (1.1.0):
71-
- libwebp/demux (= 1.1.0)
72-
- libwebp/mux (= 1.1.0)
73-
- libwebp/webp (= 1.1.0)
74-
- libwebp/demux (1.1.0):
22+
- libwebp (1.2.0):
23+
- libwebp/demux (= 1.2.0)
24+
- libwebp/mux (= 1.2.0)
25+
- libwebp/webp (= 1.2.0)
26+
- libwebp/demux (1.2.0):
7527
- libwebp/webp
76-
- libwebp/mux (1.1.0):
28+
- libwebp/mux (1.2.0):
7729
- libwebp/demux
78-
- libwebp/webp (1.1.0)
79-
- OpenSSL-Universal (1.0.2.19):
80-
- OpenSSL-Universal/Static (= 1.0.2.19)
81-
- OpenSSL-Universal/Static (1.0.2.19)
30+
- libwebp/webp (1.2.0)
8231
- RCTRequired (0.63.2)
8332
- RCTTypeSafety (0.63.2):
8433
- FBLazyVector (= 0.63.2)
@@ -320,7 +269,7 @@ PODS:
320269
- SDWebImageWebPCoder (~> 0.4.1)
321270
- RNGestureHandler (1.10.3):
322271
- React-Core
323-
- RNReanimated (2.1.0):
272+
- RNReanimated (2.3.0-alpha.1):
324273
- DoubleConversion
325274
- FBLazyVector
326275
- FBReactNativeSpec
@@ -351,39 +300,18 @@ PODS:
351300
- Yoga
352301
- RNScreens (2.10.1):
353302
- React
354-
- SDWebImage (5.8.3):
355-
- SDWebImage/Core (= 5.8.3)
356-
- SDWebImage/Core (5.8.3)
303+
- SDWebImage (5.11.1):
304+
- SDWebImage/Core (= 5.11.1)
305+
- SDWebImage/Core (5.11.1)
357306
- SDWebImageWebPCoder (0.4.1):
358307
- libwebp (~> 1.0)
359308
- SDWebImage/Core (~> 5.5)
360309
- Yoga (1.14.0)
361-
- YogaKit (1.18.1):
362-
- Yoga (~> 1.14)
363310

364311
DEPENDENCIES:
365312
- DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
366313
- FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
367314
- FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`)
368-
- Flipper (~> 0.41.1)
369-
- Flipper-DoubleConversion (= 1.1.7)
370-
- Flipper-Folly (~> 2.2)
371-
- Flipper-Glog (= 0.3.6)
372-
- Flipper-PeerTalk (~> 0.0.4)
373-
- Flipper-RSocket (~> 1.1)
374-
- FlipperKit (~> 0.41.1)
375-
- FlipperKit/Core (~> 0.41.1)
376-
- FlipperKit/CppBridge (~> 0.41.1)
377-
- FlipperKit/FBCxxFollyDynamicConvert (~> 0.41.1)
378-
- FlipperKit/FBDefines (~> 0.41.1)
379-
- FlipperKit/FKPortForwarding (~> 0.41.1)
380-
- FlipperKit/FlipperKitHighlightOverlay (~> 0.41.1)
381-
- FlipperKit/FlipperKitLayoutPlugin (~> 0.41.1)
382-
- FlipperKit/FlipperKitLayoutTextSearchable (~> 0.41.1)
383-
- FlipperKit/FlipperKitNetworkPlugin (~> 0.41.1)
384-
- FlipperKit/FlipperKitReactPlugin (~> 0.41.1)
385-
- FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.41.1)
386-
- FlipperKit/SKIOSNetworkPlugin (~> 0.41.1)
387315
- Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
388316
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
389317
- RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
@@ -420,20 +348,9 @@ DEPENDENCIES:
420348
SPEC REPOS:
421349
trunk:
422350
- boost-for-react-native
423-
- CocoaAsyncSocket
424-
- CocoaLibEvent
425-
- Flipper
426-
- Flipper-DoubleConversion
427-
- Flipper-Folly
428-
- Flipper-Glog
429-
- Flipper-PeerTalk
430-
- Flipper-RSocket
431-
- FlipperKit
432351
- libwebp
433-
- OpenSSL-Universal
434352
- SDWebImage
435353
- SDWebImageWebPCoder
436-
- YogaKit
437354

438355
EXTERNAL SOURCES:
439356
DoubleConversion:
@@ -505,22 +422,12 @@ EXTERNAL SOURCES:
505422

506423
SPEC CHECKSUMS:
507424
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
508-
CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845
509-
CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f
510425
DoubleConversion: cde416483dac037923206447da6e1454df403714
511426
FBLazyVector: 3ef4a7f62e7db01092f9d517d2ebc0d0677c4a37
512427
FBReactNativeSpec: dc7fa9088f0f2a998503a352b0554d69a4391c5a
513-
Flipper: 33585e2d9810fe5528346be33bcf71b37bb7ae13
514-
Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
515-
Flipper-Folly: c12092ea368353b58e992843a990a3225d4533c3
516-
Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6
517-
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
518-
Flipper-RSocket: 64e7431a55835eb953b0bf984ef3b90ae9fdddd7
519-
FlipperKit: bc68102cd4952a258a23c9c1b316c7bec1fecf83
520428
Folly: b73c3869541e86821df3c387eb0af5f65addfab4
521429
glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
522-
libwebp: 946cb3063cea9236285f7e9a8505d806d30e07f3
523-
OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355
430+
libwebp: e90b9c01d99205d03b6bb8f2c8c415e5a4ef66f0
524431
RCTRequired: f13f25e7b12f925f1f6a6a8c69d929a03c0129fe
525432
RCTTypeSafety: 44982c5c8e43ff4141eb519a8ddc88059acd1f3a
526433
React: e1c65dd41cb9db13b99f24608e47dd595f28ca9a
@@ -531,8 +438,8 @@ SPEC CHECKSUMS:
531438
React-jsi: 54245e1d5f4b690dec614a73a3795964eeef13a8
532439
React-jsiexecutor: 8ca588cc921e70590820ce72b8789b02c67cce38
533440
React-jsinspector: b14e62ebe7a66e9231e9581279909f2fc3db6606
534-
react-native-safe-area-context: 0ed9288ed4409beabb0817b54efc047286fc84da
535-
react-native-video: 8d97379f3c2322a569f1e27542ad1a646cad9444
441+
react-native-safe-area-context: eb91fe1fb3f7b87d9c30a7f0808407d8569d539d
442+
react-native-video: dbb8df4f0bbdf80de6797c90fcad8bc12b19401d
536443
React-RCTActionSheet: 910163b6b09685a35c4ebbc52b66d1bfbbe39fc5
537444
React-RCTAnimation: 9a883bbe1e9d2e158d4fb53765ed64c8dc2200c6
538445
React-RCTBlob: 39cf0ece1927996c4466510e25d2105f67010e13
@@ -543,16 +450,15 @@ SPEC CHECKSUMS:
543450
React-RCTText: 1b6773e776e4b33f90468c20fe3b16ca3e224bb8
544451
React-RCTVibration: 4d2e726957f4087449739b595f107c0d4b6c2d2d
545452
ReactCommon: a0a1edbebcac5e91338371b72ffc66aa822792ce
546-
RNCMaskedView: f5c7d14d6847b7b44853f7acb6284c1da30a3459
453+
RNCMaskedView: 5a8ec07677aa885546a0d98da336457e2bea557f
547454
RNFastImage: 35ae972d6727c84ee3f5c6897e07f84d0a3445e9
548455
RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211
549-
RNReanimated: 70f662b5232dd5d19ccff581e919a54ea73df51c
456+
RNReanimated: bae15efa26bf61812ccc1b6b0a38d381796a3e0f
550457
RNScreens: b748efec66e095134c7166ca333b628cd7e6f3e2
551-
SDWebImage: 112503ec94a5a2a41869503844a15e8d8f1ead5c
458+
SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
552459
SDWebImageWebPCoder: 36f8f47bd9879a8aea6044765c1351120fd8e3a8
553460
Yoga: 7740b94929bbacbddda59bf115b5317e9a161598
554-
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
555461

556-
PODFILE CHECKSUM: 146834c162cd44868525aee50d30e6899c0e03aa
462+
PODFILE CHECKSUM: f80d9e0d880b0e9baba2b2d74c297e214ccd90ba
557463

558464
COCOAPODS: 1.10.1

Example/ios/ReactNativeGalleryToolkitExample/AppDelegate.mm

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,35 @@
44
#import <React/RCTBundleURLProvider.h>
55
#import <React/RCTRootView.h>
66

7-
#if DEBUG
8-
#ifdef FB_SONARKIT_ENABLED
9-
#import <FlipperKit/FlipperClient.h>
10-
#import <FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h>
11-
#import <FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h>
12-
#import <FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h>
13-
#import <SKIOSNetworkPlugin/SKIOSNetworkAdapter.h>
14-
#import <FlipperKitReactPlugin/FlipperKitReactPlugin.h>
15-
static void InitializeFlipper(UIApplication *application) {
16-
FlipperClient *client = [FlipperClient sharedClient];
17-
SKDescriptorMapper *layoutDescriptorMapper = [[SKDescriptorMapper alloc] initWithDefaults];
18-
[client addPlugin:[[FlipperKitLayoutPlugin alloc] initWithRootNode:application withDescriptorMapper:layoutDescriptorMapper]];
19-
[client addPlugin:[[FKUserDefaultsPlugin alloc] initWithSuiteName:nil]];
20-
[client addPlugin:[FlipperKitReactPlugin new]];
21-
[client addPlugin:[[FlipperKitNetworkPlugin alloc] initWithNetworkAdapter:[SKIOSNetworkAdapter new]]];
22-
[client start];
23-
}
24-
#endif
25-
#endif
7+
// #if DEBUG
8+
// #ifdef FB_SONARKIT_ENABLED
9+
// #import <FlipperKit/FlipperClient.h>
10+
// #import <FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h>
11+
// #import <FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h>
12+
// #import <FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h>
13+
// #import <SKIOSNetworkPlugin/SKIOSNetworkAdapter.h>
14+
// #import <FlipperKitReactPlugin/FlipperKitReactPlugin.h>
15+
// static void InitializeFlipper(UIApplication *application) {
16+
// FlipperClient *client = [FlipperClient sharedClient];
17+
// SKDescriptorMapper *layoutDescriptorMapper = [[SKDescriptorMapper alloc] initWithDefaults];
18+
// [client addPlugin:[[FlipperKitLayoutPlugin alloc] initWithRootNode:application withDescriptorMapper:layoutDescriptorMapper]];
19+
// [client addPlugin:[[FKUserDefaultsPlugin alloc] initWithSuiteName:nil]];
20+
// [client addPlugin:[FlipperKitReactPlugin new]];
21+
// [client addPlugin:[[FlipperKitNetworkPlugin alloc] initWithNetworkAdapter:[SKIOSNetworkAdapter new]]];
22+
// [client start];
23+
// }
24+
// #endif
25+
// #endif
2626

2727
@implementation AppDelegate
2828

2929
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
3030
{
31-
#if DEBUG
32-
#ifdef FB_SONARKIT_ENABLED
33-
InitializeFlipper(application);
34-
#endif
35-
#endif
31+
// #if DEBUG
32+
// #ifdef FB_SONARKIT_ENABLED
33+
// InitializeFlipper(application);
34+
// #endif
35+
// #endif
3636

3737
RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
3838
RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge

0 commit comments

Comments
 (0)