Skip to content

Commit 3f95171

Browse files
committed
test(e2e, ios): deterministically exclude leveldb
Auto-detection of whether to include or exclude leveldb is flaky for me Use the deterministic exclude-leveldb subspec: invertase/firestore-ios-sdk-frameworks#32
1 parent f6a9825 commit 3f95171

File tree

2 files changed

+49
-44
lines changed

2 files changed

+49
-44
lines changed

tests/ios/Podfile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ Pod::UI.puts "react-native-firebase/tests: Using Firebase SDK version '#{$Fireba
1111
# See: https://firebase.google.com/support/release-notes/ios#analytics - requires firebase-ios-sdk 7.11.0+
1212
#$RNFirebaseAnalyticsWithoutAdIdSupport = true # toggle this to true for the no-ad-tracking Analytics subspec
1313

14-
# This is needed to reduce flakiness where leveldb is transitively included by database, and packed as framework
15-
# from the pre-compiled firestore-ios-sdk-frameworks
16-
$FirebaseFirestoreExcludeLeveldb = true
17-
1814
# Versions used below, for quick reference / outdated+upgrade checks
1915
$iOSMinimumDeployVersion = '10.0'
2016

@@ -35,8 +31,11 @@ target 'testing' do
3531
:hermes_enabled => false
3632
)
3733

38-
# Use pre-compiled firestore frameworks to optimize compile time. But make sure there are not leveldb conflicts.
39-
pod 'FirebaseFirestore', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :tag => $FirebaseSDKVersion
34+
# Use pre-compiled firestore frameworks to optimize compile time. Auto-includes leveldb if needed.
35+
# pod 'FirebaseFirestore', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :tag => $FirebaseSDKVersion
36+
37+
# If leveldb auto-inclusion fails and build fails with leveldb symbol conflicts, use this subspec:
38+
pod 'FirebaseFirestore/WithoutLeveldb', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :commit => 'af5c7177c896d69d73acb173c265d7efe8886126'
4039

4140
# Enables Flipper.
4241
#

tests/ios/Podfile.lock

