Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions ios/GoogleService-Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
<string>921154746561-s3uqn2oe4m85tufi6mqflbfbuajrm2i3.apps.googleusercontent.com</string>
<key>REVERSED_CLIENT_ID</key>
<string>com.googleusercontent.apps.921154746561-s3uqn2oe4m85tufi6mqflbfbuajrm2i3</string>
<key>ANDROID_CLIENT_ID</key>
<string>921154746561-cbegir0tnc2gan6k1gre5vtn75p60hom.apps.googleusercontent.com</string>
<key>API_KEY</key>
<string>AIzaSyA9Qn7q5Iw26gTzjI7012C4PaFrFagpC_I</string>
<key>GCM_SENDER_ID</key>
Expand Down
155 changes: 135 additions & 20 deletions ios/NewExpensify.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,12 @@
ReferencedContainer = "container:NewExpensify.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<CommandLineArguments>
<CommandLineArgument
argument = "-FIRDebugEnabled"
isEnabled = "YES">
</CommandLineArgument>
</CommandLineArguments>
</LaunchAction>
<ProfileAction
buildConfiguration = "ReleaseDevelopment"
Expand Down
18 changes: 13 additions & 5 deletions ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,14 @@ setup_permissions([
'LocationWhenInUse'
])

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
# 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
ENV['USE_FRAMEWORKS'] == '1'
use_frameworks! :linkage => :static
$RNFirebaseAsStaticFramework = true

# Force pods to match minimum iOS version for React Native
# Fixes build issue on Xcode Cloud where some pods
Expand Down Expand Up @@ -113,6 +116,11 @@ target 'NewExpensify' do
config.build_settings['CODE_SIGNING_ALLOWED'] = 'NO'
end
end

# Define USE_FRAMEWORKS macro for all pods projects to enable our patches that fix some build issues
target.build_configurations.each do |config|
config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= ['$(inherited)', 'USE_FRAMEWORKS=1']
end
end
end
end
Expand Down
Loading