Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: React Native 0.71.14 with Xcode 15 stable #7114

Merged
merged 59 commits into from
Oct 30, 2023
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
0d199d7
Bump Branch IPHONEOS_DEPLOYMENT_TARGETs from 8 to 12
leotm Sep 4, 2023
acb6d40
Bump MixPanel IPHONEOS_DEPLOYMENT_TARGETs from 8 to 12
leotm Sep 4, 2023
07ed7d4
Upgrade RN from 0.71.6 to 0.71.13 (npm)
leotm Sep 4, 2023
dbd5f04
Disable Flipper in Podfile and update lockfile (RN 0.71.13)
leotm Sep 4, 2023
1e432e0
Add NO_FLIPPER=1 to pod:install script
leotm Sep 4, 2023
14d18a6
Account for NO_FLIPPER (react-native-flipper) in react-native.config.js
leotm Sep 4, 2023
a7ec533
Update Sentry (npm)
leotm Sep 4, 2023
0cbd66f
Revert "Update Sentry (npm)"
leotm Sep 29, 2023
644feae
Merge branch 'main' into react-native-0.71.13-xcode-15-beta-8
leotm Sep 29, 2023
6e0da25
Bump RN patch from 0.71.6 to 0.71.13
leotm Sep 29, 2023
120eae9
Revert "Bump MixPanel IPHONEOS_DEPLOYMENT_TARGETs from 8 to 12"
leotm Oct 2, 2023
7acab31
Revert "Bump Branch IPHONEOS_DEPLOYMENT_TARGETs from 8 to 12"
leotm Oct 2, 2023
b054c2c
pod repo update && pod install
leotm Oct 2, 2023
a09d517
Fix Xcode 15 error: Unable to load ...frameworks-Debug-input-files.xc…
leotm Oct 2, 2023
1c9fc2b
Bump Branch IPHONEOS_DEPLOYMENT_TARGETs from 8 to 12
leotm Oct 2, 2023
71a8b0e
Bump MixPanel IPHONEOS_DEPLOYMENT_TARGETs from 8 to 12
leotm Oct 2, 2023
8daa624
Bump BitRise stack from osx-xcode-14.2.x-ventura to osx-xcode-15.0.x
leotm Oct 2, 2023
66d3ce6
Revert "Bump MixPanel IPHONEOS_DEPLOYMENT_TARGETs from 8 to 12"
leotm Oct 6, 2023
de90dbd
Revert "Bump Branch IPHONEOS_DEPLOYMENT_TARGETs from 8 to 12"
leotm Oct 6, 2023
ffaa984
Fix Podfile react_native_post_install whitespace indentation
leotm Oct 6, 2023
2ca8f1d
Disable Podfile custom react_native_post_install
leotm Oct 6, 2023
cf1c1e3
Fix FlipperKit files not found
leotm Oct 6, 2023
d0235cd
Fix FlipperKit use of undeclared identifiers
leotm Oct 6, 2023
a2c80a3
Update mixpanel-iphone git submodule commit hash
leotm Oct 11, 2023
26a6c52
update .gitmodule file with mixpanel-iphone fork. remove duplicate su…
jpcloureiro Oct 11, 2023
527dfd1
Update mixpanel-iphone git submodule commit hash
leotm Oct 11, 2023
b4b9908
update .gitmodule file with branch-ios-sdk fork. remove duplicate sub…
leotm Oct 11, 2023
5b399e8
Update podfile.lock
leotm Oct 13, 2023
f91973b
Remove duplicate Podfile flipper_config comment
leotm Oct 13, 2023
f773d23
Remove stale Podfile flipper_post_install comment
leotm Oct 13, 2023
d1213f1
Refactor Podfile react_native_post_install
leotm Oct 13, 2023
823c262
Reenable Podfile flipper_config
leotm Oct 14, 2023
77f5f9b
Move Podfile flipper_config comment to correct location
leotm Oct 14, 2023
aaba386
Remove FB_SONARKIT_ENABLED flag from xcodeproj release build settings
leotm Oct 14, 2023
83be066
Refactor xcodeproj FB_SONARKIT_ENABLED flag to macro
leotm Oct 14, 2023
a2d850f
Remove FB_SONARKIT_ENABLED flag from xcodeproj debug build settings
leotm Oct 14, 2023
8a41868
Reenable AppDelegate.m Flipper imports
leotm Oct 14, 2023
f6dec93
Remove NO_FLIPPER=1 from package.json setup script
leotm Oct 14, 2023
1c24f56
Add back Flipper to Podfile and xcodeproj
leotm Oct 14, 2023
544cd1c
Revert "Fix Xcode 15 error: Unable to load ...frameworks-Debug-input-…
leotm Oct 15, 2023
4bb7c33
Add Podfile react_native_post_install comment
leotm Oct 16, 2023
40934e6
Upgrade React Native from 0.71.13 to 0.71.14
leotm Oct 17, 2023
67e6be0
Bump Detox from 20.11.0 to 20.11.4
leotm Oct 17, 2023
aff0b90
Merge branch 'main' into react-native-0.71.13-xcode-15-beta-8
leotm Oct 17, 2023
8055db8
Remove unneeded extra spaces in build scripts
leotm Oct 18, 2023
f079514
Bump Detox iOS sim from iPhone 12 Pro to iPhone 13 Pro for Xcode 15
leotm Oct 18, 2023
ad16fd9
Merge branch 'main' into react-native-0.71.13-xcode-15-beta-8
leotm Oct 18, 2023
5006b1a
Update build scripts from iPhone 12 Pro to iPhone 13 Pro
leotm Oct 19, 2023
c066fc0
Update release build scripts from iPhone 12 Pro to iPhone 13 Pro
leotm Oct 19, 2023
b5a3f54
Update ReadMe iPhone 12 Pro refs to iPhone 13 Pro
leotm Oct 19, 2023
ed91ac6
Update ReadMe Xcode 14.2 to Xcode 15.0
leotm Oct 19, 2023
fbde137
Update ReadMe Xcode 15.0 to Xcode 15.0.1
leotm Oct 19, 2023
8fbec65
Bump metro devDep from 0.72.3 to 0.73.10
leotm Oct 25, 2023
44da518
Remove stale Device util static method isIphone12
leotm Oct 25, 2023
8e5c7d5
Bump Browserstack iPhone 12 Pro devices to iPhone 13 Pro
leotm Oct 25, 2023
8b38ade
Merge branch 'main' into react-native-0.71.13-xcode-15-beta-8
leotm Oct 25, 2023
c6bbee3
Fix lint error remove unused var
leotm Oct 25, 2023
7e08166
Merge branch 'main' into react-native-0.71.13-xcode-15-beta-8
legobeat Oct 25, 2023
59de56a
Merge branch 'main' into react-native-0.71.13-xcode-15-beta-8
leotm Oct 29, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 0 additions & 36 deletions ios/MetaMask.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,6 @@
13B07F8E1A680F5B00A75B9A /* Resources */,
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
15ACCA0022655C3A0063978B /* Embed Frameworks */,
3263892F1BBB809723CB4024 /* [CP] Embed Pods Frameworks */,
802588CED3FC487A5D5263F0 /* [CP] Copy Pods Resources */,
);
buildRules = (
Expand All @@ -582,7 +581,6 @@
B339FF0F289ABD70001B89FB /* Resources */,
B339FF2F289ABD70001B89FB /* Bundle React Native code and images */,
B339FF30289ABD70001B89FB /* Embed Frameworks */,
C9BADD20B98A4D13195A3200 /* [CP] Embed Pods Frameworks */,
8EF10BB14629809332947E5D /* [CP] Copy Pods Resources */,
);
buildRules = (
Expand Down Expand Up @@ -815,23 +813,6 @@
shellPath = /bin/sh;
shellScript = "if [ -e ../.ios.env ]\nthen\n cp -rf ../.ios.env debug.xcconfig\n cp -rf ../.ios.env release.xcconfig\nelse\n cp -rf ../.ios.env.example debug.xcconfig\n cp -rf ../.ios.env.example release.xcconfig\nfi\n\n";
};
3263892F1BBB809723CB4024 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-MetaMask/Pods-MetaMask-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-MetaMask/Pods-MetaMask-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MetaMask/Pods-MetaMask-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
leotm marked this conversation as resolved.
Show resolved Hide resolved
54113A1E76112B187F92C803 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -945,23 +926,6 @@
shellPath = /bin/sh;
shellScript = "if [[ -s \"$HOME/.nvm/nvm.sh\" ]]; then\n. \"$HOME/.nvm/nvm.sh\"\nelif [[ -x \"$(command -v brew)\" && -s \"$(brew --prefix nvm)/nvm.sh\" ]]; then\n. \"$(brew --prefix nvm)/nvm.sh\"\nfi\n\nexport NODE_BINARY=$(which node)\n\nif [[ -s \"$HOME/.nvm/nvm.sh\" ]]; then\n. \"$HOME/.nvm/nvm.sh\"\nelif [[ -x \"$(command -v brew)\" && -s \"$(brew --prefix nvm)/nvm.sh\" ]]; then\n. \"$(brew --prefix nvm)/nvm.sh\"\nfi\n\nif [ ! -e \"${SENTRY_PROPERTIES}\" ]; then\n export SENTRY_PROPERTIES=../sentry.properties\nfi\n\n\nif [ \"$PLATFORM_NAME\" == \"iphonesimulator\" ] && [ \"$CONFIGURATION\" == \"Release\" ]; then\n ../node_modules/react-native/scripts/react-native-xcode.sh\nelse\n ../node_modules/@sentry/cli/bin/sentry-cli react-native xcode \\\n ../node_modules/react-native/scripts/react-native-xcode.sh\nfi\n";
};
C9BADD20B98A4D13195A3200 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-MetaMask-QA/Pods-MetaMask-QA-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-MetaMask-QA/Pods-MetaMask-QA-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MetaMask-QA/Pods-MetaMask-QA-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
leotm marked this conversation as resolved.
Show resolved Hide resolved
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
Expand Down
13 changes: 6 additions & 7 deletions ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def common_target_logic
# Flags change depending on the env values.
flags = get_default_flags()

flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled
# flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled

use_react_native!(
:path => config[:reactNativePath],
Expand All @@ -74,7 +74,7 @@ def common_target_logic
#:flipper_configuration => flipper_config,
# An absolute path to your application root.
:app_path => "#{Pod::Config.instance.installation_root}/..",
:flipper_configuration => flipper_config,
# :flipper_configuration => flipper_config,
)

# Pods for MetaMask
Expand All @@ -91,8 +91,7 @@ target 'MetaMask-QA' do
end

post_install do |installer|
flipper_post_install(installer)
react_native_post_install(installer)
__apply_Xcode_12_5_M1_post_install_workaround(installer)
end

# flipper_post_install(installer)
react_native_post_install(installer)
__apply_Xcode_12_5_M1_post_install_workaround(installer)
end
Loading
Loading