Skip to content

Commit 08e9f7f

Browse files
ncooke3paulb777
authored andcommitted
[Heartbeat Logging] Update FirebaseCore dependents for heartbeat logging changes (#9436)
* Set swift_version to 5.3 for core dependents * Fix Firestore Cmake build * s/Cmake/CMake
1 parent af89df6 commit 08e9f7f

19 files changed

Lines changed: 38 additions & 1 deletion

Firebase.podspec

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ Simplify your app development, grow your user base, and monetize more effectivel
2828

2929
s.cocoapods_version = '>= 1.4.0'
3030

31+
s.swift_version = '5.3'
32+
3133
s.default_subspec = 'Core'
3234

3335
s.subspec 'Core' do |ss|

FirebaseABTesting.podspec

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ Firebase Cloud Messaging and Firebase Remote Config in your app.
3535
s.cocoapods_version = '>= 1.4.0'
3636
s.prefix_header_file = false
3737

38+
s.swift_version = '5.3'
39+
3840
base_dir = "FirebaseABTesting/Sources/"
3941
s.source_files = [
4042
base_dir + '**/*.[mh]',

FirebaseAppCheck.podspec

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ Pod::Spec.new do |s|
2222
tvos_deployment_target = '10.0'
2323
watchos_deployment_target = '6.0'
2424

25+
s.swift_version = '5.3'
26+
2527
s.ios.deployment_target = ios_deployment_target
2628
s.osx.deployment_target = osx_deployment_target
2729
s.tvos.deployment_target = tvos_deployment_target

FirebaseAppDistribution.podspec

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ iOS SDK for App Distribution for Firebase.
1717

1818
s.ios.deployment_target = '10.0'
1919

20+
s.swift_version = '5.3'
21+
2022
s.cocoapods_version = '>= 1.4.0'
2123
s.prefix_header_file = false
2224

FirebaseAuth.podspec

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ supports email and password accounts, as well as several 3rd party authenticatio
2424
tvos_deployment_target = '10.0'
2525
watchos_deployment_target = '6.0'
2626

27+
s.swift_version = '5.3'
28+
2729
s.ios.deployment_target = ios_deployment_target
2830
s.osx.deployment_target = osx_deployment_target
2931
s.tvos.deployment_target = tvos_deployment_target

FirebaseAuthTestingSupport.podspec

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ Pod::Spec.new do |s|
2222
tvos_deployment_target = '10.0'
2323
watchos_deployment_target = '6.0'
2424

25+
s.swift_version = '5.3'
26+
2527
s.ios.deployment_target = ios_deployment_target
2628
s.osx.deployment_target = osx_deployment_target
2729
s.tvos.deployment_target = tvos_deployment_target

FirebaseCore/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ include(GoogleUtilities)
2121

2222
file(GLOB headers Sources/Private/*.h Sources/Public/FirebaseCore/*.h)
2323
file(GLOB sources Sources/*.m)
24+
# Exclude the `FIRHeartbeatLogger.m` since it depends on the Swift Heartbeat logging
25+
# library that is not configured to build for CMake builds.
26+
list(FILTER sources EXCLUDE REGEX "FIRHeartbeatLogger.m")
2427

2528
podspec_version(version ${PROJECT_SOURCE_DIR}/FirebaseCore.podspec)
2629
firebase_version(firebase_version ${PROJECT_SOURCE_DIR}/FirebaseCore.podspec)

FirebaseCrashlytics.podspec

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ Pod::Spec.new do |s|
1616
tvos_deployment_target = '10.0'
1717
watchos_deployment_target = '6.0'
1818

19+
s.swift_version = '5.3'
20+
1921
s.ios.deployment_target = ios_deployment_target
2022
s.osx.deployment_target = osx_deployment_target
2123
s.tvos.deployment_target = tvos_deployment_target

FirebaseDatabase.podspec

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ Simplify your iOS development, grow your user base, and monetize more effectivel
2222
tvos_deployment_target = '10.0'
2323
watchos_deployment_target = '7.0'
2424

25+
s.swift_version = '5.3'
26+
2527
s.ios.deployment_target = ios_deployment_target
2628
s.osx.deployment_target = osx_deployment_target
2729
s.tvos.deployment_target = tvos_deployment_target

FirebaseDynamicLinks.podspec

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ Firebase Dynamic Links are deep links that enhance user experience and increase
1818
s.social_media_url = 'https://twitter.com/Firebase'
1919
s.ios.deployment_target = '10.0'
2020

21+
s.swift_version = '5.3'
22+
2123
s.cocoapods_version = '>= 1.4.0'
2224
s.prefix_header_file = false
2325

0 commit comments

Comments
 (0)