Skip to content

Commit 6910d82

Browse files
authored
Use a consistent set of dependencies on all platforms (#3289)
* Use a consistent set of dependencies on all platforms * pod install for uniform dependencies
1 parent c665b6e commit 6910d82

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

Firestore/Example/Firestore.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2477,7 +2477,7 @@
24772477
"${PODS_ROOT}/Target Support Files/Pods-Firestore_Example_iOS/Pods-Firestore_Example_iOS-frameworks.sh",
24782478
"${BUILT_PRODUCTS_DIR}/BoringSSL-GRPC-iOS/openssl_grpc.framework",
24792479
"${BUILT_PRODUCTS_DIR}/GTMSessionFetcher-iOS/GTMSessionFetcher.framework",
2480-
"${BUILT_PRODUCTS_DIR}/GoogleUtilities-b9437b04/GoogleUtilities.framework",
2480+
"${BUILT_PRODUCTS_DIR}/GoogleUtilities-ef02d4f5/GoogleUtilities.framework",
24812481
"${BUILT_PRODUCTS_DIR}/Protobuf-iOS8.0/Protobuf.framework",
24822482
"${BUILT_PRODUCTS_DIR}/gRPC-C++-iOS/grpcpp.framework",
24832483
"${BUILT_PRODUCTS_DIR}/gRPC-Core-iOS/grpc.framework",
@@ -2509,7 +2509,7 @@
25092509
"${PODS_ROOT}/Target Support Files/Pods-Firestore_Example_tvOS/Pods-Firestore_Example_tvOS-frameworks.sh",
25102510
"${BUILT_PRODUCTS_DIR}/BoringSSL-GRPC-tvOS/openssl_grpc.framework",
25112511
"${BUILT_PRODUCTS_DIR}/GTMSessionFetcher-tvOS/GTMSessionFetcher.framework",
2512-
"${BUILT_PRODUCTS_DIR}/GoogleUtilities-85d94889/GoogleUtilities.framework",
2512+
"${BUILT_PRODUCTS_DIR}/GoogleUtilities-c3f74682/GoogleUtilities.framework",
25132513
"${BUILT_PRODUCTS_DIR}/Protobuf-tvOS10.0/Protobuf.framework",
25142514
"${BUILT_PRODUCTS_DIR}/gRPC-C++-tvOS/grpcpp.framework",
25152515
"${BUILT_PRODUCTS_DIR}/gRPC-Core-tvOS/grpc.framework",
@@ -2651,7 +2651,7 @@
26512651
"${PODS_ROOT}/Target Support Files/Pods-Firestore_Example_macOS/Pods-Firestore_Example_macOS-frameworks.sh",
26522652
"${BUILT_PRODUCTS_DIR}/BoringSSL-GRPC-macOS/openssl_grpc.framework",
26532653
"${BUILT_PRODUCTS_DIR}/GTMSessionFetcher-macOS/GTMSessionFetcher.framework",
2654-
"${BUILT_PRODUCTS_DIR}/GoogleUtilities-65885a2c/GoogleUtilities.framework",
2654+
"${BUILT_PRODUCTS_DIR}/GoogleUtilities-1338e9d8/GoogleUtilities.framework",
26552655
"${BUILT_PRODUCTS_DIR}/Protobuf-macOS10.11/Protobuf.framework",
26562656
"${BUILT_PRODUCTS_DIR}/gRPC-C++-macOS/grpcpp.framework",
26572657
"${BUILT_PRODUCTS_DIR}/gRPC-Core-macOS/grpc.framework",
@@ -2994,7 +2994,7 @@
29942994
"${PODS_ROOT}/Target Support Files/Pods-Firestore_Example_iOS-Firestore_SwiftTests_iOS/Pods-Firestore_Example_iOS-Firestore_SwiftTests_iOS-frameworks.sh",
29952995
"${BUILT_PRODUCTS_DIR}/BoringSSL-GRPC-iOS/openssl_grpc.framework",
29962996
"${BUILT_PRODUCTS_DIR}/GTMSessionFetcher-iOS/GTMSessionFetcher.framework",
2997-
"${BUILT_PRODUCTS_DIR}/GoogleUtilities-b9437b04/GoogleUtilities.framework",
2997+
"${BUILT_PRODUCTS_DIR}/GoogleUtilities-ef02d4f5/GoogleUtilities.framework",
29982998
"${BUILT_PRODUCTS_DIR}/Protobuf-iOS8.0/Protobuf.framework",
29992999
"${BUILT_PRODUCTS_DIR}/gRPC-C++-iOS/grpcpp.framework",
30003000
"${BUILT_PRODUCTS_DIR}/gRPC-Core-iOS/grpc.framework",

Firestore/Example/Podfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@ target 'Firestore_Example_macOS' do
6464
platform :osx, '10.11'
6565

6666
pod 'FirebaseAuth', :path => '../../'
67+
pod 'FirebaseAuthInterop', :path => '../../'
6768
pod 'FirebaseCore', :path => '../../'
69+
pod 'GoogleUtilities', :path => '../../'
6870
pod 'FirebaseFirestore', :path => '../../'
6971

7072
target 'Firestore_Tests_macOS' do
@@ -92,7 +94,9 @@ target 'Firestore_Example_tvOS' do
9294
platform :tvos, '10.0'
9395

9496
pod 'FirebaseAuth', :path => '../../'
97+
pod 'FirebaseAuthInterop', :path => '../../'
9598
pod 'FirebaseCore', :path => '../../'
99+
pod 'GoogleUtilities', :path => '../../'
96100
pod 'FirebaseFirestore', :path => '../../'
97101

98102
target 'Firestore_Tests_tvOS' do

0 commit comments

Comments
 (0)