diff options
author | Paul Frazee <pfrazee@gmail.com> | 2023-01-17 20:40:02 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-17 20:40:02 -0600 |
commit | 065d7ef629c7d991e520fc3dd94cd84b71014902 (patch) | |
tree | 89ed72702a5af85eb8508682edc9f2281d23c2e5 /ios | |
parent | 61682d5846523038d9a28f851d2bd7c16d27a4a9 (diff) | |
download | voidsky-065d7ef629c7d991e520fc3dd94cd84b71014902.tar.zst |
Improve lightbox... and update to React Native 0.71.0 (#49)
* Switch to a better lightbox implementation (close #42) * Upgrade to react-native 0.71.0 * Update (or remove low-value) tests
Diffstat (limited to 'ios')
-rw-r--r-- | ios/.xcode.env | 10 | ||||
-rw-r--r-- | ios/Podfile | 34 | ||||
-rw-r--r-- | ios/Podfile.lock | 550 | ||||
-rw-r--r-- | ios/app.xcodeproj/project.pbxproj | 55 | ||||
-rw-r--r-- | ios/app/AppDelegate.h | 6 | ||||
-rw-r--r-- | ios/app/AppDelegate.mm | 97 |
6 files changed, 392 insertions, 360 deletions
diff --git a/ios/.xcode.env b/ios/.xcode.env new file mode 100644 index 000000000..9d643e97a --- /dev/null +++ b/ios/.xcode.env @@ -0,0 +1,10 @@ +# This `.xcode.env` file is versioned and is used to source the environment +# used when running script phases inside Xcode. +# To customize your local environment, you can create an `.xcode.env.local` +# file that is not versioned. +# NODE_BINARY variable contains the PATH to the node executable. +# +# Customize the NODE_BINARY variable here. +# For example, to use nvm with brew, add the following line +# . "$(brew --prefix nvm)/nvm.sh" --no-use +export NODE_BINARY=$(command -v node) \ No newline at end of file diff --git a/ios/Podfile b/ios/Podfile index f9a45704c..bc4be9f15 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -1,8 +1,16 @@ require_relative '../node_modules/react-native/scripts/react_native_pods' require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules' -platform :ios, '11.0' -install! 'cocoapods', :deterministic_uuids => false +platform :ios, min_ios_version_supported +prepare_react_native_project! + +flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled + +linkage = ENV['USE_FRAMEWORKS'] +if linkage != nil + Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green + use_frameworks! :linkage => linkage.to_sym +end target 'app' do pod 'React-RCTLinking', :path => '../node_modules/react-native/Libraries/LinkingIOS' @@ -13,9 +21,16 @@ target 'app' do use_react_native!( :path => config[:reactNativePath], - # to enable hermes on iOS, change `false` to `true` and then install pods + # Hermes is now enabled by default. Disable by setting this flag to false. + # Upcoming versions of React Native may rely on get_default_flags(), but + # we make it explicit here to aid in the React Native upgrade process. :hermes_enabled => flags[:hermes_enabled], :fabric_enabled => flags[:fabric_enabled], + # Enables Flipper. + # + # Note that if you have use_frameworks! enabled, Flipper will not work and + # you should disable the next line. + #:flipper_configuration => flipper_config, # An absolute path to your application root. :app_path => "#{Pod::Config.instance.installation_root}/.." ) @@ -25,14 +40,13 @@ target 'app' do # Pods for testing end - # Enables Flipper. - # - # Note that if you have use_frameworks! enabled, Flipper will not work and - # you should disable the next line. - #use_flipper!() - post_install do |installer| - react_native_post_install(installer) + react_native_post_install( + installer, + # Set `mac_catalyst_enabled` to `true` in order to apply patches + # necessary for Mac Catalyst builds + :mac_catalyst_enabled => false + ) __apply_Xcode_12_5_M1_post_install_workaround(installer) # iOS fix diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 6f36fcbc7..9ce861cc8 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -3,222 +3,238 @@ PODS: - BVLinearGradient (2.6.2): - React-Core - DoubleConversion (1.1.6) - - FBLazyVector (0.68.2) - - FBReactNativeSpec (0.68.2): - - RCT-Folly (= 2021.06.28.00-v2) - - RCTRequired (= 0.68.2) - - RCTTypeSafety (= 0.68.2) - - React-Core (= 0.68.2) - - React-jsi (= 0.68.2) - - ReactCommon/turbomodule/core (= 0.68.2) + - FBLazyVector (0.71.0) + - FBReactNativeSpec (0.71.0): + - RCT-Folly (= 2021.07.22.00) + - RCTRequired (= 0.71.0) + - RCTTypeSafety (= 0.71.0) + - React-Core (= 0.71.0) + - React-jsi (= 0.71.0) + - ReactCommon/turbomodule/core (= 0.71.0) - fmt (6.2.1) - glog (0.3.5) - - RCT-Folly (2021.06.28.00-v2): + - hermes-engine (0.71.0): + - hermes-engine/Pre-built (= 0.71.0) + - hermes-engine/Pre-built (0.71.0) + - libevent (2.1.12) + - RCT-Folly (2021.07.22.00): - boost - DoubleConversion - fmt (~> 6.2.1) - glog - - RCT-Folly/Default (= 2021.06.28.00-v2) - - RCT-Folly/Default (2021.06.28.00-v2): + - RCT-Folly/Default (= 2021.07.22.00) + - RCT-Folly/Default (2021.07.22.00): - boost - DoubleConversion - fmt (~> 6.2.1) - glog - - RCTRequired (0.68.2) - - RCTTypeSafety (0.68.2): - - FBLazyVector (= 0.68.2) - - RCT-Folly (= 2021.06.28.00-v2) - - RCTRequired (= 0.68.2) - - React-Core (= 0.68.2) - - React (0.68.2): - - React-Core (= 0.68.2) - - React-Core/DevSupport (= 0.68.2) - - React-Core/RCTWebSocket (= 0.68.2) - - React-RCTActionSheet (= 0.68.2) - - React-RCTAnimation (= 0.68.2) - - React-RCTBlob (= 0.68.2) - - React-RCTImage (= 0.68.2) - - React-RCTLinking (= 0.68.2) - - React-RCTNetwork (= 0.68.2) - - React-RCTSettings (= 0.68.2) - - React-RCTText (= 0.68.2) - - React-RCTVibration (= 0.68.2) - - React-callinvoker (0.68.2) - - React-Codegen (0.68.2): - - FBReactNativeSpec (= 0.68.2) - - RCT-Folly (= 2021.06.28.00-v2) - - RCTRequired (= 0.68.2) - - RCTTypeSafety (= 0.68.2) - - React-Core (= 0.68.2) - - React-jsi (= 0.68.2) - - React-jsiexecutor (= 0.68.2) - - ReactCommon/turbomodule/core (= 0.68.2) - - React-Core (0.68.2): + - RCT-Folly/Futures (2021.07.22.00): + - boost + - DoubleConversion + - fmt (~> 6.2.1) + - glog + - libevent + - RCTRequired (0.71.0) + - RCTTypeSafety (0.71.0): + - FBLazyVector (= 0.71.0) + - RCTRequired (= 0.71.0) + - React-Core (= 0.71.0) + - React (0.71.0): + - React-Core (= 0.71.0) + - React-Core/DevSupport (= 0.71.0) + - React-Core/RCTWebSocket (= 0.71.0) + - React-RCTActionSheet (= 0.71.0) + - React-RCTAnimation (= 0.71.0) + - React-RCTBlob (= 0.71.0) + - React-RCTImage (= 0.71.0) + - React-RCTLinking (= 0.71.0) + - React-RCTNetwork (= 0.71.0) + - React-RCTSettings (= 0.71.0) + - React-RCTText (= 0.71.0) + - React-RCTVibration (= 0.71.0) + - React-callinvoker (0.71.0) + - React-Codegen (0.71.0): + - FBReactNativeSpec + - hermes-engine + - RCT-Folly + - RCTRequired + - RCTTypeSafety + - React-Core + - React-jsi + - React-jsiexecutor + - ReactCommon/turbomodule/bridging + - ReactCommon/turbomodule/core + - React-Core (0.71.0): - glog - - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/Default (= 0.68.2) - - React-cxxreact (= 0.68.2) - - React-jsi (= 0.68.2) - - React-jsiexecutor (= 0.68.2) - - React-perflogger (= 0.68.2) + - RCT-Folly (= 2021.07.22.00) + - React-Core/Default (= 0.71.0) + - React-cxxreact (= 0.71.0) + - React-jsi (= 0.71.0) + - React-jsiexecutor (= 0.71.0) + - React-perflogger (= 0.71.0) - Yoga - - React-Core/CoreModulesHeaders (0.68.2): + - React-Core/CoreModulesHeaders (0.71.0): - glog - - RCT-Folly (= 2021.06.28.00-v2) + - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.68.2) - - React-jsi (= 0.68.2) - - React-jsiexecutor (= 0.68.2) - - React-perflogger (= 0.68.2) + - React-cxxreact (= 0.71.0) + - React-jsi (= 0.71.0) + - React-jsiexecutor (= 0.71.0) + - React-perflogger (= 0.71.0) - Yoga - - React-Core/Default (0.68.2): + - React-Core/Default (0.71.0): - glog - - RCT-Folly (= 2021.06.28.00-v2) - - React-cxxreact (= 0.68.2) - - React-jsi (= 0.68.2) - - React-jsiexecutor (= 0.68.2) - - React-perflogger (= 0.68.2) + - RCT-Folly (= 2021.07.22.00) + - React-cxxreact (= 0.71.0) + - React-jsi (= 0.71.0) + - React-jsiexecutor (= 0.71.0) + - React-perflogger (= 0.71.0) - Yoga - - React-Core/DevSupport (0.68.2): + - React-Core/DevSupport (0.71.0): - glog - - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/Default (= 0.68.2) - - React-Core/RCTWebSocket (= 0.68.2) - - React-cxxreact (= 0.68.2) - - React-jsi (= 0.68.2) - - React-jsiexecutor (= 0.68.2) - - React-jsinspector (= 0.68.2) - - React-perflogger (= 0.68.2) + - RCT-Folly (= 2021.07.22.00) + - React-Core/Default (= 0.71.0) + - React-Core/RCTWebSocket (= 0.71.0) + - React-cxxreact (= 0.71.0) + - React-jsi (= 0.71.0) + - React-jsiexecutor (= 0.71.0) + - React-jsinspector (= 0.71.0) + - React-perflogger (= 0.71.0) - Yoga - - React-Core/RCTActionSheetHeaders (0.68.2): + - React-Core/RCTActionSheetHeaders (0.71.0): - glog - - RCT-Folly (= 2021.06.28.00-v2) + - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.68.2) - - React-jsi (= 0.68.2) - - React-jsiexecutor (= 0.68.2) - - React-perflogger (= 0.68.2) + - React-cxxreact (= 0.71.0) + - React-jsi (= 0.71.0) + - React-jsiexecutor (= 0.71.0) + - React-perflogger (= 0.71.0) - Yoga - - React-Core/RCTAnimationHeaders (0.68.2): + - React-Core/RCTAnimationHeaders (0.71.0): - glog - - RCT-Folly (= 2021.06.28.00-v2) + - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.68.2) - - React-jsi (= 0.68.2) - - React-jsiexecutor (= 0.68.2) - - React-perflogger (= 0.68.2) + - React-cxxreact (= 0.71.0) + - React-jsi (= 0.71.0) + - React-jsiexecutor (= 0.71.0) + - React-perflogger (= 0.71.0) - Yoga - - React-Core/RCTBlobHeaders (0.68.2): + - React-Core/RCTBlobHeaders (0.71.0): - glog - - RCT-Folly (= 2021.06.28.00-v2) + - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.68.2) - - React-jsi (= 0.68.2) - - React-jsiexecutor (= 0.68.2) - - React-perflogger (= 0.68.2) + - React-cxxreact (= 0.71.0) + - React-jsi (= 0.71.0) + - React-jsiexecutor (= 0.71.0) + - React-perflogger (= 0.71.0) - Yoga - - React-Core/RCTImageHeaders (0.68.2): + - React-Core/RCTImageHeaders (0.71.0): - glog - - RCT-Folly (= 2021.06.28.00-v2) + - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.68.2) - - React-jsi (= 0.68.2) - - React-jsiexecutor (= 0.68.2) - - React-perflogger (= 0.68.2) + - React-cxxreact (= 0.71.0) + - React-jsi (= 0.71.0) + - React-jsiexecutor (= 0.71.0) + - React-perflogger (= 0.71.0) - Yoga - - React-Core/RCTLinkingHeaders (0.68.2): + - React-Core/RCTLinkingHeaders (0.71.0): - glog - - RCT-Folly (= 2021.06.28.00-v2) + - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.68.2) - - React-jsi (= 0.68.2) - - React-jsiexecutor (= 0.68.2) - - React-perflogger (= 0.68.2) + - React-cxxreact (= 0.71.0) + - React-jsi (= 0.71.0) + - React-jsiexecutor (= 0.71.0) + - React-perflogger (= 0.71.0) - Yoga - - React-Core/RCTNetworkHeaders (0.68.2): + - React-Core/RCTNetworkHeaders (0.71.0): - glog - - RCT-Folly (= 2021.06.28.00-v2) + - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.68.2) - - React-jsi (= 0.68.2) - - React-jsiexecutor (= 0.68.2) - - React-perflogger (= 0.68.2) + - React-cxxreact (= 0.71.0) + - React-jsi (= 0.71.0) + - React-jsiexecutor (= 0.71.0) + - React-perflogger (= 0.71.0) - Yoga - - React-Core/RCTSettingsHeaders (0.68.2): + - React-Core/RCTSettingsHeaders (0.71.0): - glog - - RCT-Folly (= 2021.06.28.00-v2) + - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.68.2) - - React-jsi (= 0.68.2) - - React-jsiexecutor (= 0.68.2) - - React-perflogger (= 0.68.2) + - React-cxxreact (= 0.71.0) + - React-jsi (= 0.71.0) + - React-jsiexecutor (= 0.71.0) + - React-perflogger (= 0.71.0) - Yoga - - React-Core/RCTTextHeaders (0.68.2): + - React-Core/RCTTextHeaders (0.71.0): - glog - - RCT-Folly (= 2021.06.28.00-v2) + - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.68.2) - - React-jsi (= 0.68.2) - - React-jsiexecutor (= 0.68.2) - - React-perflogger (= 0.68.2) + - React-cxxreact (= 0.71.0) + - React-jsi (= 0.71.0) + - React-jsiexecutor (= 0.71.0) + - React-perflogger (= 0.71.0) - Yoga - - React-Core/RCTVibrationHeaders (0.68.2): + - React-Core/RCTVibrationHeaders (0.71.0): - glog - - RCT-Folly (= 2021.06.28.00-v2) + - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact (= 0.68.2) - - React-jsi (= 0.68.2) - - React-jsiexecutor (= 0.68.2) - - React-perflogger (= 0.68.2) + - React-cxxreact (= 0.71.0) + - React-jsi (= 0.71.0) + - React-jsiexecutor (= 0.71.0) + - React-perflogger (= 0.71.0) - Yoga - - React-Core/RCTWebSocket (0.68.2): + - React-Core/RCTWebSocket (0.71.0): - glog - - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/Default (= 0.68.2) - - React-cxxreact (= 0.68.2) - - React-jsi (= 0.68.2) - - React-jsiexecutor (= 0.68.2) - - React-perflogger (= 0.68.2) + - RCT-Folly (= 2021.07.22.00) + - React-Core/Default (= 0.71.0) + - React-cxxreact (= 0.71.0) + - React-jsi (= 0.71.0) + - React-jsiexecutor (= 0.71.0) + - React-perflogger (= 0.71.0) - Yoga - - React-CoreModules (0.68.2): - - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.68.2) - - React-Codegen (= 0.68.2) - - React-Core/CoreModulesHeaders (= 0.68.2) - - React-jsi (= 0.68.2) - - React-RCTImage (= 0.68.2) - - ReactCommon/turbomodule/core (= 0.68.2) - - React-cxxreact (0.68.2): + - React-CoreModules (0.71.0): + - RCT-Folly (= 2021.07.22.00) + - RCTTypeSafety (= 0.71.0) + - React-Codegen (= 0.71.0) + - React-Core/CoreModulesHeaders (= 0.71.0) + - React-jsi (= 0.71.0) + - React-RCTImage (= 0.71.0) + - ReactCommon/turbomodule/core (= 0.71.0) + - React-cxxreact (0.71.0): - boost (= 1.76.0) - DoubleConversion - glog - - RCT-Folly (= 2021.06.28.00-v2) - - React-callinvoker (= 0.68.2) - - React-jsi (= 0.68.2) - - React-jsinspector (= 0.68.2) - - React-logger (= 0.68.2) - - React-perflogger (= 0.68.2) - - React-runtimeexecutor (= 0.68.2) - - React-jsi (0.68.2): - - boost (= 1.76.0) + - RCT-Folly (= 2021.07.22.00) + - React-callinvoker (= 0.71.0) + - React-jsi (= 0.71.0) + - React-jsinspector (= 0.71.0) + - React-logger (= 0.71.0) + - React-perflogger (= 0.71.0) + - React-runtimeexecutor (= 0.71.0) + - React-hermes (0.71.0): - DoubleConversion - glog - - RCT-Folly (= 2021.06.28.00-v2) - - React-jsi/Default (= 0.68.2) - - React-jsi/Default (0.68.2): + - hermes-engine + - RCT-Folly (= 2021.07.22.00) + - RCT-Folly/Futures (= 2021.07.22.00) + - React-cxxreact (= 0.71.0) + - React-jsiexecutor (= 0.71.0) + - React-jsinspector (= 0.71.0) + - React-perflogger (= 0.71.0) + - React-jsi (0.71.0): - boost (= 1.76.0) - DoubleConversion - glog - - RCT-Folly (= 2021.06.28.00-v2) - - React-jsiexecutor (0.68.2): + - hermes-engine + - RCT-Folly (= 2021.07.22.00) + - React-jsiexecutor (0.71.0): - DoubleConversion - glog - - RCT-Folly (= 2021.06.28.00-v2) - - React-cxxreact (= 0.68.2) - - React-jsi (= 0.68.2) - - React-perflogger (= 0.68.2) - - React-jsinspector (0.68.2) - - React-logger (0.68.2): + - RCT-Folly (= 2021.07.22.00) + - React-cxxreact (= 0.71.0) + - React-jsi (= 0.71.0) + - React-perflogger (= 0.71.0) + - React-jsinspector (0.71.0) + - React-logger (0.71.0): - glog - react-native-cameraroll (5.2.0): - React-Core @@ -236,71 +252,87 @@ PODS: - React-Core - react-native-version-number (0.3.6): - React - - React-perflogger (0.68.2) - - React-RCTActionSheet (0.68.2): - - React-Core/RCTActionSheetHeaders (= 0.68.2) - - React-RCTAnimation (0.68.2): - - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.68.2) - - React-Codegen (= 0.68.2) - - React-Core/RCTAnimationHeaders (= 0.68.2) - - React-jsi (= 0.68.2) - - ReactCommon/turbomodule/core (= 0.68.2) - - React-RCTBlob (0.68.2): - - RCT-Folly (= 2021.06.28.00-v2) - - React-Codegen (= 0.68.2) - - React-Core/RCTBlobHeaders (= 0.68.2) - - React-Core/RCTWebSocket (= 0.68.2) - - React-jsi (= 0.68.2) - - React-RCTNetwork (= 0.68.2) - - ReactCommon/turbomodule/core (= 0.68.2) - - React-RCTImage (0.68.2): - - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.68.2) - - React-Codegen (= 0.68.2) - - React-Core/RCTImageHeaders (= 0.68.2) - - React-jsi (= 0.68.2) - - React-RCTNetwork (= 0.68.2) - - ReactCommon/turbomodule/core (= 0.68.2) - - React-RCTLinking (0.68.2): - - React-Codegen (= 0.68.2) - - React-Core/RCTLinkingHeaders (= 0.68.2) - - React-jsi (= 0.68.2) - - ReactCommon/turbomodule/core (= 0.68.2) - - React-RCTNetwork (0.68.2): - - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.68.2) - - React-Codegen (= 0.68.2) - - React-Core/RCTNetworkHeaders (= 0.68.2) - - React-jsi (= 0.68.2) - - ReactCommon/turbomodule/core (= 0.68.2) - - React-RCTSettings (0.68.2): - - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.68.2) - - React-Codegen (= 0.68.2) - - React-Core/RCTSettingsHeaders (= 0.68.2) - - React-jsi (= 0.68.2) - - ReactCommon/turbomodule/core (= 0.68.2) - - React-RCTText (0.68.2): - - React-Core/RCTTextHeaders (= 0.68.2) - - React-RCTVibration (0.68.2): - - RCT-Folly (= 2021.06.28.00-v2) - - React-Codegen (= 0.68.2) - - React-Core/RCTVibrationHeaders (= 0.68.2) - - React-jsi (= 0.68.2) - - ReactCommon/turbomodule/core (= 0.68.2) - - React-runtimeexecutor (0.68.2): - - React-jsi (= 0.68.2) - - ReactCommon/turbomodule/core (0.68.2): + - React-perflogger (0.71.0) + - React-RCTActionSheet (0.71.0): + - React-Core/RCTActionSheetHeaders (= 0.71.0) + - React-RCTAnimation (0.71.0): + - RCT-Folly (= 2021.07.22.00) + - RCTTypeSafety (= 0.71.0) + - React-Codegen (= 0.71.0) + - React-Core/RCTAnimationHeaders (= 0.71.0) + - React-jsi (= 0.71.0) + - ReactCommon/turbomodule/core (= 0.71.0) + - React-RCTAppDelegate (0.71.0): + - RCT-Folly + - RCTRequired + - RCTTypeSafety + - React-Core + - ReactCommon/turbomodule/core + - React-RCTBlob (0.71.0): + - RCT-Folly (= 2021.07.22.00) + - React-Codegen (= 0.71.0) + - React-Core/RCTBlobHeaders (= 0.71.0) + - React-Core/RCTWebSocket (= 0.71.0) + - React-jsi (= 0.71.0) + - React-RCTNetwork (= 0.71.0) + - ReactCommon/turbomodule/core (= 0.71.0) + - React-RCTImage (0.71.0): + - RCT-Folly (= 2021.07.22.00) + - RCTTypeSafety (= 0.71.0) + - React-Codegen (= 0.71.0) + - React-Core/RCTImageHeaders (= 0.71.0) + - React-jsi (= 0.71.0) + - React-RCTNetwork (= 0.71.0) + - ReactCommon/turbomodule/core (= 0.71.0) + - React-RCTLinking (0.71.0): + - React-Codegen (= 0.71.0) + - React-Core/RCTLinkingHeaders (= 0.71.0) + - React-jsi (= 0.71.0) + - ReactCommon/turbomodule/core (= 0.71.0) + - React-RCTNetwork (0.71.0): + - RCT-Folly (= 2021.07.22.00) + - RCTTypeSafety (= 0.71.0) + - React-Codegen (= 0.71.0) + - React-Core/RCTNetworkHeaders (= 0.71.0) + - React-jsi (= 0.71.0) + - ReactCommon/turbomodule/core (= 0.71.0) + - React-RCTSettings (0.71.0): + - RCT-Folly (= 2021.07.22.00) + - RCTTypeSafety (= 0.71.0) + - React-Codegen (= 0.71.0) + - React-Core/RCTSettingsHeaders (= 0.71.0) + - React-jsi (= 0.71.0) + - ReactCommon/turbomodule/core (= 0.71.0) + - React-RCTText (0.71.0): + - React-Core/RCTTextHeaders (= 0.71.0) + - React-RCTVibration (0.71.0): + - RCT-Folly (= 2021.07.22.00) + - React-Codegen (= 0.71.0) + - React-Core/RCTVibrationHeaders (= 0.71.0) + - React-jsi (= 0.71.0) + - ReactCommon/turbomodule/core (= 0.71.0) + - React-runtimeexecutor (0.71.0): + - React-jsi (= 0.71.0) + - ReactCommon/turbomodule/bridging (0.71.0): + - DoubleConversion + - glog + - RCT-Folly (= 2021.07.22.00) + - React-callinvoker (= 0.71.0) + - React-Core (= 0.71.0) + - React-cxxreact (= 0.71.0) + - React-jsi (= 0.71.0) + - React-logger (= 0.71.0) + - React-perflogger (= 0.71.0) + - ReactCommon/turbomodule/core (0.71.0): - DoubleConversion - glog - - RCT-Folly (= 2021.06.28.00-v2) - - React-callinvoker (= 0.68.2) - - React-Core (= 0.68.2) - - React-cxxreact (= 0.68.2) - - React-jsi (= 0.68.2) - - React-logger (= 0.68.2) - - React-perflogger (= 0.68.2) + - RCT-Folly (= 2021.07.22.00) + - React-callinvoker (= 0.71.0) + - React-Core (= 0.71.0) + - React-cxxreact (= 0.71.0) + - React-jsi (= 0.71.0) + - React-logger (= 0.71.0) + - React-perflogger (= 0.71.0) - rn-fetch-blob (0.12.0): - React-Core - RNCAsyncStorage (1.17.11): @@ -364,6 +396,8 @@ DEPENDENCIES: - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`) - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`) - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) + - hermes-engine (from `../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`) + - libevent (~> 2.1.12) - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`) @@ -371,10 +405,10 @@ DEPENDENCIES: - React-callinvoker (from `../node_modules/react-native/ReactCommon/callinvoker`) - React-Codegen (from `build/generated/ios`) - React-Core (from `../node_modules/react-native/`) - - React-Core/DevSupport (from `../node_modules/react-native/`) - React-Core/RCTWebSocket (from `../node_modules/react-native/`) - React-CoreModules (from `../node_modules/react-native/React/CoreModules`) - React-cxxreact (from `../node_modules/react-native/ReactCommon/cxxreact`) + - React-hermes (from `../node_modules/react-native/ReactCommon/hermes`) - React-jsi (from `../node_modules/react-native/ReactCommon/jsi`) - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`) - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`) @@ -388,6 +422,7 @@ DEPENDENCIES: - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`) - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`) - React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`) + - React-RCTAppDelegate (from `../node_modules/react-native/Libraries/AppDelegate`) - React-RCTBlob (from `../node_modules/react-native/Libraries/Blob`) - React-RCTImage (from `../node_modules/react-native/Libraries/Image`) - React-RCTLinking (from `../node_modules/react-native/Libraries/LinkingIOS`) @@ -412,6 +447,7 @@ DEPENDENCIES: SPEC REPOS: trunk: - fmt + - libevent - TOCropViewController EXTERNAL SOURCES: @@ -427,6 +463,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/React/FBReactNativeSpec" glog: :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec" + hermes-engine: + :podspec: "../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec" RCT-Folly: :podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec" RCTRequired: @@ -445,6 +483,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/React/CoreModules" React-cxxreact: :path: "../node_modules/react-native/ReactCommon/cxxreact" + React-hermes: + :path: "../node_modules/react-native/ReactCommon/hermes" React-jsi: :path: "../node_modules/react-native/ReactCommon/jsi" React-jsiexecutor: @@ -471,6 +511,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/Libraries/ActionSheetIOS" React-RCTAnimation: :path: "../node_modules/react-native/Libraries/NativeAnimation" + React-RCTAppDelegate: + :path: "../node_modules/react-native/Libraries/AppDelegate" React-RCTBlob: :path: "../node_modules/react-native/Libraries/Blob" React-RCTImage: @@ -516,41 +558,45 @@ SPEC CHECKSUMS: boost: a7c83b31436843459a1961bfd74b96033dc77234 BVLinearGradient: 34a999fda29036898a09c6a6b728b0b4189e1a44 DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662 - FBLazyVector: a7a655862f6b09625d11c772296b01cd5164b648 - FBReactNativeSpec: 81ce99032d5b586fddd6a38d450f8595f7e04be4 + FBLazyVector: 61839cba7a48c570b7ac3e1cd8a4d0948382202f + FBReactNativeSpec: 5a14398ccf5e27c1ca2d7109eb920594ce93c10d fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 glog: 476ee3e89abb49e07f822b48323c51c57124b572 - RCT-Folly: 4d8508a426467c48885f1151029bc15fa5d7b3b8 - RCTRequired: 3e917ea5377751094f38145fdece525aa90545a0 - RCTTypeSafety: c43c072a4bd60feb49a9570b0517892b4305c45e - React: 176dd882de001854ced260fad41bb68a31aa4bd0 - React-callinvoker: c2864d1818d6e64928d2faf774a3800dfc38fe1f - React-Codegen: 98b6f97f0a7abf7d67e4ce435c77c05b7a95cf05 - React-Core: fdaa2916b1c893f39f02cff0476d1fb0cab1e352 - React-CoreModules: fd8705b80699ec36c2cdd635c2ce9d874b9cfdfc - React-cxxreact: 1832d971f7b0cb2c7b943dc0ec962762c90c906e - React-jsi: 72af715135abe8c3f0dcf3b2548b71d048b69a7e - React-jsiexecutor: b7b553412f2ec768fe6c8f27cd6bafdb9d8719e6 - React-jsinspector: c5989c77cb89ae6a69561095a61cce56a44ae8e8 - React-logger: a0833912d93b36b791b7a521672d8ee89107aff1 + hermes-engine: f6e715aa6c8bd38de6c13bc85e07b0a337edaa89 + libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 + RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1 + RCTRequired: dea3e4163184ea57c50288c15c32c1529265c58f + RCTTypeSafety: a0834ab89159a346731e8aae55ad6e2cce61c327 + React: d877d055ff2137ca0325a4babdef3411e11f3cb7 + React-callinvoker: 77bd2701eee3acac154b11ec219e68d5a1f780ad + React-Codegen: bccc516adc1551ccfe04b0de27e345d38829b204 + React-Core: 4035f59e5bec8f3053583c6108d99c7516deb760 + React-CoreModules: b6a1f76423fea57a03e0d7a2f79d3b55cf193f2c + React-cxxreact: fe5f6ec8ae875bebc71309d1e8ef89bb966d61a6 + React-hermes: 3c8ea5e8f402db2a08b57051206d7f2ba9c75565 + React-jsi: dbf0f82c93bfd828fa05c50f2ee74dc81f711050 + React-jsiexecutor: 060dd495f1e2af3d87216f7ca8a94c55ec885b4f + React-jsinspector: 5061fcbec93fd672183dfb39cc2f65e55a0835db + React-logger: a6c0b3a807a8e81f6d7fea2e72660766f55daa50 react-native-cameraroll: 0ff04cc4e0ff5f19a94ff4313e5c8bc4503cd86d react-native-image-resizer: 794abf75ec13ed1f0dbb1f134e27504ea65e9e66 react-native-pager-view: 54bed894cecebe28cede54c01038d9d1e122de43 react-native-safe-area-context: 99b24a0c5acd0d5dcac2b1a7f18c49ea317be99a react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457 react-native-version-number: b415bbec6a13f2df62bf978e85bc0d699462f37f - React-perflogger: a18b4f0bd933b8b24ecf9f3c54f9bf65180f3fe6 - React-RCTActionSheet: 547fe42fdb4b6089598d79f8e1d855d7c23e2162 - React-RCTAnimation: bc9440a1c37b06ae9ebbb532d244f607805c6034 - React-RCTBlob: a1295c8e183756d7ef30ba6e8f8144dfe8a19215 - React-RCTImage: a30d1ee09b1334067fbb6f30789aae2d7ac150c9 - React-RCTLinking: ffc6d5b88d1cb9aca13c54c2ec6507fbf07f2ac4 - React-RCTNetwork: f807a2facab6cf5cf36d592e634611de9cf12d81 - React-RCTSettings: 861806819226ed8332e6a8f90df2951a34bb3e7f - React-RCTText: f3fb464cc41a50fc7a1aba4deeb76a9ad8282cb9 - React-RCTVibration: 79040b92bfa9c3c2d2cb4f57e981164ec7ab9374 - React-runtimeexecutor: b960b687d2dfef0d3761fbb187e01812ebab8b23 - ReactCommon: 095366164a276d91ea704ce53cb03825c487a3f2 + React-perflogger: e5fc4149e9bbb972b8520277f3b23141faa47a36 + React-RCTActionSheet: 991de88216bf03ab9bb1d213d73c62ecbe64ade7 + React-RCTAnimation: b74e3d1bf5280891a573e447b487fa1db0713b5b + React-RCTAppDelegate: f52667f2dbc510f87b7988c5204e8764d50bf0c1 + React-RCTBlob: 6762787c01d5d8d18efed03764b0d58d3b79595a + React-RCTImage: 9ed7eba8dd192a49def2cad2ecaedee7e7e315b4 + React-RCTLinking: 0b58eed9af0645a161b80bf412b6b721e4585c66 + React-RCTNetwork: dc075b0eea00d8a98c928f011d9bc2458acc7092 + React-RCTSettings: 30fb3f498cfaf8a4bb47334ff9ffbe318ef78766 + React-RCTText: a631564e84a227fe24bae7c04446f36faea7fcf5 + React-RCTVibration: 55c91eccdbd435d7634efbe847086944389475b0 + React-runtimeexecutor: ac80782d9d76ba2b0f709f4de0c427fe33c352dc + ReactCommon: 20e38a9be5fe1341b5e422220877cc94034776ba rn-fetch-blob: f065bb7ab7fb48dd002629f8bdcb0336602d3cba RNCAsyncStorage: 8616bd5a58af409453ea4e1b246521bb76578d60 RNCClipboard: 2834e1c4af68697089cdd455ee4a4cdd198fa7dd @@ -558,12 +604,12 @@ SPEC CHECKSUMS: RNImageCropPicker: 648356d68fbf9911a1016b3e3723885d28373eda RNInAppBrowser: e36d6935517101ccba0e875bac8ad7b0cb655364 RNReactNativeHapticFeedback: 1e3efeca9628ff9876ee7cdd9edec1b336913f8c - RNReanimated: b21b362b4b8ca921932e8b1718e88cf3a36f157e + RNReanimated: d8d9d3d3801bda5e35e85cdffc871577d044dc2e RNScreens: 34cc502acf1b916c582c60003dc3089fa01dc66d RNSVG: 6adc5c52d2488a476248413064b7f2832e639057 TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863 - Yoga: 99652481fcd320aefa4a7ef90095b95acd181952 + Yoga: c618b544ff8bd8865cdca602f00cbcdb92fd6d31 -PODFILE CHECKSUM: cf94853ebcb0d8e0d027dca9ab7a4ede886a8f20 +PODFILE CHECKSUM: 0975a639c66f07f4d49706dd0bf7c3aa4dc833cf COCOAPODS: 1.11.3 diff --git a/ios/app.xcodeproj/project.pbxproj b/ios/app.xcodeproj/project.pbxproj index 0a4df190a..20e1657a7 100644 --- a/ios/app.xcodeproj/project.pbxproj +++ b/ios/app.xcodeproj/project.pbxproj @@ -163,6 +163,7 @@ 00E356EB1AD99517003FC87E /* Frameworks */, 00E356EC1AD99517003FC87E /* Resources */, DFA0C2B14E2F369C4B2337CE /* [CP] Copy Pods Resources */, + B73FFC16945F7B215A06B698 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -185,6 +186,7 @@ 13B07F8E1A680F5B00A75B9A /* Resources */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, 45E56D79C207C80AF89FBAA2 /* [CP] Copy Pods Resources */, + B0229D18A3C8908C642F9131 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -258,13 +260,15 @@ files = ( ); inputPaths = ( + "$(SRCROOT)/.xcode.env.local", + "$(SRCROOT)/.xcode.env", ); name = "Bundle React Native code and images"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "set -e\n\nexport NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh\n"; + shellScript = "set -e\n\nWITH_ENVIRONMENT=\"../node_modules/react-native/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"../node_modules/react-native/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n"; }; 45E56D79C207C80AF89FBAA2 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; @@ -305,6 +309,40 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; + B0229D18A3C8908C642F9131 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-app/Pods-app-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-app/Pods-app-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-app/Pods-app-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + B73FFC16945F7B215A06B698 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-app-appTests/Pods-app-appTests-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-app-appTests/Pods-app-appTests-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-app-appTests/Pods-app-appTests-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; DDF15D430A078CE70E577FDA /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -459,7 +497,7 @@ ENABLE_BITCODE = NO; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; INFOPLIST_FILE = app/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -488,11 +526,12 @@ DEVELOPMENT_TEAM = B3LX46C5HS; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; INFOPLIST_FILE = app/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); + MARKETING_VERSION = 1.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -538,7 +577,7 @@ COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -554,7 +593,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.4; LD_RUNPATH_SEARCH_PATHS = ( /usr/lib/swift, "$(inherited)", @@ -572,6 +611,7 @@ "-DFOLLY_MOBILE=1", "-DFOLLY_USE_LIBCPP=1", ); + REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; }; name = Debug; @@ -609,7 +649,7 @@ COPY_PHASE_STRIP = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -618,7 +658,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.4; LD_RUNPATH_SEARCH_PATHS = ( /usr/lib/swift, "$(inherited)", @@ -635,6 +675,7 @@ "-DFOLLY_MOBILE=1", "-DFOLLY_USE_LIBCPP=1", ); + REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; }; diff --git a/ios/app/AppDelegate.h b/ios/app/AppDelegate.h index ef1de86a2..5d2808256 100644 --- a/ios/app/AppDelegate.h +++ b/ios/app/AppDelegate.h @@ -1,8 +1,6 @@ -#import <React/RCTBridgeDelegate.h> +#import <RCTAppDelegate.h> #import <UIKit/UIKit.h> -@interface AppDelegate : UIResponder <UIApplicationDelegate, RCTBridgeDelegate> - -@property (nonatomic, strong) UIWindow *window; +@interface AppDelegate : RCTAppDelegate @end diff --git a/ios/app/AppDelegate.mm b/ios/app/AppDelegate.mm index c73bc099d..7c0e1d8de 100644 --- a/ios/app/AppDelegate.mm +++ b/ios/app/AppDelegate.mm @@ -1,10 +1,6 @@ #import "AppDelegate.h" -#import <React/RCTBridge.h> #import <React/RCTBundleURLProvider.h> -#import <React/RCTRootView.h> - -#import <React/RCTAppSetupUtils.h> // universal links #import <React/RCTLinkingManager.h> @@ -12,59 +8,15 @@ // splash screen #import "RNSplashScreen.h" -#if RCT_NEW_ARCH_ENABLED -#import <React/CoreModulesPlugins.h> -#import <React/RCTCxxBridgeDelegate.h> -#import <React/RCTFabricSurfaceHostingProxyRootView.h> -#import <React/RCTSurfacePresenter.h> -#import <React/RCTSurfacePresenterBridgeAdapter.h> -#import <ReactCommon/RCTTurboModuleManager.h> - -#import <react/config/ReactNativeConfig.h> - -@interface AppDelegate () <RCTCxxBridgeDelegate, RCTTurboModuleManagerDelegate> { - RCTTurboModuleManager *_turboModuleManager; - RCTSurfacePresenterBridgeAdapter *_bridgeAdapter; - std::shared_ptr<const facebook::react::ReactNativeConfig> _reactNativeConfig; - facebook::react::ContextContainer::Shared _contextContainer; -} -@end -#endif - @implementation AppDelegate - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - RCTAppSetupPrepareApp(application); - - RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions]; - -#if RCT_NEW_ARCH_ENABLED - _contextContainer = std::make_shared<facebook::react::ContextContainer const>(); - _reactNativeConfig = std::make_shared<facebook::react::EmptyReactNativeConfig const>(); - _contextContainer->insert("ReactNativeConfig", _reactNativeConfig); - _bridgeAdapter = [[RCTSurfacePresenterBridgeAdapter alloc] initWithBridge:bridge contextContainer:_contextContainer]; - bridge.surfacePresenter = _bridgeAdapter.surfacePresenter; -#endif - - UIView *rootView = RCTAppSetupDefaultRootView(bridge, @"xyz.blueskyweb.app", nil); - - if (@available(iOS 13.0, *)) { - rootView.backgroundColor = [UIColor systemBackgroundColor]; - } else { - rootView.backgroundColor = [UIColor whiteColor]; - } - - self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds]; - UIViewController *rootViewController = [UIViewController new]; - rootViewController.view = rootView; - self.window.rootViewController = rootViewController; - [self.window makeKeyAndVisible]; - // Show the splash screen - [RNSplashScreen show]; + // [RNSplashScreen show]; - return YES; + self.moduleName = @"xyz.blueskyweb.app"; + return [super application:application didFinishLaunchingWithOptions:launchOptions]; } - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge @@ -76,45 +28,16 @@ #endif } -#if RCT_NEW_ARCH_ENABLED - -#pragma mark - RCTCxxBridgeDelegate - -- (std::unique_ptr<facebook::react::JSExecutorFactory>)jsExecutorFactoryForBridge:(RCTBridge *)bridge +/// This method controls whether the `concurrentRoot`feature of React18 is turned on or off. +/// +/// @see: https://reactjs.org/blog/2022/03/29/react-v18.html +/// @note: This requires to be rendering on Fabric (i.e. on the New Architecture). +/// @return: `true` if the `concurrentRoot` feature is enabled. Otherwise, it returns `false`. +- (BOOL)concurrentRootEnabled { - _turboModuleManager = [[RCTTurboModuleManager alloc] initWithBridge:bridge - delegate:self - jsInvoker:bridge.jsCallInvoker]; - return RCTAppSetupDefaultJsExecutorFactory(bridge, _turboModuleManager); + return true; } -#pragma mark RCTTurboModuleManagerDelegate - -- (Class)getModuleClassFromName:(const char *)name -{ - return RCTCoreModulesClassProvider(name); -} - -- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const std::string &)name - jsInvoker:(std::shared_ptr<facebook::react::CallInvoker>)jsInvoker -{ - return nullptr; -} - -- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const std::string &)name - initParams: - (const facebook::react::ObjCTurboModule::InitParams &)params -{ - return nullptr; -} - -- (id<RCTTurboModule>)getModuleInstanceFromClass:(Class)moduleClass -{ - return RCTAppSetupDefaultModuleFromClass(moduleClass); -} - -#endif - // universal links - (BOOL)application:(UIApplication *)application openURL:(NSURL *)url |