Skip to content

Commit 4afdcbd

Browse files
m-bertjavachezoontekj-piaseckikitten
authored
[Release 2.32] Cherry-pick thread (#4255)
## Description Cherry pick thread for release 2.32 ## List of PRs | PR | Original commit | Picked commit | Without confilct | |:----------:|:-------------:|:------:|:--------:| | [[Android] Remove `getChildInDrawingOrderAtIndex`](#4156) | [f1f09bc](f1f09bc) | [d76f2d9](d76f2d9) | ❌ | | [[iOS] Fix duplicated `testID`](#4186) | [7feab6e](7feab6e) | [d1173ec](d1173ec) | ❌ | | [[Android] Fix discrete gestures not triggering `onFinalize`](#4196) | [117087e](117087e) | [06212cf](06212cf) | ✅ | | [[Android] Fix wrong reported number of pointers](#4218) | [f17bcbd](f17bcbd) | [5fd30f6](5fd30f6) | ❌ | | [fix(pods): Fix invalid `react-native/../react-native` resolution for aliases](#4232) | [9a9f8b4](9a9f8b4) | [cacf6c0](cacf6c0) | ✅ | | [Move ruby utils to module](#4245) | [62d0d52](62d0d52) | [3884f30](3884f30) | ❌ | | [[iOS] Fix handler retrieval and mismatched coordinate space](#4199) | [b1da40b](b1da40b) | [2b48a8e](2b48a8e) | ❌ | | [[iOS] Don't iterate to root while resolving recognizer](#4202) | [fba4dcc](fba4dcc) | [b81f2aa](b81f2aa) | ❌ | | [Support React Native 0.86](#4166) | [96dfc00](96dfc00) | [7df6d1a](7df6d1a) | ❌ | | [Fix `RNRenderer` import for React Native 0.86](#4160) | [0417378](0417378) | [6775d33](6775d33) | ❌ | | [Bump `expo` to stable 56](#4227) | [45e6ac8](45e6ac8) | [0478bb5](0478bb5) | ❌ | | [[macOS] Bump example app](#3993) | [8ec0820](8ec0820) | [cfc5dd4](cfc5dd4) | ❌ | | [Bump Reanimated](#4040) | [23d96d9](23d96d9) | [a2101eb](a2101eb) | ❌ | | [fix(Android): apply `numberOfPointers` config to the pointer requirement in `LongPressGestureHandler`](#4253) | [a70c6e3](a70c6e3) | [af40f9b](af40f9b) | ✅ | ## Test plan Tested that example apps are built correctly --------- Co-authored-by: Pieter De Baets <pieter.debaets@gmail.com> Co-authored-by: Mathieu Acthernoene <zoontek@gmail.com> Co-authored-by: Jakub Piasecki <jakub.piasecki@swmansion.com> Co-authored-by: Phil Pluckthun <phil@kitten.sh> Co-authored-by: prashanFOMO <prashan@fomo.family> Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
1 parent e85cdfe commit 4afdcbd

50 files changed

Lines changed: 4968 additions & 4703 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/ios-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
build:
1717
if: github.repository == 'software-mansion/react-native-gesture-handler'
1818

19-
runs-on: macos-14
19+
runs-on: macos-26
2020
strategy:
2121
matrix:
2222
working-directory: [apps/basic-example, apps/expo-example]
@@ -31,7 +31,7 @@ jobs:
3131
- name: Use latest stable Xcode
3232
uses: maxim-lobanov/setup-xcode@v1
3333
with:
34-
xcode-version: '16.1'
34+
xcode-version: '26.4.1'
3535

3636
- name: Use Node.js 24
3737
uses: actions/setup-node@v6

apps/basic-example/ios/BasicExample.xcodeproj/project.pbxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,7 @@
397397
"$(inherited)",
398398
" ",
399399
);
400+
PODFILE_DIR = "$(SRCROOT)";
400401
REACT_NATIVE_PATH = "${PODS_ROOT}/../../../../node_modules/react-native";
401402
SDKROOT = iphoneos;
402403
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
@@ -475,6 +476,7 @@
475476
"$(inherited)",
476477
" ",
477478
);
479+
PODFILE_DIR = "$(SRCROOT)";
478480
REACT_NATIVE_PATH = "${PODS_ROOT}/../../../../node_modules/react-native";
479481
SDKROOT = iphoneos;
480482
SWIFT_ENABLE_EXPLICIT_MODULES = NO;

0 commit comments

Comments
 (0)