Skip to content

Commit

Permalink
fix: arm64 macCatalyst works, with these applied
Browse files Browse the repository at this point in the history
  • Loading branch information
mikehardy committed May 12, 2022
1 parent 2de7c73 commit 360825b
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 3 deletions.
6 changes: 3 additions & 3 deletions make-demo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ if ! which yarn > /dev/null 2>&1; then
exit 1
fi

npm_config_yes=true npx react-native init rnfbdemo --skip-install --version=0.68.1
npm_config_yes=true npx react-native init rnfbdemo --skip-install --version=0.68.2
cd rnfbdemo

# New versions of react-native include annoying Ruby stuff that forces use of old rubies. Obliterate.
Expand Down Expand Up @@ -225,8 +225,8 @@ if [ "$(uname)" == "Darwin" ]; then
echo "Installing pods and running iOS app in release mode"
npx react-native run-ios --configuration "Release"

# Check catalyst build (but not on arm64 because it does not work there yet)
if ! [ "$XCODE_DEVELOPMENT_TEAM" == "" ] && ! [ "${arch_name}" = "arm64" ]; then
# Check catalyst build
if ! [ "$XCODE_DEVELOPMENT_TEAM" == "" ]; then

echo "Adding macCatalyst entitlements file / build flags to Xcode project"
cp ../rnfbdemo.entitlements ios/rnfbdemo/
Expand Down
24 changes: 24 additions & 0 deletions patches/react-native+0.68.2.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
diff --git a/node_modules/react-native/scripts/.packager.env b/node_modules/react-native/scripts/.packager.env
new file mode 100644
index 0000000..361f5fb
--- /dev/null
+++ b/node_modules/react-native/scripts/.packager.env
@@ -0,0 +1 @@
+export RCT_METRO_PORT=8081
diff --git a/node_modules/react-native/scripts/react_native_pods.rb b/node_modules/react-native/scripts/react_native_pods.rb
index f2ceeda..fa3c311 100644
--- a/node_modules/react-native/scripts/react_native_pods.rb
+++ b/node_modules/react-native/scripts/react_native_pods.rb
@@ -131,10 +131,10 @@ end
def use_flipper!(versions = {}, configurations: ['Debug'])
versions['Flipper'] ||= '0.125.0'
versions['Flipper-Boost-iOSX'] ||= '1.76.0.1.11'
- versions['Flipper-DoubleConversion'] ||= '3.2.0'
+ versions['Flipper-DoubleConversion'] ||= '3.2.0.1'
versions['Flipper-Fmt'] ||= '7.1.7'
versions['Flipper-Folly'] ||= '2.6.10'
- versions['Flipper-Glog'] ||= '0.5.0.4'
+ versions['Flipper-Glog'] ||= '0.5.0.5'
versions['Flipper-PeerTalk'] ||= '0.0.4'
versions['Flipper-RSocket'] ||= '1.4.3'
versions['OpenSSL-Universal'] ||= '1.1.1100'

0 comments on commit 360825b

Please sign in to comment.