Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bumped gesture-handler and screens dependencies #3468

Merged
merged 4 commits into from Aug 16, 2022
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions FabricExample/ios/Podfile.lock
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions FabricExample/package.json
Expand Up @@ -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",
Expand Down
84 changes: 0 additions & 84 deletions FabricExample/patches/react-native-gesture-handler+2.4.2.patch

This file was deleted.

21 changes: 21 additions & 0 deletions 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"
102 changes: 0 additions & 102 deletions FabricExample/patches/react-native-screens+3.13.1.patch

This file was deleted.

21 changes: 21 additions & 0 deletions FabricExample/patches/react-native-screens+3.15.0.patch
@@ -0,0 +1,21 @@
diff --git a/node_modules/react-native-screens/RNScreens.podspec b/node_modules/react-native-screens/RNScreens.podspec
index 5e43bf7..aed0cae 100644
--- a/node_modules/react-native-screens/RNScreens.podspec
+++ b/node_modules/react-native-screens/RNScreens.podspec
@@ -6,7 +6,6 @@ fabric_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'

# 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'

Pod::Spec.new do |s|
@@ -36,7 +35,7 @@ Pod::Spec.new do |s|
s.dependency "React"
s.dependency "React-RCTFabric"
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"
15 changes: 8 additions & 7 deletions FabricExample/yarn.lock
Expand Up @@ -6068,10 +6068,10 @@ react-native-codegen@^0.70.3:
jscodeshift "^0.13.1"
nullthrows "^1.1.1"

react-native-gesture-handler@^2.4.2:
version "2.4.2"
resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-2.4.2.tgz#de93760b0bc251d94e8ae692f9850ec3ed2e4f27"
integrity sha512-K3oMiQV7NOVB5RvNlxkyJxU1Gn6m1cYu53MoFA542FVDSTR491d1eQkWDdqy4lW52rfF7IK7eE1LCi+kTJx7jw==
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"
hoist-non-react-statics "^3.3.0"
Expand All @@ -6093,9 +6093,10 @@ react-native-safe-area-context@^4.2.5:
resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-4.2.5.tgz#23006dc1a398bb825d7d795c27f1c46119efe8a5"
integrity sha512-nUil2de1gk/8ZB9IzIxFyGCiKeAYcHzJb/Tks2NzSkev1qH4MNR05DWYDSmW6vLT+y4mospLVyG/H5dyUd+KQQ==

react-native-screens@software-mansion/react-native-screens#568e588817538740dff23a3590748614d4c346e3:
version "3.13.1"
resolved "https://codeload.github.com/software-mansion/react-native-screens/tar.gz/568e588817538740dff23a3590748614d4c346e3"
react-native-screens@^3.15.0:
version "3.15.0"
resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-3.15.0.tgz#78e42c8df72851b1ff235ddf5434b961ae123ca5"
integrity sha512-ezC5TibsUYyqPuuHpZoM3iEl6bRzCVBMJeGaFkn7xznuOt1VwkZVub0BvafIEYR/+AQC/RjxzMSQPs1qal0+wA==
dependencies:
react-freeze "^1.0.0"
warn-once "^0.1.0"
Expand Down