From 3e592526ec889887874efd0e46ba3cf72f2f6f98 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Tue, 21 Nov 2017 17:02:22 -0800 Subject: Buildable and interoperable source pods (#444) --- Firestore/Example/Firestore.xcodeproj/project.pbxproj | 12 ------------ Firestore/Example/Podfile | 16 +++++++++++----- Firestore/Example/SwiftBuildTest/main.swift | 2 +- Firestore/Example/Tests/API/FIRGeoPointTests.m | 2 +- Firestore/Example/Tests/Integration/API/FIRCursorTests.m | 2 +- .../Example/Tests/Integration/API/FIRDatabaseTests.m | 2 +- Firestore/Example/Tests/Integration/API/FIRFieldsTests.m | 2 +- .../Tests/Integration/API/FIRListenerRegistrationTests.m | 2 +- Firestore/Example/Tests/Integration/API/FIRQueryTests.m | 2 +- .../Tests/Integration/API/FIRServerTimestampTests.m | 2 +- Firestore/Example/Tests/Integration/API/FIRTypeTests.m | 2 +- .../Example/Tests/Integration/API/FIRValidationTests.m | 2 +- .../Example/Tests/Integration/API/FIRWriteBatchTests.m | 2 +- Firestore/Example/Tests/Integration/FSTDatastoreTests.m | 2 +- Firestore/Example/Tests/Integration/FSTSmokeTests.m | 2 +- Firestore/Example/Tests/Integration/FSTStreamTests.m | 2 +- .../Example/Tests/Integration/FSTTransactionTests.m | 2 +- Firestore/Example/Tests/Model/FSTFieldValueTests.m | 2 +- Firestore/Example/Tests/Remote/FSTDatastoreTests.m | 2 +- Firestore/Example/Tests/Remote/FSTSerializerBetaTests.m | 6 +++--- Firestore/Example/Tests/SpecTests/FSTSpecTests.m | 2 +- .../Example/Tests/SpecTests/FSTSyncEngineTestDriver.m | 2 +- Firestore/Example/Tests/Util/FSTHelpers.m | 4 ++-- Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm | 4 ++-- 24 files changed, 37 insertions(+), 43 deletions(-) (limited to 'Firestore/Example') diff --git a/Firestore/Example/Firestore.xcodeproj/project.pbxproj b/Firestore/Example/Firestore.xcodeproj/project.pbxproj index 62b73aa..034a96e 100644 --- a/Firestore/Example/Firestore.xcodeproj/project.pbxproj +++ b/Firestore/Example/Firestore.xcodeproj/project.pbxproj @@ -914,8 +914,6 @@ inputPaths = ( "${SRCROOT}/Pods/Target Support Files/Pods-SwiftBuildTest/Pods-SwiftBuildTest-frameworks.sh", "${BUILT_PRODUCTS_DIR}/BoringSSL/openssl.framework", - "${BUILT_PRODUCTS_DIR}/FirebaseCommunity-Auth-Core-Root/FirebaseCommunity.framework", - "${BUILT_PRODUCTS_DIR}/Firestore/Firestore.framework", "${BUILT_PRODUCTS_DIR}/GTMSessionFetcher/GTMSessionFetcher.framework", "${BUILT_PRODUCTS_DIR}/GoogleToolboxForMac-f0850809/GoogleToolboxForMac.framework", "${BUILT_PRODUCTS_DIR}/Protobuf/Protobuf.framework", @@ -929,8 +927,6 @@ name = "[CP] Embed Pods Frameworks"; outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCommunity.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Firestore.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMSessionFetcher.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleToolboxForMac.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Protobuf.framework", @@ -954,8 +950,6 @@ inputPaths = ( "${SRCROOT}/Pods/Target Support Files/Pods-Firestore_Example/Pods-Firestore_Example-frameworks.sh", "${BUILT_PRODUCTS_DIR}/BoringSSL/openssl.framework", - "${BUILT_PRODUCTS_DIR}/FirebaseCommunity-Auth-Core-Root/FirebaseCommunity.framework", - "${BUILT_PRODUCTS_DIR}/Firestore/Firestore.framework", "${BUILT_PRODUCTS_DIR}/GTMSessionFetcher/GTMSessionFetcher.framework", "${BUILT_PRODUCTS_DIR}/GoogleToolboxForMac-f0850809/GoogleToolboxForMac.framework", "${BUILT_PRODUCTS_DIR}/Protobuf/Protobuf.framework", @@ -969,8 +963,6 @@ name = "[CP] Embed Pods Frameworks"; outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCommunity.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Firestore.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMSessionFetcher.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleToolboxForMac.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Protobuf.framework", @@ -1044,7 +1036,6 @@ ); inputPaths = ( "${SRCROOT}/Pods/Target Support Files/Pods-Firestore_Tests/Pods-Firestore_Tests-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/FirebaseCommunity-Core-Root/FirebaseCommunity.framework", "${BUILT_PRODUCTS_DIR}/GoogleToolboxForMac-Defines-NSData+zlib/GoogleToolboxForMac.framework", "${BUILT_PRODUCTS_DIR}/leveldb-library/leveldb.framework", "${BUILT_PRODUCTS_DIR}/GoogleTest/GoogleTest.framework", @@ -1052,7 +1043,6 @@ ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCommunity.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleToolboxForMac.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/leveldb.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleTest.framework", @@ -1088,13 +1078,11 @@ ); inputPaths = ( "${SRCROOT}/Pods/Target Support Files/Pods-Firestore_IntegrationTests/Pods-Firestore_IntegrationTests-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/FirebaseCommunity-Core-Root/FirebaseCommunity.framework", "${BUILT_PRODUCTS_DIR}/GoogleToolboxForMac-Defines-NSData+zlib/GoogleToolboxForMac.framework", "${BUILT_PRODUCTS_DIR}/OCMock/OCMock.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCommunity.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleToolboxForMac.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OCMock.framework", ); diff --git a/Firestore/Example/Podfile b/Firestore/Example/Podfile index c5cf06a..923ab22 100644 --- a/Firestore/Example/Podfile +++ b/Firestore/Example/Podfile @@ -1,14 +1,20 @@ +# The next line is the forcing function for the Firebase pod. The Firebase +# version's subspecs should depend on the component versions in their +# corresponding podspec's. +pod 'Firebase/Core', '4.6.0' + use_frameworks! platform :ios, '8.0' target 'Firestore_Example' do - pod 'FirebaseCommunity/Core', :path => '../../' - pod 'Firestore', :path => '../' + pod 'FirebaseAuth', :path => '../../' + pod 'FirebaseCore', :path => '../../' + pod 'FirebaseFirestore', :path => '../../' target 'Firestore_Tests' do inherit! :search_paths - pod 'FirebaseCommunity/Core', :path => '../../' + pod 'FirebaseCore', :path => '../../' pod 'leveldb-library' pod 'OCMock' @@ -18,12 +24,12 @@ target 'Firestore_Example' do target 'Firestore_IntegrationTests' do inherit! :search_paths - pod 'FirebaseCommunity/Core', :path => '../../' + pod 'FirebaseCore', :path => '../../' pod 'OCMock' end end target 'SwiftBuildTest' do - pod 'Firestore', :path => '../' + pod 'FirebaseFirestore', :path => '../../' end diff --git a/Firestore/Example/SwiftBuildTest/main.swift b/Firestore/Example/SwiftBuildTest/main.swift index 8cc0302..bea8b56 100644 --- a/Firestore/Example/SwiftBuildTest/main.swift +++ b/Firestore/Example/SwiftBuildTest/main.swift @@ -16,7 +16,7 @@ import Foundation -import Firestore +import FirebaseFirestore func main() { let db = initializeDb(); diff --git a/Firestore/Example/Tests/API/FIRGeoPointTests.m b/Firestore/Example/Tests/API/FIRGeoPointTests.m index 3fc8b33..b505de0 100644 --- a/Firestore/Example/Tests/API/FIRGeoPointTests.m +++ b/Firestore/Example/Tests/API/FIRGeoPointTests.m @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "Firestore/FIRGeoPoint.h" +#import "FirebaseFirestore/FIRGeoPoint.h" #import diff --git a/Firestore/Example/Tests/Integration/API/FIRCursorTests.m b/Firestore/Example/Tests/Integration/API/FIRCursorTests.m index 72c55f6..dc9da83 100644 --- a/Firestore/Example/Tests/Integration/API/FIRCursorTests.m +++ b/Firestore/Example/Tests/Integration/API/FIRCursorTests.m @@ -14,7 +14,7 @@ * limitations under the License. */ -@import Firestore; +@import FirebaseFirestore; #import diff --git a/Firestore/Example/Tests/Integration/API/FIRDatabaseTests.m b/Firestore/Example/Tests/Integration/API/FIRDatabaseTests.m index 8ba8903..087eb01 100644 --- a/Firestore/Example/Tests/Integration/API/FIRDatabaseTests.m +++ b/Firestore/Example/Tests/Integration/API/FIRDatabaseTests.m @@ -14,7 +14,7 @@ * limitations under the License. */ -@import Firestore; +@import FirebaseFirestore; #import diff --git a/Firestore/Example/Tests/Integration/API/FIRFieldsTests.m b/Firestore/Example/Tests/Integration/API/FIRFieldsTests.m index 60bf36b..b647f52 100644 --- a/Firestore/Example/Tests/Integration/API/FIRFieldsTests.m +++ b/Firestore/Example/Tests/Integration/API/FIRFieldsTests.m @@ -14,7 +14,7 @@ * limitations under the License. */ -@import Firestore; +@import FirebaseFirestore; #import diff --git a/Firestore/Example/Tests/Integration/API/FIRListenerRegistrationTests.m b/Firestore/Example/Tests/Integration/API/FIRListenerRegistrationTests.m index 6b1f787..9751844 100644 --- a/Firestore/Example/Tests/Integration/API/FIRListenerRegistrationTests.m +++ b/Firestore/Example/Tests/Integration/API/FIRListenerRegistrationTests.m @@ -14,7 +14,7 @@ * limitations under the License. */ -@import Firestore; +@import FirebaseFirestore; #import diff --git a/Firestore/Example/Tests/Integration/API/FIRQueryTests.m b/Firestore/Example/Tests/Integration/API/FIRQueryTests.m index b80c52d..180b423 100644 --- a/Firestore/Example/Tests/Integration/API/FIRQueryTests.m +++ b/Firestore/Example/Tests/Integration/API/FIRQueryTests.m @@ -14,7 +14,7 @@ * limitations under the License. */ -@import Firestore; +@import FirebaseFirestore; #import diff --git a/Firestore/Example/Tests/Integration/API/FIRServerTimestampTests.m b/Firestore/Example/Tests/Integration/API/FIRServerTimestampTests.m index da9fb1a..2ee3966 100644 --- a/Firestore/Example/Tests/Integration/API/FIRServerTimestampTests.m +++ b/Firestore/Example/Tests/Integration/API/FIRServerTimestampTests.m @@ -14,7 +14,7 @@ * limitations under the License. */ -@import Firestore; +@import FirebaseFirestore; #import diff --git a/Firestore/Example/Tests/Integration/API/FIRTypeTests.m b/Firestore/Example/Tests/Integration/API/FIRTypeTests.m index 02eccbc..638835f 100644 --- a/Firestore/Example/Tests/Integration/API/FIRTypeTests.m +++ b/Firestore/Example/Tests/Integration/API/FIRTypeTests.m @@ -14,7 +14,7 @@ * limitations under the License. */ -@import Firestore; +@import FirebaseFirestore; #import diff --git a/Firestore/Example/Tests/Integration/API/FIRValidationTests.m b/Firestore/Example/Tests/Integration/API/FIRValidationTests.m index 444931e..a318c47 100644 --- a/Firestore/Example/Tests/Integration/API/FIRValidationTests.m +++ b/Firestore/Example/Tests/Integration/API/FIRValidationTests.m @@ -14,7 +14,7 @@ * limitations under the License. */ -@import Firestore; +@import FirebaseFirestore; #import diff --git a/Firestore/Example/Tests/Integration/API/FIRWriteBatchTests.m b/Firestore/Example/Tests/Integration/API/FIRWriteBatchTests.m index 906b27c..562c29f 100644 --- a/Firestore/Example/Tests/Integration/API/FIRWriteBatchTests.m +++ b/Firestore/Example/Tests/Integration/API/FIRWriteBatchTests.m @@ -14,7 +14,7 @@ * limitations under the License. */ -@import Firestore; +@import FirebaseFirestore; #import diff --git a/Firestore/Example/Tests/Integration/FSTDatastoreTests.m b/Firestore/Example/Tests/Integration/FSTDatastoreTests.m index d51b21a..bf2c44b 100644 --- a/Firestore/Example/Tests/Integration/FSTDatastoreTests.m +++ b/Firestore/Example/Tests/Integration/FSTDatastoreTests.m @@ -14,7 +14,7 @@ * limitations under the License. */ -@import Firestore; +@import FirebaseFirestore; #import #import diff --git a/Firestore/Example/Tests/Integration/FSTSmokeTests.m b/Firestore/Example/Tests/Integration/FSTSmokeTests.m index 13bace3..847474a 100644 --- a/Firestore/Example/Tests/Integration/FSTSmokeTests.m +++ b/Firestore/Example/Tests/Integration/FSTSmokeTests.m @@ -14,7 +14,7 @@ * limitations under the License. */ -@import Firestore; +@import FirebaseFirestore; #import diff --git a/Firestore/Example/Tests/Integration/FSTStreamTests.m b/Firestore/Example/Tests/Integration/FSTStreamTests.m index c8a9e9d..bbdf372 100644 --- a/Firestore/Example/Tests/Integration/FSTStreamTests.m +++ b/Firestore/Example/Tests/Integration/FSTStreamTests.m @@ -16,7 +16,7 @@ #import -#import +#import #import "Firestore/Example/Tests/Util/FSTHelpers.h" #import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h" diff --git a/Firestore/Example/Tests/Integration/FSTTransactionTests.m b/Firestore/Example/Tests/Integration/FSTTransactionTests.m index 014e4a7..2e828c9 100644 --- a/Firestore/Example/Tests/Integration/FSTTransactionTests.m +++ b/Firestore/Example/Tests/Integration/FSTTransactionTests.m @@ -14,7 +14,7 @@ * limitations under the License. */ -@import Firestore; +@import FirebaseFirestore; #import #include diff --git a/Firestore/Example/Tests/Model/FSTFieldValueTests.m b/Firestore/Example/Tests/Model/FSTFieldValueTests.m index 744bcc4..acf95f0 100644 --- a/Firestore/Example/Tests/Model/FSTFieldValueTests.m +++ b/Firestore/Example/Tests/Model/FSTFieldValueTests.m @@ -18,7 +18,7 @@ #import -#import "Firestore/FIRGeoPoint.h" +#import "FirebaseFirestore/FIRGeoPoint.h" #import "Firestore/Source/API/FIRFirestore+Internal.h" #import "Firestore/Source/API/FSTUserDataConverter.h" #import "Firestore/Source/Core/FSTTimestamp.h" diff --git a/Firestore/Example/Tests/Remote/FSTDatastoreTests.m b/Firestore/Example/Tests/Remote/FSTDatastoreTests.m index 8c1c16f..f3cc56f 100644 --- a/Firestore/Example/Tests/Remote/FSTDatastoreTests.m +++ b/Firestore/Example/Tests/Remote/FSTDatastoreTests.m @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "Firestore/FIRFirestoreErrors.h" +#import "FirebaseFirestore/FIRFirestoreErrors.h" #import "Firestore/Source/Remote/FSTDatastore.h" #import diff --git a/Firestore/Example/Tests/Remote/FSTSerializerBetaTests.m b/Firestore/Example/Tests/Remote/FSTSerializerBetaTests.m index 54aa955..528076f 100644 --- a/Firestore/Example/Tests/Remote/FSTSerializerBetaTests.m +++ b/Firestore/Example/Tests/Remote/FSTSerializerBetaTests.m @@ -19,9 +19,9 @@ #import #import -#import "Firestore/FIRFieldPath.h" -#import "Firestore/FIRFirestoreErrors.h" -#import "Firestore/FIRGeoPoint.h" +#import "FirebaseFirestore/FIRFieldPath.h" +#import "FirebaseFirestore/FIRFirestoreErrors.h" +#import "FirebaseFirestore/FIRGeoPoint.h" #import "Firestore/Protos/objc/firestore/local/MaybeDocument.pbobjc.h" #import "Firestore/Protos/objc/firestore/local/Mutation.pbobjc.h" #import "Firestore/Protos/objc/google/firestore/v1beta1/Common.pbobjc.h" diff --git a/Firestore/Example/Tests/SpecTests/FSTSpecTests.m b/Firestore/Example/Tests/SpecTests/FSTSpecTests.m index 8782495..2c1b8db 100644 --- a/Firestore/Example/Tests/SpecTests/FSTSpecTests.m +++ b/Firestore/Example/Tests/SpecTests/FSTSpecTests.m @@ -18,7 +18,7 @@ #import -#import "Firestore/FIRFirestoreErrors.h" +#import "FirebaseFirestore/FIRFirestoreErrors.h" #import "Firestore/Source/Auth/FSTUser.h" #import "Firestore/Source/Core/FSTEventManager.h" #import "Firestore/Source/Core/FSTQuery.h" diff --git a/Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.m b/Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.m index 5a2c311..896a292 100644 --- a/Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.m +++ b/Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.m @@ -18,7 +18,7 @@ #import -#import "Firestore/FIRFirestoreErrors.h" +#import "FirebaseFirestore/FIRFirestoreErrors.h" #import "Firestore/Source/Auth/FSTUser.h" #import "Firestore/Source/Core/FSTEventManager.h" #import "Firestore/Source/Core/FSTQuery.h" diff --git a/Firestore/Example/Tests/Util/FSTHelpers.m b/Firestore/Example/Tests/Util/FSTHelpers.m index 7b24649..f01bddb 100644 --- a/Firestore/Example/Tests/Util/FSTHelpers.m +++ b/Firestore/Example/Tests/Util/FSTHelpers.m @@ -16,8 +16,8 @@ #import "Firestore/Example/Tests/Util/FSTHelpers.h" -#import "Firestore/FIRFieldPath.h" -#import "Firestore/FIRGeoPoint.h" +#import "FirebaseFirestore/FIRFieldPath.h" +#import "FirebaseFirestore/FIRGeoPoint.h" #import "Firestore/Source/API/FIRFieldPath+Internal.h" #import "Firestore/Source/API/FSTUserDataConverter.h" #import "Firestore/Source/Core/FSTQuery.h" diff --git a/Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm b/Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm index 187eb60..47d6e76 100644 --- a/Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm +++ b/Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm @@ -16,8 +16,8 @@ #import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h" -#import -#import +#import +#import #import #import -- cgit v1.2.3