Skip to content

Commit

Permalink
Bump dependencies in FabricExample (#3506)
Browse files Browse the repository at this point in the history
## Description

This PR bumps the following dependencies in Reanimated's FabricExample app:
* `react-native-gesture-handler`: 2.5.0 + software-mansion/react-native-gesture-handler#2148 + software-mansion/react-native-gesture-handler#2126 (patch-package)
* `react-native-screens`: software-mansion/react-native-screens@dfc90db (3.16.0 crashes on Android)
* `react-native-safe-area-context`: 4.3.3

The motivation behind this PR is to finally fix our CI builds of FabricExample app on Android.

Also, the MacOS runner image was upgraded to `macos-12` to fix `kLSNoExecutableErr: The executable is missing` error.

<!--
Description and motivation for this PR.

Inlude Fixes #<number> if this is fixing some issue.

Fixes # .
-->

## Changes

<!--
Please describe things you've changed here, make a **high level** overview, if change is simple you can omit this section.

For example:

- Added `foo` method which add bouncing animation
- Updated `about.md` docs
- Added caching in CI builds

-->

<!--

## Screenshots / GIFs

Here you can add screenshots / GIFs documenting your change.

You can add before / after section if you're changing some behavior.

### Before

### After

-->

## Test code and steps to reproduce

<!--
Please include code that can be used to test this change and short description how this example should work.
This snippet should be as minimal as possible and ready to be pasted into editor (don't exclude exports or remove "not important" parts of reproduction example)
-->

## Checklist

- [ ] Included code example that can be used to test this change
- [ ] Updated TS types
- [ ] Added TS types tests
- [ ] Added unit / integration tests
- [ ] Updated documentation
- [ ] Ensured that CI passes
  • Loading branch information
tomekzaw authored Aug 22, 2022
1 parent e7d2692 commit 82cb045
Show file tree
Hide file tree
Showing 8 changed files with 52 additions and 108 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ios-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ on:

jobs:
build:
# runs-on: macos-latest // issue: https://github.com/actions/virtual-environments/issues/4060
runs-on: macos-11
runs-on: macos-12
strategy:
matrix:
working-directory: [Example, FabricExample]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tv-os-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
workflow_dispatch:
jobs:
build:
runs-on: macos-latest
runs-on: macos-12
env:
WORKING_DIRECTORY: TVOSExample
concurrency:
Expand Down
26 changes: 13 additions & 13 deletions FabricExample/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -625,26 +625,26 @@ PODS:
- React-jsinspector (0.70.0-rc.2)
- React-logger (0.70.0-rc.2):
- glog
- react-native-safe-area-context (4.2.5):
- react-native-safe-area-context (4.3.3):
- RCT-Folly
- RCTRequired
- RCTTypeSafety
- React
- react-native-safe-area-context/common (= 4.2.5)
- react-native-safe-area-context/fabric (= 4.2.5)
- React-Core
- react-native-safe-area-context/common (= 4.3.3)
- react-native-safe-area-context/fabric (= 4.3.3)
- ReactCommon/turbomodule/core
- react-native-safe-area-context/common (4.2.5):
- react-native-safe-area-context/common (4.3.3):
- RCT-Folly
- RCTRequired
- RCTTypeSafety
- React
- React-Core
- ReactCommon/turbomodule/core
- react-native-safe-area-context/fabric (4.2.5):
- react-native-safe-area-context/fabric (4.3.3):
- RCT-Folly
- RCTRequired
- RCTTypeSafety
- React
- React-Codegen
- React-Core
- react-native-safe-area-context/common
- React-RCTFabric
- ReactCommon/turbomodule/core
Expand Down Expand Up @@ -757,16 +757,16 @@ PODS:
- React-RCTText
- ReactCommon/turbomodule/core
- Yoga
- RNScreens (3.15.0):
- RNScreens (3.16.0):
- RCT-Folly
- RCTRequired
- RCTTypeSafety
- React
- React-Codegen
- React-RCTFabric
- ReactCommon/turbomodule/core
- RNScreens/common (= 3.15.0)
- RNScreens/common (3.15.0):
- RNScreens/common (= 3.16.0)
- RNScreens/common (3.16.0):
- RCT-Folly
- RCTRequired
- RCTTypeSafety
Expand Down Expand Up @@ -991,7 +991,7 @@ SPEC CHECKSUMS:
React-jsiexecutor: 12d1ed281abeda9428fb16c1026487542395c3b7
React-jsinspector: 49a8875f27791316bb0039fa7627b4c1f0578cc7
React-logger: 55ff3b00451ad1dc82654ba60134ec82ae4dbfed
react-native-safe-area-context: a9616f1fd257ff31946b518266a62f50dbcb3d5b
react-native-safe-area-context: 6ab17f921537d721f7315b198d82d6a65a2680f9
React-perflogger: f53712c718e55b63c34140834fea4e8775948930
React-RCTActionSheet: 476de07b325fcd61e89b5556125272b1fa7475e8
React-RCTAnimation: b6e0756c75e3eb88a3d353cf4e6f4fb64a0c95d4
Expand All @@ -1008,7 +1008,7 @@ SPEC CHECKSUMS:
ReactCommon: e192c52229a978dc7ab7bfb21aa38c686005db31
RNGestureHandler: c2c12e610e4d94ea917bbd31801974edcee4dd94
RNReanimated: 10249ac81b456595273588ce2195198d85fcbd28
RNScreens: 865ade69cfb9cc9d3bb3b42131dfa83855b5e7a0
RNScreens: bb17bdc9eca378fefc6103fb52c35b4f7ef0a791
SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
Yoga: f2aa7bc41e39cbf8edc0251a86fa89193b51491b
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
Expand Down
4 changes: 2 additions & 2 deletions FabricExample/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"react-native": "0.70.0-rc.2",
"react-native-gesture-handler": "^2.5.0",
"react-native-reanimated": "link:../",
"react-native-safe-area-context": "^4.2.5",
"react-native-screens": "^3.15.0"
"react-native-safe-area-context": "^4.3.3",
"react-native-screens": "software-mansion/react-native-screens#dfc90db38f849ca7e3a7895c4eb94bbfaee4f708"
},
"devDependencies": {
"@babel/core": "^7.17.5",
Expand Down
27 changes: 27 additions & 0 deletions FabricExample/patches/react-native-gesture-handler+2.5.0.patch
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,30 @@ index 100d320..033dcd7 100644
s.dependency "RCTRequired"
s.dependency "RCTTypeSafety"
s.dependency "ReactCommon/turbomodule/core"
diff --git a/node_modules/react-native-gesture-handler/android/build.gradle b/node_modules/react-native-gesture-handler/android/build.gradle
index ad5845e..7318b1b 100644
--- a/node_modules/react-native-gesture-handler/android/build.gradle
+++ b/node_modules/react-native-gesture-handler/android/build.gradle
@@ -59,6 +59,11 @@ def shouldUseCommonInterfaceFromReanimated() {
}
}

+def reactNativeArchitectures() {
+ def value = project.getProperties().get("reactNativeArchitectures")
+ return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
+}
+
repositories {
mavenCentral()
}
@@ -98,6 +103,10 @@ android {
}
}
}
+
+ ndk {
+ abiFilters (*reactNativeArchitectures())
+ }
}

