From 662c1e43d24bb7f989577fd1db0c5ee83b393b22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oskar=20Kwas=CC=81niewski?= Date: Fri, 30 Aug 2024 13:40:32 +0200 Subject: [PATCH] fix: RNTA linking issue --- Apps/BRNPlayground/ios/Podfile | 17 +++++++++++- Apps/BRNPlayground/ios/Podfile.lock | 26 ++++++++++--------- .../patches/react-native-test-app+3.7.2.patch | 15 +++++++++++ 3 files changed, 45 insertions(+), 13 deletions(-) create mode 100644 Apps/BRNPlayground/patches/react-native-test-app+3.7.2.patch diff --git a/Apps/BRNPlayground/ios/Podfile b/Apps/BRNPlayground/ios/Podfile index 929d73677..499c501aa 100644 --- a/Apps/BRNPlayground/ios/Podfile +++ b/Apps/BRNPlayground/ios/Podfile @@ -1,5 +1,20 @@ require_relative '../node_modules/react-native-test-app/test_app' +require_relative '../node_modules/react-native-permissions/scripts/setup' workspace 'BRNPlayground.xcworkspace' -use_test_app! +options = { + :bridgeless_enabled => false, + :fabric_enabled => false, + :hermes_enabled => false, + # Fixes linking issue when using CMake > 3.24 + :app_build_settings => { + 'LIBRARY_SEARCH_PATHS' => '$(inherited) "$(PODS_ROOT)/../../../../Modules/@babylonjs/Build/iOS/build/"/**', + } +} + +# react-native-permissions +setup_permissions(['Camera']) + +use_test_app! options + diff --git a/Apps/BRNPlayground/ios/Podfile.lock b/Apps/BRNPlayground/ios/Podfile.lock index c0e600d33..3db59f5ea 100644 --- a/Apps/BRNPlayground/ios/Podfile.lock +++ b/Apps/BRNPlayground/ios/Podfile.lock @@ -854,7 +854,7 @@ PODS: - React-debug - react-native-babylon (0.0.1): - React - - react-native-slider (4.5.0): + - react-native-slider (4.5.2): - glog - RCT-Folly (= 2022.05.16.00) - React-Core @@ -1021,15 +1021,17 @@ PODS: - React-jsi (= 0.73.5) - React-logger (= 0.73.5) - React-perflogger (= 0.73.5) - - ReactNativeHost (0.4.4): + - ReactNativeHost (0.4.9): + - glog + - RCT-Folly (= 2022.05.16.00) - React-Core - React-cxxreact - ReactCommon/turbomodule/core - - ReactTestApp-DevSupport (3.2.15): + - ReactTestApp-DevSupport (3.7.2): - React-Core - React-jsi - ReactTestApp-Resources (1.0.0-dev) - - RNPermissions (3.10.1): + - RNPermissions (4.1.5): - React-Core - SocketRocket (0.6.1) - Yoga (1.14.0) @@ -1233,7 +1235,7 @@ SPEC CHECKSUMS: React-logger: 0331362115f0f5b392bd7ed14636d1a3ea612479 React-Mapbuffer: 7c35cd53a22d0be04d3f26f7881c7fb7dd230216 react-native-babylon: bf91c1c58c6074bc30c85d9959b62c340388ad60 - react-native-slider: 09e5a8b7e766d3b5ae24ec15c5c4ec2679ca0f8c + react-native-slider: 7a39874fc1fcdfee48e448fa72cce0a8f2c7c5d6 React-nativeconfig: 1166714a4f7ea57a0df5c2cb44fbc70f98d580f9 React-NativeModulesApple: 461b7a216dffdcfcae46afeba2e0859a78eef71e React-perflogger: 0dd9f1725d55f8264b81efadd373fe1d9cca7dc2 @@ -1254,13 +1256,13 @@ SPEC CHECKSUMS: React-runtimescheduler: 7b558337d22a47a270b5c99d8016b5ab743b3035 React-utils: 987a4526a2fc0acdfaf87888adfe0bf9d0452066 ReactCommon: dcc87812d79ce368cc41b7cf49fb624cf3c22b6b - ReactNativeHost: 59d4565eee4fb44efb46d3bff7adbaf2cf29fa5f - ReactTestApp-DevSupport: 8a69118a4beadc5c4426e35d4d38c3dc7357cb3d - ReactTestApp-Resources: da77347b3f02b5d79ba3fecb3ad328b2f6a7ef4d - RNPermissions: 4e3714e18afe7141d000beae3755e5b5fb2f5e05 + ReactNativeHost: 8d42a784a88c420acba96197e779d0f8ac467e04 + ReactTestApp-DevSupport: f845db38b4b4ce8d341f8acdba934ee85ed3d7b2 + ReactTestApp-Resources: 857244f3a23f2b3157b364fa06cf3e8866deff9c + RNPermissions: 5a2dafe37c8e0a3fa1d6e0783a1490b1b7fd92d6 SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 - Yoga: a716eea57d0d3430219c0a5a233e1e93ee931eb7 + Yoga: 9e6a04eacbd94f97d94577017e9f23b3ab41cf6c -PODFILE CHECKSUM: e687290f438ec43665217ddfa04af01259887347 +PODFILE CHECKSUM: b0e00fa0d52ad3e78f29d768017148381add99f0 -COCOAPODS: 1.14.2 +COCOAPODS: 1.15.2 diff --git a/Apps/BRNPlayground/patches/react-native-test-app+3.7.2.patch b/Apps/BRNPlayground/patches/react-native-test-app+3.7.2.patch new file mode 100644 index 000000000..5dbc7e4e6 --- /dev/null +++ b/Apps/BRNPlayground/patches/react-native-test-app+3.7.2.patch @@ -0,0 +1,15 @@ +diff --git a/node_modules/react-native-test-app/ios/test_app.rb b/node_modules/react-native-test-app/ios/test_app.rb +index c6662e8..61a0e88 100644 +--- a/node_modules/react-native-test-app/ios/test_app.rb ++++ b/node_modules/react-native-test-app/ios/test_app.rb +@@ -235,6 +235,10 @@ def make_project!(xcodeproj, project_root, target_platform, options) + tests_build_settings = {} + uitests_build_settings = {} + ++ options[:app_build_settings]&.each do |setting, value| ++ build_settings[setting] ||= value ++ end ++ + code_sign_entitlements = platform_config('codeSignEntitlements', project_root, target_platform) + if code_sign_entitlements.is_a? String + package_root = File.dirname(find_file('app.json', project_root))