Skip to content

Commit 2c3585f

Browse files
authored
Drop Firestore's Podfile dependency on Firebase (#4841)
This makes it possible to build and test on a release branch before the Firebase pod is released.
1 parent cb9e083 commit 2c3585f

File tree

2 files changed

+2
-22
lines changed

2 files changed

+2
-22
lines changed

Firestore/Example/Podfile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ end
5656
# required.
5757
def configure_local_pods()
5858
# Firestore is always local; that's what's under development here.
59-
pod 'FirebaseFirestore', :path => '../../'
59+
pod 'FirebaseFirestore', :path => '../..'
6060
pod 'GoogleUtilities', :path => '../..'
6161

6262
# FirebaseCore must always be a local pod so that CI builds that make changes
@@ -115,11 +115,6 @@ if is_platform(:ios)
115115
target 'Firestore_Example_iOS' do
116116
platform :ios, '8.0'
117117

118-
# The next line is the forcing function for the Firebase pod. The Firebase
119-
# version's subspecs should depend on the component versions in their
120-
# corresponding podspecs.
121-
pod 'Firebase/CoreOnly', '6.16.0'
122-
123118
configure_local_pods()
124119

125120
target 'Firestore_Tests_iOS' do

Firestore/Swift/Tests/API/BasicCompileTests.swift

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,7 @@
2020
import Foundation
2121
import XCTest
2222

23-
// The Firebase pod is only available on iOS. On other platforms, import
24-
// Firestore directly and disable any tests that inspect types at the Firebase
25-
// level.
26-
#if os(iOS)
27-
import Firebase
28-
#else
29-
import FirebaseFirestore
30-
#endif
23+
import FirebaseFirestore
3124

3225
class BasicCompileTests: XCTestCase {
3326
func testCompiled() {
@@ -442,15 +435,7 @@ func types() {
442435
let _: Firestore
443436
let _: FirestoreSettings
444437
let _: GeoPoint
445-
#if os(iOS)
446-
let _: Firebase.GeoPoint
447-
#endif
448-
let _: FirebaseFirestore.GeoPoint
449438
let _: Timestamp
450-
#if os(iOS)
451-
let _: Firebase.Timestamp
452-
#endif
453-
let _: FirebaseFirestore.Timestamp
454439
let _: ListenerRegistration
455440
let _: Query
456441
let _: QuerySnapshot

0 commit comments

Comments
 (0)