compileOptions {
60 changes: 0 additions & 60 deletions FabricExample/patches/react-native-safe-area-context+4.2.5.patch

This file was deleted.

21 changes: 0 additions & 21 deletions FabricExample/patches/react-native-screens+3.15.0.patch

This file was deleted.

17 changes: 8 additions & 9 deletions FabricExample/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6088,15 +6088,14 @@ react-native-gradle-plugin@^0.70.1:
version "0.0.0"
uid ""

react-native-safe-area-context@^4.2.5:
version "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@^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==
react-native-safe-area-context@^4.3.3:
version "4.3.3"
resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-4.3.3.tgz#a0f1e3116ded39efc1b78a46a6d89c71169827e4"
integrity sha512-xwsloGLDUzeTN40TIh4Te/zRePSnBAuWlLIiEW3RYE9gHHYslqQWpfK7N24SdAQEH3tHZ+huoYNjo2GQJO/vnQ==

react-native-screens@software-mansion/react-native-screens#dfc90db38f849ca7e3a7895c4eb94bbfaee4f708:
version "3.16.0"
resolved "https://codeload.github.com/software-mansion/react-native-screens/tar.gz/dfc90db38f849ca7e3a7895c4eb94bbfaee4f708"
dependencies:
react-freeze "^1.0.0"
warn-once "^0.1.0"
Expand Down

0 comments on commit 82cb045

Please sign in to comment.