spm/firebase-ios-sdk
1
0 Fork 0
mirror of https://github.com/firebase/firebase-ios-sdk synced 2026-11-10 22:45:59 +05:45
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflicts from release-6.0.0 branch (#2958)

Browse Source 
* Update versions for Release 6.0.0

* Update FirebaseSDKs.textproto with new fields. (#2818) (#2834)

* Update FirebaseSDKs.textproto with new fields.

* Update message about strip_32bits flag.

* GULAppDelegateSwizzler - proxy APNS methods separately (#2835) (#2858)

* Cherry-picks for M47 RC5 (#2882)

* fix race condition checkin is deleted before writing during app start (#2860)

* GoogleUtilities min ios version from 6 to 8 (#2876)

* Put secret and oauth credentials into the private headers for now. (#2916) (#2919)

* Add missing Messaging weak_framework dep (#2921) (#2930)
This commit is contained in:
Paul Beusterien authored and GitHub committed 2019-05-07 11:35:58 -07:00
1 parent 25ded962e3
commit 8ed545bd2c
13 files changed
+25 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

FirebaseCore.podspec
+1 -1
View File
@@ -33,7 +33,7 @@ Firebase Core includes FIRApp and FIROptions which provide central configuration
s.pod_target_xcconfig = {
'GCC_C_LANGUAGE_STANDARD' => 'c99',
'GCC_PREPROCESSOR_DEFINITIONS' =>
'FIRCore_VERSION=' + s.version.to_s + ' Firebase_VERSION=5.20.0',
'FIRCore_VERSION=' + s.version.to_s + ' Firebase_VERSION=6.0.0',
'OTHER_CFLAGS' => '-fno-autolink'
}
s.test_spec 'unit' do |unit_tests|