Bumped gesture-handler and screens dependencies

.github/workflows/android-build.yml

@@ -4,6 +4,8 @@ on:
     paths:
       - 'android/**'
       - 'Common/**'
+      - 'FabricExample/package.json'
+      - 'Example/package.json'
   push:
     branches:
       - main

.github/workflows/ios-build.yml

@@ -4,6 +4,8 @@ on:
     paths:
       - 'ios/**'
       - 'Common/**'
+      - 'FabricExample/package.json'
+      - 'Example/package.json'
   push:
     branches:
       - main

Example/android/app/src/main/java/com/swmansion/reanimated/example/MainActivity.java

@@ -1,15 +1,6 @@
 package com.swmansion.reanimated.example;
 
-import android.util.Log;
-
 import com.facebook.react.ReactActivity;
-import com.facebook.react.ReactActivityDelegate;
-import com.facebook.react.ReactInstanceManager;
-import com.facebook.react.ReactRootView;
-
-import com.facebook.react.bridge.ReactContext;
-import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView;
-import com.swmansion.reanimated.NativeProxy;
 
 public class MainActivity extends ReactActivity {
 
@@ -18,17 +9,6 @@ protected String getMainComponentName() {
         return "ReanimatedExample";
     }
 
-    // Add the following method to your main activity class
-    @Override
-    protected ReactActivityDelegate createReactActivityDelegate() {
-        return new ReactActivityDelegate(this, getMainComponentName()) {
-            @Override
-            protected ReactRootView createRootView() {
-                return new RNGestureHandlerEnabledRootView(MainActivity.this);
-            }
-        };
-    }
-
     public native String getString();
 
 }

Example/android/app/src/main/java/com/swmansion/reanimated/example/MainApplication.java

@@ -5,6 +5,7 @@
 
 import com.facebook.react.ReactApplication;
 import com.reactnativecommunity.picker.RNCPickerPackage;
+import com.swmansion.gesturehandler.RNGestureHandlerPackage;
 import com.swmansion.rnscreens.RNScreensPackage;
 import com.th3rdwave.safeareacontext.SafeAreaContextPackage;
 import com.facebook.react.ReactInstanceManager;
@@ -14,7 +15,6 @@
 import com.facebook.soloader.SoLoader;
 import com.horcrux.svg.SvgPackage;
 import com.reactnativepagerview.PagerViewPackage;
-import com.swmansion.gesturehandler.react.RNGestureHandlerPackage;
 import com.swmansion.reanimated.ReanimatedPackage;
 
 import org.reactnative.maskedview.RNCMaskedViewPackage;

Example/ios/Podfile.lock

@@ -327,7 +327,7 @@ PODS:
     - React
   - RNCPicker (1.8.1):
     - React-Core
-  - RNGestureHandler (1.10.1):
+  - RNGestureHandler (2.5.0):
     - React-Core
   - RNReanimated (3.0.0-rc.0):
     - DoubleConversion
@@ -510,7 +510,7 @@ SPEC CHECKSUMS:
   FBLazyVector: 0cab5b1620c2810b4a2a814e4d9490c480e35917
   FBReactNativeSpec: 0b6e1cbcc2f1c4a47d03f8ab9961759d0f644c05
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
+  glog: 3d02b25ca00c2d456734d0bcff864cbc62f6ae1a
   hermes-engine: 83648c4de4acf97aacf1f68d457b1b6bb015388c
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   RCT-Folly: 0080d0a6ebf2577475bda044aa59e2ca1f909cda
@@ -545,7 +545,7 @@ SPEC CHECKSUMS:
   ReactCommon: e192c52229a978dc7ab7bfb21aa38c686005db31
   RNCMaskedView: 5a8ec07677aa885546a0d98da336457e2bea557f
   RNCPicker: 914b557e20b3b8317b084aca9ff4b4edb95f61e4
-  RNGestureHandler: 5e58135436aacc1c5d29b75547d3d2b9430d052c
+  RNGestureHandler: bad495418bcbd3ab47017a38d93d290ebd406f50
   RNReanimated: 2c54cf0072b49ae4ae0d46ac8930394699ed3667
   RNScreens: 4a1af06327774490d97342c00aee0c2bafb497b7
   RNSVG: ce9d996113475209013317e48b05c21ee988d42e

Example/package.json