Lines changed: 44 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,13 @@ PODS:
109109
- leveldb-library (~> 1.22)
110110
- FirebaseDynamicLinks (7.11.0):
111111
- FirebaseCore (~> 7.0)
112-
- FirebaseFirestore (7.11.0)
112+
- FirebaseFirestore (7.11.0):
113+
- FirebaseFirestore/AutodetectLeveldb (= 7.11.0)
114+
- FirebaseFirestore/AutodetectLeveldb (7.11.0):
115+
- FirebaseFirestore/Base
116+
- FirebaseFirestore/Base (7.11.0)
117+
- FirebaseFirestore/WithoutLeveldb (7.11.0):
118+
- FirebaseFirestore/Base
113119
- FirebaseFunctions (7.11.0):
114120
- FirebaseCore (~> 7.0)
115121
- GTMSessionFetcher/Core (~> 1.4)
@@ -505,69 +511,69 @@ PODS:
505511
- React-cxxreact (= 0.64.0)
506512
- React-jsi (= 0.64.0)
507513
- React-perflogger (= 0.64.0)
508-
- RNFBAdMob (11.3.3):
514+
- RNFBAdMob (11.4.1):
509515
- Firebase/AdMob (= 7.11.0)
510516
- PersonalizedAdConsent (~> 1.0.5)
511517
- React-Core
512518
- RNFBApp
513-
- RNFBAnalytics (11.3.3):
519+
- RNFBAnalytics (11.4.1):
514520
- Firebase/Analytics (= 7.11.0)
515521
- React-Core
516522
- RNFBApp
517-
- RNFBApp (11.3.3):
523+
- RNFBApp (11.4.1):
518524
- Firebase/CoreOnly (= 7.11.0)
519525
- React-Core
520-
- RNFBAuth (11.3.3):
526+
- RNFBAuth (11.4.1):
521527
- Firebase/Auth (= 7.11.0)
522528
- React-Core
523529
- RNFBApp
524-
- RNFBCrashlytics (11.3.3):
530+
- RNFBCrashlytics (11.4.1):
525531
- Firebase/Crashlytics (= 7.11.0)
526532
- React-Core
527533
- RNFBApp
528-
- RNFBDatabase (11.3.3):
534+
- RNFBDatabase (11.4.1):
529535
- Firebase/Database (= 7.11.0)
530536
- React-Core
531537
- RNFBApp
532-
- RNFBDynamicLinks (11.3.3):
538+
- RNFBDynamicLinks (11.4.1):
533539
- Firebase/DynamicLinks (= 7.11.0)
534540
- GoogleUtilities/AppDelegateSwizzler
535541
- React-Core
536542
- RNFBApp
537-
- RNFBFirestore (11.3.3):
543+
- RNFBFirestore (11.4.1):
538544
- Firebase/Firestore (= 7.11.0)
539545
- React-Core
540546
- RNFBApp
541-
- RNFBFunctions (11.3.3):
547+
- RNFBFunctions (11.4.1):
542548
- Firebase/Functions (= 7.11.0)
543549
- React-Core
544550
- RNFBApp
545-
- RNFBIid (11.3.3):
551+
- RNFBIid (11.4.1):
546552
- Firebase/CoreOnly (= 7.11.0)
547553
- FirebaseInstanceID
548554
- React-Core
549555
- RNFBApp
550-
- RNFBInAppMessaging (11.3.3):
556+
- RNFBInAppMessaging (11.4.1):
551557
- Firebase/InAppMessaging (= 7.11.0)
552558
- React-Core
553559
- RNFBApp
554-
- RNFBMessaging (11.3.3):
560+
- RNFBMessaging (11.4.1):
555561
- Firebase/Messaging (= 7.11.0)
556562
- React-Core
557563
- RNFBApp
558-
- RNFBML (11.3.3):
564+
- RNFBML (11.4.1):
559565
- Firebase/MLVision (= 7.11.0)
560566
- React-Core
561567
- RNFBApp
562-
- RNFBPerf (11.3.3):
568+
- RNFBPerf (11.4.1):
563569
- Firebase/Performance (= 7.11.0)
564570
- React-Core
565571
- RNFBApp
566-
- RNFBRemoteConfig (11.3.3):
572+
- RNFBRemoteConfig (11.4.1):
567573
- Firebase/RemoteConfig (= 7.11.0)
568574
- React-Core
569575
- RNFBApp
570-
- RNFBStorage (11.3.3):
576+
- RNFBStorage (11.4.1):
571577
- Firebase/Storage (= 7.11.0)
572578
- React-Core
573579
- RNFBApp
@@ -577,7 +583,7 @@ DEPENDENCIES:
577583
- DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
578584
- FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
579585
- FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
580-
- FirebaseFirestore (from `https://github.com/invertase/firestore-ios-sdk-frameworks.git`, tag `7.11.0`)
586+
- FirebaseFirestore/WithoutLeveldb (from `https://github.com/invertase/firestore-ios-sdk-frameworks.git`, commit `af5c7177c896d69d73acb173c265d7efe8886126`)
581587
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
582588
- Jet (from `../node_modules/jet/ios`)
583589
- RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
@@ -667,8 +673,8 @@ EXTERNAL SOURCES:
667673
FBReactNativeSpec:
668674
:path: "../node_modules/react-native/React/FBReactNativeSpec"
669675
FirebaseFirestore:
676+
:commit: af5c7177c896d69d73acb173c265d7efe8886126
670677
:git: https://github.com/invertase/firestore-ios-sdk-frameworks.git
671-
:tag: 7.11.0
672678
glog:
673679
:podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec"
674680
Jet:
@@ -756,8 +762,8 @@ EXTERNAL SOURCES:
756762

757763
CHECKOUT OPTIONS:
758764
FirebaseFirestore:
765+
:commit: af5c7177c896d69d73acb173c265d7efe8886126
759766
:git: https://github.com/invertase/firestore-ios-sdk-frameworks.git
760-
:tag: 7.11.0
761767

