From 0977174401afbc737e0575f6d7ff1e893daf7f4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82?= Date: Mon, 8 Jun 2026 16:46:10 +0200 Subject: [PATCH 1/2] Make ruby functions local --- .../RNGestureHandler.podspec | 2 +- .../scripts/gesture_handler_utils.rb | 38 ++++++++++--------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/packages/react-native-gesture-handler/RNGestureHandler.podspec b/packages/react-native-gesture-handler/RNGestureHandler.podspec index df42317098..57b87c0be5 100644 --- a/packages/react-native-gesture-handler/RNGestureHandler.podspec +++ b/packages/react-native-gesture-handler/RNGestureHandler.podspec @@ -5,7 +5,7 @@ is_gh_example_app = ENV["GH_EXAMPLE_APP_NAME"] != nil compilation_metadata_dir = "CompilationDatabase" compilation_metadata_generation_flag = is_gh_example_app ? '-gen-cdb-fragment-path ' + compilation_metadata_dir : '' -version_flag = "-DREACT_NATIVE_MINOR_VERSION=#{rngh_get_react_native_minor_version()}" +version_flag = "-DREACT_NATIVE_MINOR_VERSION=#{GestureHandlerUtils.get_react_native_minor_version()}" Pod::Spec.new do |s| # NPM package specification diff --git a/packages/react-native-gesture-handler/scripts/gesture_handler_utils.rb b/packages/react-native-gesture-handler/scripts/gesture_handler_utils.rb index dc9940aefa..be0a76cb24 100644 --- a/packages/react-native-gesture-handler/scripts/gesture_handler_utils.rb +++ b/packages/react-native-gesture-handler/scripts/gesture_handler_utils.rb @@ -1,25 +1,29 @@ -def rngh_try_to_parse_react_native_package_json(react_native_dir) - react_native_package_json_path = File.join(react_native_dir, 'package.json') +module GestureHandlerUtils + module_function - if !File.exist?(react_native_package_json_path) - return nil + def try_to_parse_react_native_package_json(react_native_dir) + react_native_package_json_path = File.join(react_native_dir, 'package.json') + + if !File.exist?(react_native_package_json_path) + return nil + end + + return JSON.parse(File.read(react_native_package_json_path)) end - return JSON.parse(File.read(react_native_package_json_path)) -end + def get_react_native_minor_version() + react_native_dir = File.dirname(`cd "#{Pod::Config.instance.installation_root.to_s}" && node --print "require.resolve('react-native/package.json')"`) + react_native_json = try_to_parse_react_native_package_json(react_native_dir) -def rngh_get_react_native_minor_version() - react_native_dir = File.dirname(`cd "#{Pod::Config.instance.installation_root.to_s}" && node --print "require.resolve('react-native/package.json')"`) - react_native_json = rngh_try_to_parse_react_native_package_json(react_native_dir) + if react_native_json == nil + node_modules_dir = ENV["REACT_NATIVE_NODE_MODULES_DIR"] + react_native_json = try_to_parse_react_native_package_json(File.join(node_modules_dir, 'react-native')) + end - if react_native_json == nil - node_modules_dir = ENV["REACT_NATIVE_NODE_MODULES_DIR"] - react_native_json = rngh_try_to_parse_react_native_package_json(File.join(node_modules_dir, 'react-native')) - end + if react_native_json == nil + raise '[react-native-gesture-handler] Unable to recognize your `react-native` version. Please set environmental variable with `react-native` location: `export REACT_NATIVE_NODE_MODULES_DIR="" && pod install`.' + end - if react_native_json == nil - raise '[react-native-gesture-handler] Unable to recognize your `react-native` version. Please set environmental variable with `react-native` location: `export REACT_NATIVE_NODE_MODULES_DIR="" && pod install`.' + return react_native_json['version'].split('.')[1].to_i end - - return react_native_json['version'].split('.')[1].to_i end From 0a18e5d1fa3bb1e73f62a644757178bdd7bc57aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82?= Date: Mon, 8 Jun 2026 17:06:05 +0200 Subject: [PATCH 2/2] Add nil check --- .../scripts/gesture_handler_utils.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/react-native-gesture-handler/scripts/gesture_handler_utils.rb b/packages/react-native-gesture-handler/scripts/gesture_handler_utils.rb index be0a76cb24..cfecb9f4dd 100644 --- a/packages/react-native-gesture-handler/scripts/gesture_handler_utils.rb +++ b/packages/react-native-gesture-handler/scripts/gesture_handler_utils.rb @@ -17,7 +17,9 @@ def get_react_native_minor_version() if react_native_json == nil node_modules_dir = ENV["REACT_NATIVE_NODE_MODULES_DIR"] - react_native_json = try_to_parse_react_native_package_json(File.join(node_modules_dir, 'react-native')) + if node_modules_dir != nil + react_native_json = try_to_parse_react_native_package_json(File.join(node_modules_dir, 'react-native')) + end end if react_native_json == nil