@@ -38,7 +38,7 @@
     "react": "18.1.0",
     "react-dom": "^16.13.1",
     "react-native": "0.70.0-rc.2",
-    "react-native-gesture-handler": "^1.10.1",
+    "react-native-gesture-handler": "^2.5.0",
     "react-native-pager-view": "^5.4.1",
     "react-native-safe-area-context": "^3.1.9",
     "react-native-screens": "^3.15.0",

Example/yarn.lock

@@ -4244,11 +4244,6 @@
   resolved "https://registry.yarnpkg.com/@types/hammerjs/-/hammerjs-2.0.36.tgz#17ce0a235e9ffbcdcdf5095646b374c2bf615a4c"
   integrity sha512-7TUK/k2/QGpEAv/BCwSHlYu3NXZhQ9ZwBYpzr9tjlPIL2C5BeGhH3DmVavRx3ZNyELX5TLC91JTz/cen6AAtIQ==
 
-"@types/hammerjs@^2.0.38":
-  version "2.0.38"
-  resolved "https://registry.yarnpkg.com/@types/hammerjs/-/hammerjs-2.0.38.tgz#44fdab66fb960fc7002f4a9e54d91545f0bf9448"
-  integrity sha512-wuwDzWW1JWh3BZoRftBlKcctjNzR75QFY4/b4zAz7sH1EesA8HBJzke+bF5dxCATNdHHs3X1P5UWanbbUT6chw==
-
 "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff"
@@ -5515,13 +5510,6 @@ create-react-class@^15.6.2:
     loose-envify "^1.3.1"
     object-assign "^4.1.1"
 
-cross-fetch@^3.0.4:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f"
-  integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==
-  dependencies:
-    node-fetch "2.6.7"
-
 cross-spawn@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41"
@@ -6561,19 +6549,6 @@ fbjs@^1.0.0:
     setimmediate "^1.0.5"
     ua-parser-js "^0.7.18"
 
-fbjs@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-3.0.0.tgz#0907067fb3f57a78f45d95f1eacffcacd623c165"
-  integrity sha512-dJd4PiDOFuhe7vk4F80Mba83Vr2QuK86FoxtgPmzBqEJahncp+13YCmfoa53KHCo6OnlXLG7eeMWPfB5CrpVKg==
-  dependencies:
-    cross-fetch "^3.0.4"
-    fbjs-css-vars "^1.0.0"
-    loose-envify "^1.0.0"
-    object-assign "^4.1.0"
-    promise "^7.1.1"
-    setimmediate "^1.0.5"
-    ua-parser-js "^0.7.18"
-
 file-entry-cache@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
@@ -9364,20 +9339,20 @@ node-dir@^0.1.17:
   dependencies:
     minimatch "^3.0.2"
 
-node-fetch@2.6.7, node-fetch@^2.2.0, node-fetch@^2.6.0:
-  version "2.6.7"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
-  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
-  dependencies:
-    whatwg-url "^5.0.0"
-
 node-fetch@^1.0.1:
   version "1.7.3"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
   dependencies:
     encoding "^0.1.11"
     is-stream "^1.0.1"
 
+node-fetch@^2.2.0, node-fetch@^2.6.0:
+  version "2.6.7"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
+  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
+  dependencies:
+    whatwg-url "^5.0.0"
+
 node-int64@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
@@ -10172,16 +10147,15 @@ react-native-codegen@^0.70.3:
     jscodeshift "^0.13.1"
     nullthrows "^1.1.1"
 
-react-native-gesture-handler@^1.10.1:
-  version "1.10.1"
-  resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-1.10.1.tgz#e7a93a5bc516338bc24a57b3312043dc00489377"
-  integrity sha512-sDo6T0m+izIDczsIzE63nAqEG3BE/OwkCJoU4/qjdo7ryem7D0Rj/Y+SlAZP2lVAhllo65LDRYqd6SBe4y19Mg==
+react-native-gesture-handler@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-2.5.0.tgz#61385583570ed0a45a9ed142425e35f8fe8274fb"
+  integrity sha512-djZdcprFf08PZC332D+AeG5wcGeAPhzfCJtB3otUgOgTlvjVXmg/SLFdPJSpzLBqkRAmrC77tM79QgKbuLxkfw==
   dependencies:
     "@egjs/hammerjs" "^2.0.17"