762768
SPEC CHECKSUMS:
763769
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
@@ -773,7 +779,7 @@ SPEC CHECKSUMS:
773779
FirebaseCrashlytics: 272b675aa9d1e9bae1f9e1449fcc1f2cf6042806
774780
FirebaseDatabase: 6c39fbf1c8514a2f32e610f9bf9ef30c535dc15a
775781
FirebaseDynamicLinks: 07f101c20bb40fd39f6b3e5278a64a5f2f660dc1
776-
FirebaseFirestore: 783538aced1557a6b817ee121593561127a00244
782+
FirebaseFirestore: 782bf8a23c53bddf8fbbf6059c90fabe08768107
777783
FirebaseFunctions: cf3d041e5292b1c4bda868d542071a0f8291a4d4
778784
FirebaseInAppMessaging: 03f39409c6f5ce5fb2d0db9cc99e043c0a538ba0
779785
FirebaseInstallations: a58d4f72ec5861840b84df489f2668d970df558a
@@ -822,24 +828,24 @@ SPEC CHECKSUMS:
822828
React-RCTVibration: 0fd6b21751a33cb72fce1a4a33ab9678416d307a
823829
React-runtimeexecutor: cad74a1eaa53ee6e7a3620231939d8fe2c6afcf0
824830
ReactCommon: cfe2b7fd20e0dbd2d1185cd7d8f99633fbc5ff05
825-
RNFBAdMob: 7d5a6b026782a1b5f91bd863d2299e4a328cade0
826-
RNFBAnalytics: 4747ea51be1b2f003c889aad0207bf3fcc8309ad
827-
RNFBApp: 097a73b10972939bade8ad720ef92c3867baf2e5
828-
RNFBAuth: e554b8c1d3cddcb1ead741794be055acc1defcda
829-
RNFBCrashlytics: a045da0758ed559db99ed049a11ffc995fececb9
830-
RNFBDatabase: de7c902da929d8b170930f23e2787ee3f5e75c4b
831-
RNFBDynamicLinks: 135501c3922e49e4e7e00d1a0a1777b2fba1f042
832-
RNFBFirestore: 9c7fc9c42de2cc91d9b70cfc12ed00aa25ddb250
833-
RNFBFunctions: c2af986961d28a74f1383b0e53f4e4d20a95098a
834-
RNFBIid: 585215475e5dec2e0565360b77fb8a33fe33d081
835-
RNFBInAppMessaging: f7ac052f565200549d1fc187b4b86bec611eab03
836-
RNFBMessaging: 747dbfebbe827241a9819884cbba2cb35ce5dc90
837-
RNFBML: 8f7b5e256a0224bfc862d6e85d42db8a19d02d70
838-
RNFBPerf: fb34154674ad8b13effe52a0ab4a51bdb9992b7a
839-
RNFBRemoteConfig: fd88e45c151427ef9f75534da31c86dba1e28da3
840-
RNFBStorage: af7814531e503ea094f65f24fc5aa98491823bb8
831+
RNFBAdMob: bbc64554e13d019d37fbc981f5f48ba4c6ea5889
832+
RNFBAnalytics: 1190435dcd25d7403d28ceb4342c0d1e050843de
833+
RNFBApp: 996860ad6832996faba79ef3f6ec2d3ea5870dd9
834+
RNFBAuth: 3726f7f9bc9e9efb80cd1f5b2e65c4b04dc53760
835+
RNFBCrashlytics: 59d9ecfaacddbe10819d9071ee3b9921b79b8c6b
836+
RNFBDatabase: 026067d3ce9d65c96146f7f32c1f044f27665f29
837+
RNFBDynamicLinks: e6c9cd9cba02cc65f8b76fbd22cf50a66d473bdd
838+
RNFBFirestore: 7fa546e352aad031a78b934a67435e55b32cba49
839+
RNFBFunctions: 4838dd472870e5941908eabc48d1711dacdda558
840+
RNFBIid: 6003e884d8479e9d14ecbb6dbaa3939aaab40984
841+
RNFBInAppMessaging: 84a265c8ac2d4fbce01c13cd5d22946389c6926e
842+
RNFBMessaging: 8d84ceadc705ca6b6047c37376d2e2aaabcb8e3d
843+
RNFBML: 80dccd04dcea208eb96eb6d1b1f38975a0f3a274
844+
RNFBPerf: d54d3ab9a11fb319074de3d4714168052ac225cd
845+
RNFBRemoteConfig: 3035dd5d7b2a903f822505f04a5cd01752d5bc37
846+
RNFBStorage: 519ea44ccd27418d4bffbc9cd088a72697b5cb98
841847
Yoga: 8c8436d4171c87504c648ae23b1d81242bdf3bbf
842848

843-
PODFILE CHECKSUM: 89dba385c805fb62e8343576922b9b86427aa683
849+
PODFILE CHECKSUM: 207309c3bddb2e511bc745f32898e130e30eb1c6
844850

845851
COCOAPODS: 1.10.1

0 commit comments

Comments
 (0)