Skip to content

Commit

Permalink
remove xcconfig changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@russellwheatley
russellwheatley committed Oct 11, 2022
1 parent 74360c9 commit 3c0cfdd
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions FirebaseFirestore.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ Pod::Spec.new do |s|
s.authors = 'Invertase Limited'
s.pod_target_xcconfig = { 'OTHER_LDFLAGS' => '-lObjC' }
s.static_framework = true
s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' }
s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' }
# s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
# s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
# s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' }
# s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' }

This comment has been minimized.

Sign in to view

Copy link
@mikehardy

mikehardy Oct 17, 2022

Collaborator

Hey @russellwheatley - looking at frameworks stuff I see your branch here with these changes, were these necessary for you? Should I consider testing them? now that I consider them, they look a little suspicious either way - why are we setting the same variable twice (stated differently: is the second set of each variable not clobbering the first set ?)

This comment has been minimized.

Sign in to view

Copy link
@russellwheatley

russellwheatley Oct 19, 2022

Author Member

Hey @mikehardy, I believe you can remove this from podspec now. I've just tested this:

pod 'FirebaseFirestore', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :branch => "@russell/ios-10"

i.e. with the above removed xcconfig removed, and my Firestore project builds with no problem 😄. They were necessary to help build iOS SDK v9. But I guess not necessary anymore.

This comment has been minimized.

Sign in to view

Copy link
@mikehardy

mikehardy Oct 19, 2022

Collaborator

Great - I posted PR #60 if it looks good to you, hit that merge button 🚀 - hopefully we get it before 10.1.0 goes out the door so it's captured in next tag

This comment has been minimized.

Sign in to view

Copy link
@russellwheatley

russellwheatley Oct 19, 2022

Author Member

done 👍
# These frameworks, minimums, and the c++ library are here from, and copied specifically to match, the upstream podspec:
# https://github.com/firebase/firebase-ios-sdk/blob/34c4bdbce23f5c6e739bda83b71ba592d6400cd5/FirebaseFirestore.podspec#L103
# They may need updating periodically.
Expand Down

0 comments on commit 3c0cfdd

Please sign in to comment.