-    "@types/hammerjs" "^2.0.38"
-    fbjs "^3.0.0"
     hoist-non-react-statics "^3.3.0"
     invariant "^2.2.4"
+    lodash "^4.17.21"
     prop-types "^15.7.2"
 
 react-native-gradle-plugin@^0.0.4:

FabricExample/ios/Podfile.lock

@@ -720,7 +720,7 @@ PODS:
     - React-jsi (= 0.70.0-rc.2)
     - React-logger (= 0.70.0-rc.2)
     - React-perflogger (= 0.70.0-rc.2)
-  - RNGestureHandler (2.4.2):
+  - RNGestureHandler (2.5.0):
     - RCT-Folly
     - RCTRequired
     - RCTTypeSafety
@@ -757,16 +757,16 @@ PODS:
     - React-RCTText
     - ReactCommon/turbomodule/core
     - Yoga
-  - RNScreens (3.13.1):
+  - RNScreens (3.15.0):
     - RCT-Folly
     - RCTRequired
     - RCTTypeSafety
     - React
     - React-Codegen
     - React-RCTFabric
     - ReactCommon/turbomodule/core
-    - RNScreens/common (= 3.13.1)
-  - RNScreens/common (3.13.1):
+    - RNScreens/common (= 3.15.0)
+  - RNScreens/common (3.15.0):
     - RCT-Folly
     - RCTRequired
     - RCTTypeSafety
@@ -1006,9 +1006,9 @@ SPEC CHECKSUMS:
   React-rncore: 672cfc5debaa9418cb2a6069a038a03f7c86b9dc
   React-runtimeexecutor: 211acec6c78026ab9a8c19dce305031158d33336
   ReactCommon: e192c52229a978dc7ab7bfb21aa38c686005db31
-  RNGestureHandler: 1bc0d4872642fd1551784b6a42f57c25e2bcf106
+  RNGestureHandler: c2c12e610e4d94ea917bbd31801974edcee4dd94
   RNReanimated: bf9a13df8464905e58268ac9ef108c143a63f08a
-  RNScreens: 71cee3b50648a986acd9d0e4ac9c8f20f1aedbf7
+  RNScreens: 865ade69cfb9cc9d3bb3b42131dfa83855b5e7a0
   SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
   Yoga: f2aa7bc41e39cbf8edc0251a86fa89193b51491b
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a

FabricExample/package.json

@@ -18,10 +18,10 @@
     "@react-navigation/native-stack": "^6.6.2",
     "react": "18.1.0",
     "react-native": "0.70.0-rc.2",
-    "react-native-gesture-handler": "^2.4.2",
+    "react-native-gesture-handler": "^2.5.0",
     "react-native-reanimated": "link:../",
     "react-native-safe-area-context": "^4.2.5",
-    "react-native-screens": "software-mansion/react-native-screens#568e588817538740dff23a3590748614d4c346e3"
+    "react-native-screens": "^3.15.0"
   },
   "devDependencies": {
     "@babel/core": "^7.17.5",

FabricExample/patches/react-native-gesture-handler+2.5.0.patch

@@ -0,0 +1,21 @@
+diff --git a/node_modules/react-native-gesture-handler/RNGestureHandler.podspec b/node_modules/react-native-gesture-handler/RNGestureHandler.podspec
+index 100d320..033dcd7 100644
+--- a/node_modules/react-native-gesture-handler/RNGestureHandler.podspec
++++ b/node_modules/react-native-gesture-handler/RNGestureHandler.podspec
+@@ -19,7 +19,6 @@ Pod::Spec.new do |s|
+   if fabric_enabled
+     # folly_version must match the version used in React Native
+     # See folly_version in react-native/React/FBReactNativeSpec/FBReactNativeSpec.podspec
+-    folly_version = '2021.06.28.00-v2'
+     folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
+
+     s.pod_target_xcconfig = {
+@@ -32,7 +31,7 @@ Pod::Spec.new do |s|
+     s.dependency "React"
+     s.dependency "React-RCTFabric" # This is for fabric component
+     s.dependency "React-Codegen"
+-    s.dependency "RCT-Folly", folly_version
++    s.dependency "RCT-Folly"
+     s.dependency "RCTRequired"
+     s.dependency "RCTTypeSafety"
+     s.dependency "ReactCommon/turbomodule/core"