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.

Sign up for GitHub

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

Flavors support follow ups #26157

Merged
merged 6 commits into from
Sep 14, 2023
Merged

Flavors support follow ups #26157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c7b94db
Add more debuggable variants
kowczarz Aug 29, 2023
2b468b4
Rename schemes to make it work with the new architecture
kowczarz Aug 29, 2023
0e891bb
Merge branch 'Expensify:main' into flavors-support-follow-ups
kowczarz Aug 29, 2023
bdadeb7
Update misssing build configuration names
kowczarz Aug 29, 2023
be06765
Update pods
kowczarz Aug 29, 2023
6336177
Merge remote-tracking branch 'expensify/main' into flavors-support-fo…
kowczarz Sep 12, 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
2 changes: 1 addition & 1 deletion android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ react {
// The list of variants to that are debuggable. For those we're going to
// skip the bundling of the JS bundle and the assets. By default is just 'debug'.
// If you add flavors like lite, prod, etc. you'll have to list your debuggableVariants.
debuggableVariants = ["developmentDebug"]
debuggableVariants = ["developmentDebug", "productionDebug"]

/* Bundling */
// A list containing the node command and its flags. Default is just 'node'.
Expand Down
162 changes: 93 additions & 69 deletions ios/NewExpensify.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions ios/NewExpensify.xcodeproj/xcshareddata/xcschemes/New Expensify AdHoc.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug AdHoc"
buildConfiguration = "DebugAdHoc"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
Expand All @@ -75,7 +75,7 @@
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug AdHoc"
buildConfiguration = "DebugAdHoc"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
Expand All @@ -96,7 +96,7 @@
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release AdHoc"
buildConfiguration = "ReleaseAdHoc"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
Expand All @@ -113,10 +113,10 @@
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug AdHoc">
buildConfiguration = "DebugAdHoc">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release AdHoc"
buildConfiguration = "ReleaseAdHoc"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
10 changes: 5 additions & 5 deletions ios/NewExpensify.xcodeproj/xcshareddata/xcschemes/New Expensify Dev.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug Development"
buildConfiguration = "DebugDevelopment"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
Expand All @@ -41,7 +41,7 @@
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug Development"
buildConfiguration = "DebugDevelopment"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
Expand All @@ -62,7 +62,7 @@
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release Development"
buildConfiguration = "ReleaseDevelopment"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
Expand All @@ -79,10 +79,10 @@
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug Development">
buildConfiguration = "DebugDevelopment">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release Development"
buildConfiguration = "ReleaseDevelopment"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
8 changes: 4 additions & 4 deletions ios/NewExpensify.xcodeproj/xcshareddata/xcschemes/New Expensify.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Release Production"
buildConfiguration = "ReleaseProduction"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
Expand All @@ -96,7 +96,7 @@
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release Production"
buildConfiguration = "ReleaseProduction"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
Expand All @@ -113,10 +113,10 @@
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug Production">
buildConfiguration = "DebugProduction">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release Production"
buildConfiguration = "ReleaseProduction"
customArchiveName = "New Expensify"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
Expand Down
14 changes: 7 additions & 7 deletions ios/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ prepare_react_native_project!
# dependencies: {
# ...(process.env.NO_FLIPPER ? { 'react-native-flipper': { platforms: { ios: null } } } : {}),
# ```
flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled(['Debug Production', 'Debug Development', 'Debug AdHoc'])
flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled(['DebugProduction', 'DebugDevelopment', 'DebugAdHoc'])

linkage = ENV['USE_FRAMEWORKS']
if linkage != nil
Expand Down Expand Up @@ -54,12 +54,12 @@ target 'NewExpensify' do
permissions_path = '../node_modules/react-native-permissions/ios'

project 'NewExpensify',
'Debug Development' => :debug,
'Debug AdHoc' => :debug,
'Debug Production' => :debug,
'Release Development' => :release,
'Release AdHoc' => :release,
'Release Production' => :release
'DebugDevelopment' => :debug,
'DebugAdHoc' => :debug,
'DebugProduction' => :debug,
'ReleaseDevelopment' => :release,
'ReleaseAdHoc' => :release,
'ReleaseProduction' => :release

pod 'Permission-LocationAccuracy', :path => "#{permissions_path}/LocationAccuracy"
pod 'Permission-LocationAlways', :path => "#{permissions_path}/LocationAlways"
Expand Down
2 changes: 1 addition & 1 deletion ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1309,6 +1309,6 @@ SPEC CHECKSUMS:
Yoga: 8796b55dba14d7004f980b54bcc9833ee45b28ce
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a

PODFILE CHECKSUM: 845537d35601574adcd0794e17003ba7dbccdbfd
PODFILE CHECKSUM: 2daf34c870819a933f3fefe426801d54b2ff2a14

COCOAPODS: 1.12.1
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
"postinstall": "scripts/postInstall.sh",
"clean": "npx react-native clean-project-auto",
"android": "scripts/set-pusher-suffix.sh && npx react-native run-android --variant=developmentDebug --appId=com.expensify.chat.dev",
"ios": "scripts/set-pusher-suffix.sh && npx react-native run-ios --list-devices --configuration=\"Debug Development\" --scheme=\"New Expensify Dev\"",
"ios": "scripts/set-pusher-suffix.sh && npx react-native run-ios --list-devices --configuration=\"DebugDevelopment\" --scheme=\"New Expensify Dev\"",
"pod-install": "cd ios && bundle exec pod install",
"ipad": "concurrently \"npx react-native run-ios --simulator=\\\"iPad Pro (12.9-inch) (6th generation)\\\" --configuration=\\\"Debug Development\\\" --scheme=\\\"New Expensify Dev\\\"\"",
"ipad-sm": "concurrently \"npx react-native run-ios --simulator=\\\"iPad Pro (11-inch) (4th generation)\\\" --configuration=\\\"Debug Development\\\" --scheme=\\\"New Expensify Dev\\\"\"",
"ipad": "concurrently \"npx react-native run-ios --simulator=\\\"iPad Pro (12.9-inch) (6th generation)\\\" --configuration=\\\"DebugDevelopment\\\" --scheme=\\\"New Expensify Dev\\\"\"",
"ipad-sm": "concurrently \"npx react-native run-ios --simulator=\\\"iPad Pro (11-inch) (4th generation)\\\" --configuration=\\\"DebugDevelopment\\\" --scheme=\\\"New Expensify Dev\\\"\"",
"start": "npx react-native start",
"web": "scripts/set-pusher-suffix.sh && concurrently npm:web-proxy npm:web-server",
"web-proxy": "node web/proxy.js",
Expand Down