diff options
45 files changed, 85 insertions, 111 deletions
diff --git a/AuthSamples/Sample/ApplicationDelegate.m b/AuthSamples/Sample/ApplicationDelegate.m index ca8ab44..594327f 100644 --- a/AuthSamples/Sample/ApplicationDelegate.m +++ b/AuthSamples/Sample/ApplicationDelegate.m @@ -17,9 +17,9 @@ #import "ApplicationDelegate.h" #import "AuthProviders.h" -#import "FIRApp.h" +#import "FirebaseCommunity/FIRApp.h" #import "FirebaseAuth.h" -#import "FIRLogger.h" +#import "FirebaseCommunity/FIRLogger.h" #import "GTMSessionFetcherLogging.h" #import "MainViewController.h" diff --git a/AuthSamples/Sample/MainViewController.m b/AuthSamples/Sample/MainViewController.m index 73adb51..6171da2 100644 --- a/AuthSamples/Sample/MainViewController.m +++ b/AuthSamples/Sample/MainViewController.m @@ -19,8 +19,9 @@ #import <objc/runtime.h> #import "FIRAdditionalUserInfo.h" -#import "FIRApp.h" -#import "FIRAppAssociationRegistration.h" +#import "FirebaseCommunity/FIRApp.h" +#import "FirebaseCommunity/FIRAppInternal.h" +#import "FirebaseCommunity/FIRAppAssociationRegistration.h" #import "FIROAuthProvider.h" #import "FIRPhoneAuthCredential.h" #import "FIRPhoneAuthProvider.h" @@ -487,18 +488,6 @@ typedef void (^ShowEmailPasswordDialogCompletion)(FIRAuthCredential *credential) */ typedef void (^FIRTokenCallback)(NSString *_Nullable token, NSError *_Nullable error); -/** @brief Method declarations copied from FIRAppInternal.h to avoid importing non-public headers. - */ -@interface FIRApp (Internal) -/** @fn getTokenForcingRefresh:withCallback: - @brief Retrieves the Firebase authentication token, possibly refreshing it. - @param forceRefresh Forces a token refresh. Useful if the token becomes invalid for some reason - other than an expiration. - @param callback The block to invoke when the token is available. - */ -- (void)getTokenForcingRefresh:(BOOL)forceRefresh withCallback:(nonnull FIRTokenCallback)callback; -@end - /** @category FIRAppAssociationRegistration(Deregistration) @brief The category for the deregistration method. */ diff --git a/AuthSamples/Samples.xcodeproj/project.pbxproj b/AuthSamples/Samples.xcodeproj/project.pbxproj index 89d78c3..4f57a16 100644 --- a/AuthSamples/Samples.xcodeproj/project.pbxproj +++ b/AuthSamples/Samples.xcodeproj/project.pbxproj @@ -1464,7 +1464,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 3.0; - USER_HEADER_SEARCH_PATHS = "$(inherited) ../Firebase/Core/Private ../Firebase/Auth/Source"; + USER_HEADER_SEARCH_PATHS = "$(inherited) ../Firebase/Auth/Source"; }; name = Debug; }; @@ -1481,7 +1481,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.google.FirebaseExperimental1.dev; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 3.0; - USER_HEADER_SEARCH_PATHS = "$(inherited) ../Firebase/Core/Private ../Firebase/Auth/Source"; + USER_HEADER_SEARCH_PATHS = "$(inherited) ../Firebase/Auth/Source"; }; name = Release; }; @@ -1583,7 +1583,6 @@ "\"$(SRCROOT)/../Firebase/Auth/Source/RPCs\"", "\"$(SRCROOT)/../Firebase/Auth/Source\"", "\"$(SRCROOT)/../Firebase/Auth/Source/AuthProviders\"", - "\"$(SRCROOT)/../Firebase/Core/Private\"", ); INFOPLIST_FILE = "$(SRCROOT)/../Example/Auth/Tests/Tests-Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -1604,7 +1603,6 @@ "\"$(SRCROOT)/../Firebase/Auth/Source/RPCs\"", "\"$(SRCROOT)/../Firebase/Auth/Source\"", "\"$(SRCROOT)/../Firebase/Auth/Source/AuthProviders\"", - "\"$(SRCROOT)/../Firebase/Core/Private\"", ); INFOPLIST_FILE = "$(SRCROOT)/../Example/Auth/Tests/Tests-Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; diff --git a/Example/Auth/Tests/FIRApp+FIRAuthUnitTests.h b/Example/Auth/Tests/FIRApp+FIRAuthUnitTests.h index c0e6d13..27927d3 100644 --- a/Example/Auth/Tests/FIRApp+FIRAuthUnitTests.h +++ b/Example/Auth/Tests/FIRApp+FIRAuthUnitTests.h @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "FIRAppInternal.h" +#import "FirebaseCommunity/FIRAppInternal.h" /** @category FIRApp (FIRAuthUnitTests) @brief Tests for @c FIRAuth. diff --git a/Example/Auth/Tests/FIRApp+FIRAuthUnitTests.m b/Example/Auth/Tests/FIRApp+FIRAuthUnitTests.m index aba4136..7159452 100644 --- a/Example/Auth/Tests/FIRApp+FIRAuthUnitTests.m +++ b/Example/Auth/Tests/FIRApp+FIRAuthUnitTests.m @@ -16,7 +16,7 @@ #import "FIRApp+FIRAuthUnitTests.h" -#import "FIROptionsInternal.h" +#import "FirebaseCommunity/FIROptionsInternal.h" @implementation FIRApp (FIRAuthUnitTests) diff --git a/Example/Auth/Tests/FIRAuthTests.m b/Example/Auth/Tests/FIRAuthTests.m index 6e4971a..299c0d9 100644 --- a/Example/Auth/Tests/FIRAuthTests.m +++ b/Example/Auth/Tests/FIRAuthTests.m @@ -18,11 +18,10 @@ #import <XCTest/XCTest.h> -#import "FIRAppInternal.h" -#import "FIREmailAuthProvider.h" -#import "FIRGoogleAuthProvider.h" -#import "FIRPhoneAuthCredential.h" -#import "FIRAdditionalUserInfo.h" +#import "FirebaseCommunity/FIRAppInternal.h" +#import "FirebaseCommunity/FIREmailAuthProvider.h" +#import "FirebaseCommunity/FIRGoogleAuthProvider.h" +#import "FirebaseCommunity/FIRAdditionalUserInfo.h" #import "FIRAuth_Internal.h" #import "FIRAuthErrorUtils.h" #import "FIRAuthDispatcher.h" @@ -56,6 +55,7 @@ #import <OCMock/OCMock.h> #if TARGET_OS_IOS +#import "FIRPhoneAuthCredential.h" #import "FIRPhoneAuthProvider.h" #endif diff --git a/Example/Auth/Tests/FIRPhoneAuthProviderTests.m b/Example/Auth/Tests/FIRPhoneAuthProviderTests.m index b7b8bf3..71bdd5d 100644 --- a/Example/Auth/Tests/FIRPhoneAuthProviderTests.m +++ b/Example/Auth/Tests/FIRPhoneAuthProviderTests.m @@ -16,6 +16,7 @@ #import <XCTest/XCTest.h> +#import "FirebaseCommunity/FIRAuth.h" #import "FIRPhoneAuthProvider.h" #import "Phone/FIRPhoneAuthCredential_Internal.h" #import "Phone/NSString+FIRAuth.h" diff --git a/Example/Auth/Tests/FIRUserTests.m b/Example/Auth/Tests/FIRUserTests.m index 5905d97..64051a3 100644 --- a/Example/Auth/Tests/FIRUserTests.m +++ b/Example/Auth/Tests/FIRUserTests.m @@ -18,12 +18,12 @@ #import <XCTest/XCTest.h> -#import "FIREmailAuthProvider.h" -#import "FIRFacebookAuthProvider.h" -#import "FIRGoogleAuthProvider.h" -#import "Phone/FIRPhoneAuthCredential_Internal.h" -#import "FIRAdditionalUserInfo.h" -#import "FIRAuth.h" +#import "FirebaseCommunity/FIRUser.h" +#import "FirebaseCommunity/FIREmailAuthProvider.h" +#import "FirebaseCommunity/FIRFacebookAuthProvider.h" +#import "FirebaseCommunity/FIRGoogleAuthProvider.h" +#import "FirebaseCommunity/FIRAdditionalUserInfo.h" +#import "FirebaseCommunity/FIRAuth.h" #import "FIRAuthErrorUtils.h" #import "FIRAuthGlobalWorkQueue.h" #import "FIRUser_Internal.h" @@ -44,6 +44,7 @@ #import <OCMock/OCMock.h> #if TARGET_OS_IOS +#import "Phone/FIRPhoneAuthCredential_Internal.h" #import "FIRPhoneAuthProvider.h" #endif diff --git a/Example/Core/Tests/FIRAppAssociationRegistrationUnitTests.m b/Example/Core/Tests/FIRAppAssociationRegistrationUnitTests.m index 9649c99..dd6a91a 100644 --- a/Example/Core/Tests/FIRAppAssociationRegistrationUnitTests.m +++ b/Example/Core/Tests/FIRAppAssociationRegistrationUnitTests.m @@ -14,7 +14,7 @@ #import <XCTest/XCTest.h> -#import "FIRAppAssociationRegistration.h" +#import "FirebaseCommunity/FIRAppAssociationRegistration.h" /** @var kKey @brief A unique string key. diff --git a/Example/Core/Tests/FIRAppTest.m b/Example/Core/Tests/FIRAppTest.m index da97c6c..05bec06 100644 --- a/Example/Core/Tests/FIRAppTest.m +++ b/Example/Core/Tests/FIRAppTest.m @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "FIRAppInternal.h" -#import "FIROptionsInternal.h" +#import "FirebaseCommunity/FIRAppInternal.h" +#import "FirebaseCommunity/FIROptionsInternal.h" #import "FIRTestCase.h" NSString *const kFIRTestAppName1 = @"test_app_name_1"; diff --git a/Example/Core/Tests/FIRBundleUtilTest.m b/Example/Core/Tests/FIRBundleUtilTest.m index 6a3e20a..22863a4 100644 --- a/Example/Core/Tests/FIRBundleUtilTest.m +++ b/Example/Core/Tests/FIRBundleUtilTest.m @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "FIRBundleUtil.h" +#import "FirebaseCommunity/FIRBundleUtil.h" #import "FIRTestCase.h" diff --git a/Example/Core/Tests/FIRLoggerTest.m b/Example/Core/Tests/FIRLoggerTest.m index d13e207..c4d252a 100644 --- a/Example/Core/Tests/FIRLoggerTest.m +++ b/Example/Core/Tests/FIRLoggerTest.m @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "FIRLogger.h" +#import "FirebaseCommunity/FIRLogger.h" #import "FIRTestCase.h" #import <asl.h> diff --git a/Example/Core/Tests/FIROptionsTest.m b/Example/Core/Tests/FIROptionsTest.m index 62b6294..ec3bc27 100644 --- a/Example/Core/Tests/FIROptionsTest.m +++ b/Example/Core/Tests/FIROptionsTest.m @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "FIRAppInternal.h" -#import "FIRBundleUtil.h" -#import "FIROptionsInternal.h" +#import "FirebaseCommunity/FIRAppInternal.h" +#import "FirebaseCommunity/FIRBundleUtil.h" +#import "FirebaseCommunity/FIROptionsInternal.h" #import "FIRTestCase.h" diff --git a/Example/Database/Tests/Helpers/FDevice.m b/Example/Database/Tests/Helpers/FDevice.m index f9667df..4e87dd5 100644 --- a/Example/Database/Tests/Helpers/FDevice.m +++ b/Example/Database/Tests/Helpers/FDevice.m @@ -16,7 +16,7 @@ #import <XCTest/XCTest.h> #import "FDevice.h" -#import "FIRDatabaseReference.h" +#import "FirebaseCommunity/FIRDatabaseReference.h" #import "FRepoManager.h" #import "FIRDatabaseReference_Private.h" #import "FIRDatabaseConfig_Private.h" diff --git a/Example/Database/Tests/Helpers/FEventTester.m b/Example/Database/Tests/Helpers/FEventTester.m index 8c7bd19..f75e11b 100644 --- a/Example/Database/Tests/Helpers/FEventTester.m +++ b/Example/Database/Tests/Helpers/FEventTester.m @@ -15,7 +15,7 @@ */ #import "FEventTester.h" -#import "FIRDatabaseReference.h" +#import "FirebaseCommunity/FIRDatabaseReference.h" #import "FTupleBoolBlock.h" #import "FTupleEventTypeString.h" #import "FTestHelpers.h" diff --git a/Example/Database/Tests/Helpers/FTestBase.m b/Example/Database/Tests/Helpers/FTestBase.m index 1cfe7ad..d94adea 100644 --- a/Example/Database/Tests/Helpers/FTestBase.m +++ b/Example/Database/Tests/Helpers/FTestBase.m @@ -14,8 +14,8 @@ * limitations under the License. */ -#import "FIRApp.h" -#import "FIROptions.h" +#import "FirebaseCommunity/FIRApp.h" +#import "FirebaseCommunity/FIROptions.h" #import "FTestBase.h" #import "FTestAuthTokenGenerator.h" #import "FIRDatabaseQuery_Private.h" diff --git a/Example/Database/Tests/Integration/FConnectionTest.m b/Example/Database/Tests/Integration/FConnectionTest.m index c658e8e..2924c63 100644 --- a/Example/Database/Tests/Integration/FConnectionTest.m +++ b/Example/Database/Tests/Integration/FConnectionTest.m @@ -16,8 +16,8 @@ #import <Foundation/Foundation.h> -#import "FIRApp.h" -#import "FIROptions.h" +#import "FirebaseCommunity/FIRApp.h" +#import "FirebaseCommunity/FIROptions.h" #import "FTestHelpers.h" #import "FConnection.h" #import "FTestBase.h" diff --git a/Example/Database/Tests/Integration/FIRAuthTests.m b/Example/Database/Tests/Integration/FIRAuthTests.m index 2c44580..884b6c1 100644 --- a/Example/Database/Tests/Integration/FIRAuthTests.m +++ b/Example/Database/Tests/Integration/FIRAuthTests.m @@ -15,7 +15,7 @@ */ #import <XCTest/XCTest.h> -#import "FIRApp.h" +#import "FirebaseCommunity/FIRApp.h" #import "FTestHelpers.h" #import "FTestAuthTokenGenerator.h" #import "FIRTestAuthTokenProvider.h" diff --git a/Example/Database/Tests/Integration/FIRDatabaseTests.m b/Example/Database/Tests/Integration/FIRDatabaseTests.m index d0d0909..3b20a46 100644 --- a/Example/Database/Tests/Integration/FIRDatabaseTests.m +++ b/Example/Database/Tests/Integration/FIRDatabaseTests.m @@ -15,7 +15,7 @@ */ #import <XCTest/XCTest.h> -#import "FIRApp.h" +#import "FirebaseCommunity/FIRApp.h" #import "FIRDatabaseReference.h" #import "FIRDatabaseReference_Private.h" #import "FIRDatabase.h" diff --git a/Example/Database/Tests/Unit/FSyncPointTests.m b/Example/Database/Tests/Unit/FSyncPointTests.m index d36b48a..442975e 100644 --- a/Example/Database/Tests/Unit/FSyncPointTests.m +++ b/Example/Database/Tests/Unit/FSyncPointTests.m @@ -15,6 +15,7 @@ */ #import <Foundation/Foundation.h> +#import "FirebaseCommunity/FIRLogger.h" #import "FSyncPointTests.h" #import "FListenProvider.h" #import "FQuerySpec.h" diff --git a/Example/Firebase.xcodeproj/project.pbxproj b/Example/Firebase.xcodeproj/project.pbxproj index 65b1612..631cdbb 100644 --- a/Example/Firebase.xcodeproj/project.pbxproj +++ b/Example/Firebase.xcodeproj/project.pbxproj @@ -4418,7 +4418,6 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", "\"${PODS_ROOT}/../../Firebase/Storage/Private\"", - "\"${PODS_ROOT}/../../Firebase/Core/Private\"", ); INFOPLIST_FILE = "Storage/Tests/Tests-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 10.2; @@ -4442,7 +4441,6 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", "\"${PODS_ROOT}/../../Firebase/Storage/Private\"", - "\"${PODS_ROOT}/../../Firebase/Core/Private\"", ); INFOPLIST_FILE = "Storage/Tests/Tests-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 10.2; @@ -4480,7 +4478,6 @@ "\"${PODS_ROOT}/../../Firebase/Database/Persistence\"", "\"${PODS_ROOT}/../../Firebase/Database/FImmutableSortedDictionary/FImmutableSortedDictionary\"", "\"${PODS_ROOT}/../../Firebase/Database/Core/View\"", - "\"${PODS_ROOT}/../../Firebase/Core/Private\"", ); INFOPLIST_FILE = "Database/Tests/FirebaseTests-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 10.2; @@ -4519,7 +4516,6 @@ "\"${PODS_ROOT}/../../Firebase/Database/Persistence\"", "\"${PODS_ROOT}/../../Firebase/Database/FImmutableSortedDictionary/FImmutableSortedDictionary\"", "\"${PODS_ROOT}/../../Firebase/Database/Core/View\"", - "\"${PODS_ROOT}/../../Firebase/Core/Private\"", ); INFOPLIST_FILE = "Database/Tests/FirebaseTests-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 10.2; @@ -4721,7 +4717,6 @@ "\"${PODS_ROOT}/../../Firebase/Auth/Source/RPCs\"", "\"${PODS_ROOT}/../../Firebase/Auth/Source\"", "\"${PODS_ROOT}/../../Firebase/Auth/Source/AuthProviders\"", - "\"${PODS_ROOT}/../../Firebase/Core/Private\"", ); INFOPLIST_FILE = "Auth/Tests/Tests-Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -4748,7 +4743,6 @@ "\"${PODS_ROOT}/../../Firebase/Auth/Source/RPCs\"", "\"${PODS_ROOT}/../../Firebase/Auth/Source\"", "\"${PODS_ROOT}/../../Firebase/Auth/Source/AuthProviders\"", - "\"${PODS_ROOT}/../../Firebase/Core/Private\"", ); INFOPLIST_FILE = "Auth/Tests/Tests-Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -4812,10 +4806,7 @@ CLANG_WARN_DOCUMENTATION_COMMENTS = YES; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = ""; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "\"${PODS_ROOT}/../../Firebase/Core/Private\"", - ); + HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "Core/Tests/Tests-Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; @@ -4836,10 +4827,7 @@ COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = ""; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "\"${PODS_ROOT}/../../Firebase/Core/Private\"", - ); + HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "Core/Tests/Tests-Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; @@ -4908,7 +4896,6 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", "\"${PODS_ROOT}/../../Firebase/Storage/Private\"", - "\"${PODS_ROOT}/../../Firebase/Core/Private\"", ); INFOPLIST_FILE = "Storage/Tests/Tests-Info.plist"; PRODUCT_BUNDLE_IDENTIFIER = "com.google.Storage-Tests-macOS"; @@ -4930,7 +4917,6 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", "\"${PODS_ROOT}/../../Firebase/Storage/Private\"", - "\"${PODS_ROOT}/../../Firebase/Core/Private\"", ); INFOPLIST_FILE = "Storage/Tests/Tests-Info.plist"; PRODUCT_BUNDLE_IDENTIFIER = "com.google.Storage-Tests-macOS"; @@ -4952,7 +4938,6 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", "\"${PODS_ROOT}/../../Firebase/Storage/Private\"", - "\"${PODS_ROOT}/../../Firebase/Core/Private\"", ); INFOPLIST_FILE = "Storage/Tests/Tests-Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -4976,7 +4961,6 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", "\"${PODS_ROOT}/../../Firebase/Storage/Private\"", - "\"${PODS_ROOT}/../../Firebase/Core/Private\"", ); INFOPLIST_FILE = "Storage/Tests/Tests-Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -5077,7 +5061,6 @@ "\"${PODS_ROOT}/../../Firebase/Database/Persistence\"", "\"${PODS_ROOT}/../../Firebase/Database/FImmutableSortedDictionary/FImmutableSortedDictionary\"", "\"${PODS_ROOT}/../../Firebase/Database/Core/View\"", - "\"${PODS_ROOT}/../../Firebase/Core/Private\"", ); INFOPLIST_FILE = "Database/Tests/FirebaseTests-Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -5117,7 +5100,6 @@ "\"${PODS_ROOT}/../../Firebase/Database/Persistence\"", "\"${PODS_ROOT}/../../Firebase/Database/FImmutableSortedDictionary/FImmutableSortedDictionary\"", "\"${PODS_ROOT}/../../Firebase/Database/Core/View\"", - "\"${PODS_ROOT}/../../Firebase/Core/Private\"", ); INFOPLIST_FILE = "Database/Tests/FirebaseTests-Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -5155,7 +5137,6 @@ "\"${PODS_ROOT}/../../Firebase/Database/Persistence\"", "\"${PODS_ROOT}/../../Firebase/Database/FImmutableSortedDictionary/FImmutableSortedDictionary\"", "\"${PODS_ROOT}/../../Firebase/Database/Core/View\"", - "\"${PODS_ROOT}/../../Firebase/Core/Private\"", ); INFOPLIST_FILE = "Database/Tests/FirebaseTests-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 10.2; @@ -5195,7 +5176,6 @@ "\"${PODS_ROOT}/../../Firebase/Database/Persistence\"", "\"${PODS_ROOT}/../../Firebase/Database/FImmutableSortedDictionary/FImmutableSortedDictionary\"", "\"${PODS_ROOT}/../../Firebase/Database/Core/View\"", - "\"${PODS_ROOT}/../../Firebase/Core/Private\"", ); INFOPLIST_FILE = "Database/Tests/FirebaseTests-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 10.2; @@ -5289,7 +5269,6 @@ "\"${PODS_ROOT}/../../Firebase/Database/Persistence\"", "\"${PODS_ROOT}/../../Firebase/Database/FImmutableSortedDictionary/FImmutableSortedDictionary\"", "\"${PODS_ROOT}/../../Firebase/Database/Core/View\"", - "\"${PODS_ROOT}/../../Firebase/Core/Private\"", ); INFOPLIST_FILE = "Database/Tests/FirebaseTests-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 10.2; @@ -5331,7 +5310,6 @@ "\"${PODS_ROOT}/../../Firebase/Database/Persistence\"", "\"${PODS_ROOT}/../../Firebase/Database/FImmutableSortedDictionary/FImmutableSortedDictionary\"", "\"${PODS_ROOT}/../../Firebase/Database/Core/View\"", - "\"${PODS_ROOT}/../../Firebase/Core/Private\"", ); INFOPLIST_FILE = "Database/Tests/FirebaseTests-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 10.2; @@ -5402,7 +5380,6 @@ "\"${PODS_ROOT}/../../Firebase/Auth/Source/RPCs\"", "\"${PODS_ROOT}/../../Firebase/Auth/Source\"", "\"${PODS_ROOT}/../../Firebase/Auth/Source/AuthProviders\"", - "\"${PODS_ROOT}/../../Firebase/Core/Private\"", ); INFOPLIST_FILE = "Auth/Tests/Tests-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 10.2; @@ -5429,7 +5406,6 @@ "\"${PODS_ROOT}/../../Firebase/Auth/Source/RPCs\"", "\"${PODS_ROOT}/../../Firebase/Auth/Source\"", "\"${PODS_ROOT}/../../Firebase/Auth/Source/AuthProviders\"", - "\"${PODS_ROOT}/../../Firebase/Core/Private\"", ); INFOPLIST_FILE = "Auth/Tests/Tests-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 10.2; @@ -5461,7 +5437,6 @@ "\"${PODS_ROOT}/Headers/Public\"", "\"${PODS_ROOT}/Headers/Public/FirebaseAnalytics\"", "\"${PODS_ROOT}/../../Firebase/Messaging\"", - "\"${PODS_ROOT}/../../Firebase/Core/Private\"", ); INFOPLIST_FILE = Messaging/Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -5493,7 +5468,6 @@ "\"${PODS_ROOT}/Headers/Public\"", "\"${PODS_ROOT}/Headers/Public/FirebaseAnalytics\"", "\"${PODS_ROOT}/../../Firebase/Messaging\"", - "\"${PODS_ROOT}/../../Firebase/Core/Private\"", ); INFOPLIST_FILE = Messaging/Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -5561,7 +5535,6 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", "\"${PODS_ROOT}/../../Firebase/Storage/Private\"", - "\"${PODS_ROOT}/../../Firebase/Core/Private\"", ); INFOPLIST_FILE = "Storage/Tests/Tests-Info.plist"; PRODUCT_BUNDLE_IDENTIFIER = "com.google.Storage-Tests-iOS"; @@ -5582,7 +5555,6 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", "\"${PODS_ROOT}/../../Firebase/Storage/Private\"", - "\"${PODS_ROOT}/../../Firebase/Core/Private\"", ); INFOPLIST_FILE = "Storage/Tests/Tests-Info.plist"; PRODUCT_BUNDLE_IDENTIFIER = "com.google.Storage-Tests-iOS"; @@ -5636,10 +5608,7 @@ CLANG_WARN_DOCUMENTATION_COMMENTS = YES; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = ""; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "\"${PODS_ROOT}/../../Firebase/Core/Private\"", - ); + HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "Core/Tests/Tests-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 10.2; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -5660,10 +5629,7 @@ COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = ""; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "\"${PODS_ROOT}/../../Firebase/Core/Private\"", - ); + HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "Core/Tests/Tests-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 10.2; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; diff --git a/Example/Messaging/Tests/FIRMessagingClientTest.m b/Example/Messaging/Tests/FIRMessagingClientTest.m index f36ec53..038e9db 100644 --- a/Example/Messaging/Tests/FIRMessagingClientTest.m +++ b/Example/Messaging/Tests/FIRMessagingClientTest.m @@ -31,7 +31,7 @@ #import "FIRMessagingUtilities.h" #import "NSError+FIRMessaging.h" -#import "FIRReachabilityChecker.h" +#import "FirebaseCommunity/FIRReachabilityChecker.h" static NSString *const kFIRMessagingUserDefaultsSuite = @"FIRMessagingClientTestUserDefaultsSuite"; diff --git a/Example/Storage/Tests/Unit/FIRStorageTestHelpers.h b/Example/Storage/Tests/Unit/FIRStorageTestHelpers.h index 4489c07..3069228 100644 --- a/Example/Storage/Tests/Unit/FIRStorageTestHelpers.h +++ b/Example/Storage/Tests/Unit/FIRStorageTestHelpers.h @@ -14,8 +14,6 @@ * limitations under the License. */ -#import "FIRAppInternal.h" - #import <Foundation/Foundation.h> #import <OCMock/OCMock.h> #import <XCTest/XCTest.h> diff --git a/Example/Storage/Tests/Unit/FIRStorageTokenAuthorizerTests.m b/Example/Storage/Tests/Unit/FIRStorageTokenAuthorizerTests.m index e98ffbb..bc60fb4 100644 --- a/Example/Storage/Tests/Unit/FIRStorageTokenAuthorizerTests.m +++ b/Example/Storage/Tests/Unit/FIRStorageTokenAuthorizerTests.m @@ -14,6 +14,8 @@ #import "FIRStorageTestHelpers.h" +#import "FirebaseCommunity/FIRAppInternal.h" + @interface FIRStorageTokenAuthorizerTests : XCTestCase @property(strong, nonatomic) GTMSessionFetcher *fetcher; diff --git a/Firebase/Core/FirebaseCore.podspec b/Firebase/Core/FirebaseCore.podspec index ca172b6..f78fe44 100644 --- a/Firebase/Core/FirebaseCore.podspec +++ b/Firebase/Core/FirebaseCore.podspec @@ -23,6 +23,7 @@ Simplify your iOS development, grow your user base, and monetize more effectivel s.osx.deployment_target = '10.10' s.source_files = '**/*.[mh]' - s.public_header_files = 'Firebase/Core/Public/*.h' + s.public_header_files = 'Firebase/Core/Public/*.h','Firebase/Core/Private/*.h' + s.private_header_files = 'Firebase/Core/Private/*.h' s.dependency 'GoogleToolboxForMac/NSData+zlib', '~> 2.1' end diff --git a/Firebase/Database/Api/FIRDatabase.m b/Firebase/Database/Api/FIRDatabase.m index 124b463..7466f4c 100644 --- a/Firebase/Database/Api/FIRDatabase.m +++ b/Firebase/Database/Api/FIRDatabase.m @@ -15,6 +15,7 @@ */ #import <Foundation/Foundation.h> +#import "FIRLogger.h" #import "FIRDatabase.h" #import "FIRDatabase_Private.h" #import "FIRDatabaseQuery_Private.h" diff --git a/Firebase/Database/Core/FPersistentConnection.m b/Firebase/Database/Core/FPersistentConnection.m index 826b995..5f4de76 100644 --- a/Firebase/Database/Core/FPersistentConnection.m +++ b/Firebase/Database/Core/FPersistentConnection.m @@ -15,6 +15,7 @@ */ #import <Foundation/Foundation.h> +#import "FIRLogger.h" #import <SystemConfiguration/SystemConfiguration.h> #import <netinet/in.h> #import <dlfcn.h> diff --git a/Firebase/Database/Core/FRepo.m b/Firebase/Database/Core/FRepo.m index bb176c0..8062933 100644 --- a/Firebase/Database/Core/FRepo.m +++ b/Firebase/Database/Core/FRepo.m @@ -16,6 +16,7 @@ #import <Foundation/Foundation.h> +#import "FIRLogger.h" #import <dlfcn.h> #import "FRepo.h" #import "FSnapshotUtilities.h" diff --git a/Firebase/Database/Core/FRepoManager.m b/Firebase/Database/Core/FRepoManager.m index 6dccf7e..6a134d2 100644 --- a/Firebase/Database/Core/FRepoManager.m +++ b/Firebase/Database/Core/FRepoManager.m @@ -14,6 +14,7 @@ * limitations under the License. */ +#import "FIRLogger.h" #import "FRepoManager.h" #import "FRepo.h" #import "FIRDatabaseQuery_Private.h" diff --git a/Firebase/Database/Core/FSyncTree.m b/Firebase/Database/Core/FSyncTree.m index 37100c1..1bbc606 100644 --- a/Firebase/Database/Core/FSyncTree.m +++ b/Firebase/Database/Core/FSyncTree.m @@ -14,6 +14,7 @@ * limitations under the License. */ +#import "FIRLogger.h" #import "FSyncTree.h" #import "FListenProvider.h" #import "FWriteTree.h" diff --git a/Firebase/Database/Core/Utilities/FIRRetryHelper.m b/Firebase/Database/Core/Utilities/FIRRetryHelper.m index 199e17d..6d79159 100644 --- a/Firebase/Database/Core/Utilities/FIRRetryHelper.m +++ b/Firebase/Database/Core/Utilities/FIRRetryHelper.m @@ -14,6 +14,7 @@ * limitations under the License. */ +#import "FIRLogger.h" #import "FIRRetryHelper.h" #import "FUtilities.h" diff --git a/Firebase/Database/Core/View/FChildEventRegistration.m b/Firebase/Database/Core/View/FChildEventRegistration.m index 6308a90..9d44ef5 100644 --- a/Firebase/Database/Core/View/FChildEventRegistration.m +++ b/Firebase/Database/Core/View/FChildEventRegistration.m @@ -14,6 +14,7 @@ * limitations under the License. */ +#import "FIRLogger.h" #import "FChildEventRegistration.h" #import "FIRDatabaseQuery_Private.h" #import "FQueryParams.h" diff --git a/Firebase/Database/Core/View/FValueEventRegistration.m b/Firebase/Database/Core/View/FValueEventRegistration.m index d351a4b..f6baa52 100644 --- a/Firebase/Database/Core/View/FValueEventRegistration.m +++ b/Firebase/Database/Core/View/FValueEventRegistration.m @@ -14,6 +14,7 @@ * limitations under the License. */ +#import "FIRLogger.h" #import "FValueEventRegistration.h" #import "FIRDatabaseQuery_Private.h" #import "FQueryParams.h" diff --git a/Firebase/Database/Login/FAuthTokenProvider.m b/Firebase/Database/Login/FAuthTokenProvider.m index d1207c6..f3c2a61 100644 --- a/Firebase/Database/Login/FAuthTokenProvider.m +++ b/Firebase/Database/Login/FAuthTokenProvider.m @@ -16,6 +16,7 @@ #import "FAuthTokenProvider.h" #import "FUtilities.h" +#import "FIRLogger.h" #import "FIRDatabaseQuery_Private.h" #import "FIRNoopAuthTokenProvider.h" diff --git a/Firebase/Database/Persistence/FLevelDBStorageEngine.m b/Firebase/Database/Persistence/FLevelDBStorageEngine.m index 2eb007a..22d67ad 100644 --- a/Firebase/Database/Persistence/FLevelDBStorageEngine.m +++ b/Firebase/Database/Persistence/FLevelDBStorageEngine.m @@ -18,6 +18,7 @@ #import "FLevelDBStorageEngine.h" +#import "FIRLogger.h" #import "APLevelDB.h" #import "FSnapshotUtilities.h" #import "FWriteRecord.h" diff --git a/Firebase/Database/Persistence/FPersistenceManager.m b/Firebase/Database/Persistence/FPersistenceManager.m index fb38192..0ae75b3 100644 --- a/Firebase/Database/Persistence/FPersistenceManager.m +++ b/Firebase/Database/Persistence/FPersistenceManager.m @@ -14,6 +14,7 @@ * limitations under the License. */ +#import "FIRLogger.h" #import "FPersistenceManager.h" #import "FLevelDBStorageEngine.h" #import "FCacheNode.h" diff --git a/Firebase/Database/Persistence/FTrackedQueryManager.m b/Firebase/Database/Persistence/FTrackedQueryManager.m index bf9753d..9673fb7 100644 --- a/Firebase/Database/Persistence/FTrackedQueryManager.m +++ b/Firebase/Database/Persistence/FTrackedQueryManager.m @@ -14,6 +14,7 @@ * limitations under the License. */ +#import "FIRLogger.h" #import "FTrackedQueryManager.h" #import "FImmutableTree.h" #import "FLevelDBStorageEngine.h" diff --git a/Firebase/Database/Realtime/FConnection.m b/Firebase/Database/Realtime/FConnection.m index 53f434c..50756e6 100644 --- a/Firebase/Database/Realtime/FConnection.m +++ b/Firebase/Database/Realtime/FConnection.m @@ -14,6 +14,7 @@ * limitations under the License. */ +#import "FIRLogger.h" #import "FConnection.h" #import "FConstants.h" diff --git a/Firebase/Database/Realtime/FWebSocketConnection.m b/Firebase/Database/Realtime/FWebSocketConnection.m index 5cd8bb0..fe90344 100644 --- a/Firebase/Database/Realtime/FWebSocketConnection.m +++ b/Firebase/Database/Realtime/FWebSocketConnection.m @@ -18,6 +18,7 @@ #import <Foundation/Foundation.h> +#import "FIRLogger.h" #import "FWebSocketConnection.h" #import "FConstants.h" #import "FIRDatabaseReference.h" diff --git a/Firebase/Database/Utilities/FUtilities.h b/Firebase/Database/Utilities/FUtilities.h index f5e312f..f7fe7a5 100644 --- a/Firebase/Database/Utilities/FUtilities.h +++ b/Firebase/Database/Utilities/FUtilities.h @@ -15,7 +15,6 @@ */ #import <Foundation/Foundation.h> -#import "FIRLogger.h" #import "FParsedUrl.h" @interface FUtilities : NSObject diff --git a/Firebase/Database/Utilities/FUtilities.m b/Firebase/Database/Utilities/FUtilities.m index 93b892a..befe874 100644 --- a/Firebase/Database/Utilities/FUtilities.m +++ b/Firebase/Database/Utilities/FUtilities.m @@ -14,6 +14,7 @@ * limitations under the License. */ +#import "FIRLogger.h" #import "FUtilities.h" #import "FStringUtilities.h" #import "FConstants.h" diff --git a/Firebase/Firebase/Firebase.h b/Firebase/Firebase/FirebaseCommunity.h index f74e49f..ee37a76 100644 --- a/Firebase/Firebase/Firebase.h +++ b/Firebase/Firebase/FirebaseCommunity.h @@ -18,28 +18,24 @@ #error "Firebase.h won't import anything if your compiler doesn't support __has_include. Please \ import the headers individually." #else - #if __has_include(<Firebase/FirebaseCore.h>) - #import <Firebase/FirebaseCore.h> + #if __has_include(<FirebaseCommunity/FirebaseCore.h>) + #import <FirebaseCommunity/FirebaseCore.h> #endif #if __has_include(<FirebaseAnalytics/FirebaseAnalytics.h>) #import <FirebaseAnalytics/FirebaseAnalytics.h> #endif - #if __has_include(<FirebaseAppIndexing/FirebaseAppIndexing.h>) - #import <FirebaseAppIndexing/FirebaseAppIndexing.h> - #endif - - #if __has_include(<Firebase/FirebaseAuth.h>) - #import <Firebase/FirebaseAuth.h> + #if __has_include(<FirebaseCommunity/FirebaseAuth.h>) + #import <FirebaseCommunity/FirebaseAuth.h> #endif #if __has_include(<FirebaseCrash/FirebaseCrash.h>) #import <FirebaseCrash/FirebaseCrash.h> #endif - #if __has_include(<Firebase/FirebaseDatabase.h>) - #import <Firebase/FirebaseDatabase.h> + #if __has_include(<FirebaseCommunity/FirebaseDatabase.h>) + #import <FirebaseCommunity/FirebaseDatabase.h> #endif #if __has_include(<FirebaseDynamicLinks/FirebaseDynamicLinks.h>) @@ -54,16 +50,16 @@ #import <FirebaseInvites/FirebaseInvites.h> #endif - #if __has_include(<Firebase/FirebaseMessaging.h>) - #import <Firebase/FirebaseMessaging.h> + #if __has_include(<FirebaseCommunity/FirebaseMessaging.h>) + #import <FirebaseCommunity/FirebaseMessaging.h> #endif #if __has_include(<FirebaseRemoteConfig/FirebaseRemoteConfig.h>) #import <FirebaseRemoteConfig/FirebaseRemoteConfig.h> #endif - #if __has_include(<Firebase/FirebaseStorage.h>) - #import <Firebase/FirebaseStorage.h> + #if __has_include(<FirebaseCommunity/FirebaseStorage.h>) + #import <FirebaseCommunity/FirebaseStorage.h> #endif #if __has_include(<GoogleMobileAds/GoogleMobileAds.h>) diff --git a/Firebase/Firebase/module.modulemap b/Firebase/Firebase/module.modulemap new file mode 100644 index 0000000..8e6c477 --- /dev/null +++ b/Firebase/Firebase/module.modulemap @@ -0,0 +1,6 @@ +framework module FirebaseCommunity { + umbrella header "FirebaseCommunity.h" + + export * + module * { export * } +} diff --git a/Firebase/Storage/FIRStorageTokenAuthorizer.m b/Firebase/Storage/FIRStorageTokenAuthorizer.m index 36b94a9..b90dd3f 100644 --- a/Firebase/Storage/FIRStorageTokenAuthorizer.m +++ b/Firebase/Storage/FIRStorageTokenAuthorizer.m @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "../../Firebase/Core/Private/FIRAppInternal.h" +#import "FIRAppInternal.h" #import "FIRStorageTokenAuthorizer.h" diff --git a/FirebaseCommunity.podspec b/FirebaseCommunity.podspec index 7b06860..e476555 100644 --- a/FirebaseCommunity.podspec +++ b/FirebaseCommunity.podspec @@ -19,16 +19,17 @@ Firebase Development CocoaPod including experimental and community supported fea s.osx.deployment_target = '10.10' s.default_subspec = 'Root' s.preserve_paths = 'README.md' + s.module_map = 'Firebase/Firebase/module.modulemap' s.subspec 'Root' do |sp| - sp.source_files = 'Firebase/Firebase/Firebase.h' - sp.public_header_files = 'Firebase/Firebase/Firebase.h' - sp.user_target_xcconfig = { 'HEADER_SEARCH_PATHS' => '$(inherited) "${PODS_ROOT}/Firebase/Firebase/Firebase"' } + sp.source_files = 'Firebase/Firebase/FirebaseCommunity.h' + sp.public_header_files = 'Firebase/Firebase/FirebaseCommunity.h' end s.subspec 'Core' do |sp| sp.source_files = 'Firebase/Core/**/*.[mh]' - sp.public_header_files = 'Firebase/Core/Public/*.h' + sp.public_header_files = 'Firebase/Core/Public/*.h','Firebase/Core/Private/*.h', + sp.private_header_files = 'Firebase/Core/Private/*.h' sp.dependency 'GoogleToolboxForMac/NSData+zlib', '~> 2.1' sp.dependency 'FirebaseCommunity/Root' end |