diff options
-rw-r--r-- | Example/Auth/Tests/FIRAuthTests.m | 8 | ||||
-rw-r--r-- | Example/Auth/Tests/FIRGitHubAuthProviderTests.m | 2 | ||||
-rw-r--r-- | Example/Auth/Tests/FIRPhoneAuthProviderTests.m | 2 | ||||
-rw-r--r-- | Example/Auth/Tests/FIRTwitterAuthProviderTests.m | 2 | ||||
-rw-r--r-- | Example/Auth/Tests/FIRUserTests.m | 8 | ||||
-rw-r--r-- | Firebase/Auth/FirebaseAuth.podspec | 21 | ||||
-rw-r--r-- | Firebase/Auth/Source/FIRUser.m | 4 | ||||
-rw-r--r-- | Firebase/Auth/Source/Public/FIRAdditionalUserInfo.h (renamed from Firebase/Auth/Source/FIRAdditionalUserInfo.h) | 0 | ||||
-rw-r--r-- | Firebase/Auth/Source/Public/FIRAuth.h (renamed from Firebase/Auth/Source/FIRAuth.h) | 0 | ||||
-rw-r--r-- | Firebase/Auth/Source/Public/FIRAuthAPNSTokenType.h (renamed from Firebase/Auth/Source/FIRAuthAPNSTokenType.h) | 0 | ||||
-rw-r--r-- | Firebase/Auth/Source/Public/FIRAuthCredential.h (renamed from Firebase/Auth/Source/FIRAuthCredential.h) | 0 | ||||
-rw-r--r-- | Firebase/Auth/Source/Public/FIRAuthDataResult.h (renamed from Firebase/Auth/Source/FIRAuthDataResult.h) | 0 | ||||
-rw-r--r-- | Firebase/Auth/Source/Public/FIRAuthErrors.h (renamed from Firebase/Auth/Source/FIRAuthErrors.h) | 0 | ||||
-rw-r--r-- | Firebase/Auth/Source/Public/FIRAuthSwiftNameSupport.h (renamed from Firebase/Auth/Source/FIRAuthSwiftNameSupport.h) | 0 | ||||
-rw-r--r-- | Firebase/Auth/Source/Public/FIREmailAuthProvider.h (renamed from Firebase/Auth/Source/AuthProviders/EmailPassword/FIREmailAuthProvider.h) | 0 | ||||
-rw-r--r-- | Firebase/Auth/Source/Public/FIRFacebookAuthProvider.h (renamed from Firebase/Auth/Source/AuthProviders/Facebook/FIRFacebookAuthProvider.h) | 0 | ||||
-rw-r--r-- | Firebase/Auth/Source/Public/FIRGitHubAuthProvider.h (renamed from Firebase/Auth/Source/AuthProviders/GitHub/FIRGitHubAuthProvider.h) | 0 | ||||
-rw-r--r-- | Firebase/Auth/Source/Public/FIRGoogleAuthProvider.h (renamed from Firebase/Auth/Source/AuthProviders/Google/FIRGoogleAuthProvider.h) | 0 | ||||
-rw-r--r-- | Firebase/Auth/Source/Public/FIROAuthProvider.h (renamed from Firebase/Auth/Source/AuthProviders/OAuth/FIROAuthProvider.h) | 0 | ||||
-rw-r--r-- | Firebase/Auth/Source/Public/FIRPhoneAuthCredential.h (renamed from Firebase/Auth/Source/AuthProviders/Phone/FIRPhoneAuthCredential.h) | 0 | ||||
-rw-r--r-- | Firebase/Auth/Source/Public/FIRPhoneAuthProvider.h (renamed from Firebase/Auth/Source/AuthProviders/Phone/FIRPhoneAuthProvider.h) | 0 | ||||
-rw-r--r-- | Firebase/Auth/Source/Public/FIRTwitterAuthProvider.h (renamed from Firebase/Auth/Source/AuthProviders/Twitter/FIRTwitterAuthProvider.h) | 0 | ||||
-rw-r--r-- | Firebase/Auth/Source/Public/FIRUser.h (renamed from Firebase/Auth/Source/FIRUser.h) | 0 | ||||
-rw-r--r-- | Firebase/Auth/Source/Public/FIRUserInfo.h (renamed from Firebase/Auth/Source/FIRUserInfo.h) | 0 | ||||
-rw-r--r-- | Firebase/Auth/Source/Public/FirebaseAuth.h (renamed from Firebase/Auth/Source/FirebaseAuth.h) | 0 | ||||
-rw-r--r-- | Firebase/Auth/Source/Public/FirebaseAuthVersion.h (renamed from Firebase/Auth/Source/FirebaseAuthVersion.h) | 0 | ||||
-rw-r--r-- | Firebase/Auth/Source/RPCs/FIRAuthBackend.m | 2 | ||||
-rw-r--r-- | Firebase/Core/FirebaseCore.podspec | 10 | ||||
-rw-r--r-- | Firebase/Core/Private/FIRAnalyticsConfiguration+Internal.h | 2 | ||||
-rw-r--r-- | Firebase/Core/Private/FIRNetworkLoggerProtocol.h | 2 | ||||
-rw-r--r-- | Firebase/Core/Private/FIROptionsInternal.h | 2 | ||||
-rw-r--r-- | Firebase/Core/Public/FIRAnalyticsConfiguration.h (renamed from Firebase/Core/FIRAnalyticsConfiguration.h) | 0 | ||||
-rw-r--r-- | Firebase/Core/Public/FIRApp.h (renamed from Firebase/Core/FIRApp.h) | 0 | ||||
-rw-r--r-- | Firebase/Core/Public/FIRConfiguration.h (renamed from Firebase/Core/FIRConfiguration.h) | 0 | ||||
-rw-r--r-- | Firebase/Core/Public/FIRCoreSwiftNameSupport.h (renamed from Firebase/Core/FIRCoreSwiftNameSupport.h) | 0 | ||||
-rw-r--r-- | Firebase/Core/Public/FIRLoggerLevel.h (renamed from Firebase/Core/FIRLoggerLevel.h) | 0 | ||||
-rw-r--r-- | Firebase/Core/Public/FIROptions.h (renamed from Firebase/Core/FIROptions.h) | 0 | ||||
-rw-r--r-- | Firebase/Core/Public/FirebaseCore.h (renamed from Firebase/Core/FirebaseCore.h) | 0 | ||||
-rw-r--r-- | Firebase/Database/FirebaseDatabase.podspec | 12 | ||||
-rw-r--r-- | Firebase/Database/Public/FIRDataEventType.h (renamed from Firebase/Database/Api/FIRDataEventType.h) | 0 | ||||
-rw-r--r-- | Firebase/Database/Public/FIRDataSnapshot.h (renamed from Firebase/Database/Api/FIRDataSnapshot.h) | 0 | ||||
-rw-r--r-- | Firebase/Database/Public/FIRDatabase.h (renamed from Firebase/Database/Api/FIRDatabase.h) | 0 | ||||
-rw-r--r-- | Firebase/Database/Public/FIRDatabaseQuery.h (renamed from Firebase/Database/Api/FIRDatabaseQuery.h) | 0 | ||||
-rw-r--r-- | Firebase/Database/Public/FIRDatabaseReference.h (renamed from Firebase/Database/FIRDatabaseReference.h) | 0 | ||||
-rw-r--r-- | Firebase/Database/Public/FIRDatabaseSwiftNameSupport.h (renamed from Firebase/Database/Api/FIRDatabaseSwiftNameSupport.h) | 0 | ||||
-rw-r--r-- | Firebase/Database/Public/FIRMutableData.h (renamed from Firebase/Database/Api/FIRMutableData.h) | 0 | ||||
-rw-r--r-- | Firebase/Database/Public/FIRServerValue.h (renamed from Firebase/Database/Api/FIRServerValue.h) | 0 | ||||
-rw-r--r-- | Firebase/Database/Public/FIRTransactionResult.h (renamed from Firebase/Database/Api/FIRTransactionResult.h) | 0 | ||||
-rw-r--r-- | Firebase/Database/Public/FirebaseDatabase.h (renamed from Firebase/Database/Api/FirebaseDatabase.h) | 0 | ||||
-rw-r--r-- | Firebase/Messaging/FirebaseMessaging.podspec | 5 | ||||
-rw-r--r-- | Firebase/Storage/FirebaseStorage.podspec | 15 | ||||
-rw-r--r-- | Firebase/Storage/Public/FIRStorage.h (renamed from Firebase/Storage/FIRStorage.h) | 0 | ||||
-rw-r--r-- | Firebase/Storage/Public/FIRStorageConstants.h (renamed from Firebase/Storage/FIRStorageConstants.h) | 0 | ||||
-rw-r--r-- | Firebase/Storage/Public/FIRStorageDownloadTask.h (renamed from Firebase/Storage/FIRStorageDownloadTask.h) | 0 | ||||
-rw-r--r-- | Firebase/Storage/Public/FIRStorageMetadata.h (renamed from Firebase/Storage/FIRStorageMetadata.h) | 0 | ||||
-rw-r--r-- | Firebase/Storage/Public/FIRStorageObservableTask.h (renamed from Firebase/Storage/FIRStorageObservableTask.h) | 0 | ||||
-rw-r--r-- | Firebase/Storage/Public/FIRStorageReference.h (renamed from Firebase/Storage/FIRStorageReference.h) | 0 | ||||
-rw-r--r-- | Firebase/Storage/Public/FIRStorageSwiftNameSupport.h (renamed from Firebase/Storage/FIRStorageSwiftNameSupport.h) | 0 | ||||
-rw-r--r-- | Firebase/Storage/Public/FIRStorageTask.h (renamed from Firebase/Storage/FIRStorageTask.h) | 0 | ||||
-rw-r--r-- | Firebase/Storage/Public/FIRStorageTaskSnapshot.h (renamed from Firebase/Storage/FIRStorageTaskSnapshot.h) | 0 | ||||
-rw-r--r-- | Firebase/Storage/Public/FIRStorageUploadTask.h (renamed from Firebase/Storage/FIRStorageUploadTask.h) | 0 | ||||
-rw-r--r-- | Firebase/Storage/Public/FirebaseStorage.h (renamed from Firebase/Storage/FirebaseStorage.h) | 0 | ||||
-rw-r--r-- | FirebaseCommunity.podspec | 59 |
63 files changed, 27 insertions, 129 deletions
diff --git a/Example/Auth/Tests/FIRAuthTests.m b/Example/Auth/Tests/FIRAuthTests.m index f6793cb..6e4971a 100644 --- a/Example/Auth/Tests/FIRAuthTests.m +++ b/Example/Auth/Tests/FIRAuthTests.m @@ -19,9 +19,9 @@ #import <XCTest/XCTest.h> #import "FIRAppInternal.h" -#import "EmailPassword/FIREmailAuthProvider.h" -#import "Google/FIRGoogleAuthProvider.h" -#import "Phone/FIRPhoneAuthCredential.h" +#import "FIREmailAuthProvider.h" +#import "FIRGoogleAuthProvider.h" +#import "FIRPhoneAuthCredential.h" #import "FIRAdditionalUserInfo.h" #import "FIRAuth_Internal.h" #import "FIRAuthErrorUtils.h" @@ -56,7 +56,7 @@ #import <OCMock/OCMock.h> #if TARGET_OS_IOS -#import "Phone/FIRPhoneAuthProvider.h" +#import "FIRPhoneAuthProvider.h" #endif /** @var kFirebaseAppName1 diff --git a/Example/Auth/Tests/FIRGitHubAuthProviderTests.m b/Example/Auth/Tests/FIRGitHubAuthProviderTests.m index dfcd87f..7d02d74 100644 --- a/Example/Auth/Tests/FIRGitHubAuthProviderTests.m +++ b/Example/Auth/Tests/FIRGitHubAuthProviderTests.m @@ -16,7 +16,7 @@ #import <XCTest/XCTest.h> -#import "GitHub/FIRGitHubAuthProvider.h" +#import "FIRGitHubAuthProvider.h" #import "FIRAuthCredential_Internal.h" #import "FIRVerifyAssertionRequest.h" diff --git a/Example/Auth/Tests/FIRPhoneAuthProviderTests.m b/Example/Auth/Tests/FIRPhoneAuthProviderTests.m index f907601..b7b8bf3 100644 --- a/Example/Auth/Tests/FIRPhoneAuthProviderTests.m +++ b/Example/Auth/Tests/FIRPhoneAuthProviderTests.m @@ -16,7 +16,7 @@ #import <XCTest/XCTest.h> -#import "Phone/FIRPhoneAuthProvider.h" +#import "FIRPhoneAuthProvider.h" #import "Phone/FIRPhoneAuthCredential_Internal.h" #import "Phone/NSString+FIRAuth.h" #import "FIRAuthAPNSToken.h" diff --git a/Example/Auth/Tests/FIRTwitterAuthProviderTests.m b/Example/Auth/Tests/FIRTwitterAuthProviderTests.m index da02c43..5b9c0fc 100644 --- a/Example/Auth/Tests/FIRTwitterAuthProviderTests.m +++ b/Example/Auth/Tests/FIRTwitterAuthProviderTests.m @@ -16,7 +16,7 @@ #import <XCTest/XCTest.h> -#import "Twitter/FIRTwitterAuthProvider.h" +#import "FIRTwitterAuthProvider.h" #import "FIRAuthCredential_Internal.h" #import "FIRVerifyAssertionRequest.h" diff --git a/Example/Auth/Tests/FIRUserTests.m b/Example/Auth/Tests/FIRUserTests.m index 7e396c2..5905d97 100644 --- a/Example/Auth/Tests/FIRUserTests.m +++ b/Example/Auth/Tests/FIRUserTests.m @@ -18,9 +18,9 @@ #import <XCTest/XCTest.h> -#import "EmailPassword/FIREmailAuthProvider.h" -#import "Facebook/FIRFacebookAuthProvider.h" -#import "Google/FIRGoogleAuthProvider.h" +#import "FIREmailAuthProvider.h" +#import "FIRFacebookAuthProvider.h" +#import "FIRGoogleAuthProvider.h" #import "Phone/FIRPhoneAuthCredential_Internal.h" #import "FIRAdditionalUserInfo.h" #import "FIRAuth.h" @@ -44,7 +44,7 @@ #import <OCMock/OCMock.h> #if TARGET_OS_IOS -#import "Phone/FIRPhoneAuthProvider.h" +#import "FIRPhoneAuthProvider.h" #endif NS_ASSUME_NONNULL_BEGIN diff --git a/Firebase/Auth/FirebaseAuth.podspec b/Firebase/Auth/FirebaseAuth.podspec index cda5f06..b6cd526 100644 --- a/Firebase/Auth/FirebaseAuth.podspec +++ b/Firebase/Auth/FirebaseAuth.podspec @@ -31,26 +31,7 @@ Simplify your iOS development, grow your user base, and monetize more effectivel 'Source/**/FIRAuthAPNSTokenType.[mh]', 'Source/**/FIRAuthAPNSToken.[mh]', 'Source/**/FIRPhoneAuthProvider.[mh]' - s.public_header_files = - 'Source/FirebaseAuth.h', - 'Source/FirebaseAuthVersion.h', - 'Source/FIRAdditionalUserInfo.h', - 'Source/FIRAuth.h', - 'Source/FIRAuthAPNSTokenType.h', - 'Source/FIRAuthCredential.h', - 'Source/FIRAuthDataResult.h', - 'Source/FIRAuthErrors.h', - 'Source/FIRAuthSwiftNameSupport.h', - 'Source/AuthProviders/EmailPassword/FIREmailAuthProvider.h', - 'Source/AuthProviders/Facebook/FIRFacebookAuthProvider.h', - 'Source/AuthProviders/GitHub/FIRGitHubAuthProvider.h', - 'Source/AuthProviders/Google/FIRGoogleAuthProvider.h', - 'Source/AuthProviders/OAuth/FIROAuthProvider.h', - 'Source/AuthProviders/Phone/FIRPhoneAuthCredential.h', - 'Source/AuthProviders/Phone/FIRPhoneAuthProvider.h', - 'Source/AuthProviders/Twitter/FIRTwitterAuthProvider.h', - 'Source/FIRUser.h', - 'Source/FIRUserInfo.h' + s.public_header_files = 'Source/Public/*.h' s.preserve_paths = 'README.md', 'CHANGELOG.md' diff --git a/Firebase/Auth/Source/FIRUser.m b/Firebase/Auth/Source/FIRUser.m index 64c29a8..de9745d 100644 --- a/Firebase/Auth/Source/FIRUser.m +++ b/Firebase/Auth/Source/FIRUser.m @@ -19,7 +19,7 @@ #import "Private/FIRUser_Internal.h" #import "AuthProviders/EmailPassword/FIREmailPasswordAuthCredential.h" -#import "AuthProviders/EmailPassword/FIREmailAuthProvider.h" +#import "FIREmailAuthProvider.h" #import "AuthProviders/Phone/FIRPhoneAuthCredential_Internal.h" #import "Private/FIRAdditionalUserInfo_Internal.h" #import "FIRAuth.h" @@ -50,7 +50,7 @@ #import "FIRVerifyPhoneNumberResponse.h" #if TARGET_OS_IOS -#import "AuthProviders/Phone/FIRPhoneAuthProvider.h" +#import "FIRPhoneAuthProvider.h" #endif NS_ASSUME_NONNULL_BEGIN diff --git a/Firebase/Auth/Source/FIRAdditionalUserInfo.h b/Firebase/Auth/Source/Public/FIRAdditionalUserInfo.h index 70e9e57..70e9e57 100644 --- a/Firebase/Auth/Source/FIRAdditionalUserInfo.h +++ b/Firebase/Auth/Source/Public/FIRAdditionalUserInfo.h diff --git a/Firebase/Auth/Source/FIRAuth.h b/Firebase/Auth/Source/Public/FIRAuth.h index 356c8dd..356c8dd 100644 --- a/Firebase/Auth/Source/FIRAuth.h +++ b/Firebase/Auth/Source/Public/FIRAuth.h diff --git a/Firebase/Auth/Source/FIRAuthAPNSTokenType.h b/Firebase/Auth/Source/Public/FIRAuthAPNSTokenType.h index 87df574..87df574 100644 --- a/Firebase/Auth/Source/FIRAuthAPNSTokenType.h +++ b/Firebase/Auth/Source/Public/FIRAuthAPNSTokenType.h diff --git a/Firebase/Auth/Source/FIRAuthCredential.h b/Firebase/Auth/Source/Public/FIRAuthCredential.h index ce28854..ce28854 100644 --- a/Firebase/Auth/Source/FIRAuthCredential.h +++ b/Firebase/Auth/Source/Public/FIRAuthCredential.h diff --git a/Firebase/Auth/Source/FIRAuthDataResult.h b/Firebase/Auth/Source/Public/FIRAuthDataResult.h index e72adf2..e72adf2 100644 --- a/Firebase/Auth/Source/FIRAuthDataResult.h +++ b/Firebase/Auth/Source/Public/FIRAuthDataResult.h diff --git a/Firebase/Auth/Source/FIRAuthErrors.h b/Firebase/Auth/Source/Public/FIRAuthErrors.h index 0b161f7..0b161f7 100644 --- a/Firebase/Auth/Source/FIRAuthErrors.h +++ b/Firebase/Auth/Source/Public/FIRAuthErrors.h diff --git a/Firebase/Auth/Source/FIRAuthSwiftNameSupport.h b/Firebase/Auth/Source/Public/FIRAuthSwiftNameSupport.h index 55e1bcc..55e1bcc 100644 --- a/Firebase/Auth/Source/FIRAuthSwiftNameSupport.h +++ b/Firebase/Auth/Source/Public/FIRAuthSwiftNameSupport.h diff --git a/Firebase/Auth/Source/AuthProviders/EmailPassword/FIREmailAuthProvider.h b/Firebase/Auth/Source/Public/FIREmailAuthProvider.h index 4fb5ea0..4fb5ea0 100644 --- a/Firebase/Auth/Source/AuthProviders/EmailPassword/FIREmailAuthProvider.h +++ b/Firebase/Auth/Source/Public/FIREmailAuthProvider.h diff --git a/Firebase/Auth/Source/AuthProviders/Facebook/FIRFacebookAuthProvider.h b/Firebase/Auth/Source/Public/FIRFacebookAuthProvider.h index 2307b08..2307b08 100644 --- a/Firebase/Auth/Source/AuthProviders/Facebook/FIRFacebookAuthProvider.h +++ b/Firebase/Auth/Source/Public/FIRFacebookAuthProvider.h diff --git a/Firebase/Auth/Source/AuthProviders/GitHub/FIRGitHubAuthProvider.h b/Firebase/Auth/Source/Public/FIRGitHubAuthProvider.h index ab5c0ef..ab5c0ef 100644 --- a/Firebase/Auth/Source/AuthProviders/GitHub/FIRGitHubAuthProvider.h +++ b/Firebase/Auth/Source/Public/FIRGitHubAuthProvider.h diff --git a/Firebase/Auth/Source/AuthProviders/Google/FIRGoogleAuthProvider.h b/Firebase/Auth/Source/Public/FIRGoogleAuthProvider.h index 92f0db2..92f0db2 100644 --- a/Firebase/Auth/Source/AuthProviders/Google/FIRGoogleAuthProvider.h +++ b/Firebase/Auth/Source/Public/FIRGoogleAuthProvider.h diff --git a/Firebase/Auth/Source/AuthProviders/OAuth/FIROAuthProvider.h b/Firebase/Auth/Source/Public/FIROAuthProvider.h index e059b22..e059b22 100644 --- a/Firebase/Auth/Source/AuthProviders/OAuth/FIROAuthProvider.h +++ b/Firebase/Auth/Source/Public/FIROAuthProvider.h diff --git a/Firebase/Auth/Source/AuthProviders/Phone/FIRPhoneAuthCredential.h b/Firebase/Auth/Source/Public/FIRPhoneAuthCredential.h index d951564..d951564 100644 --- a/Firebase/Auth/Source/AuthProviders/Phone/FIRPhoneAuthCredential.h +++ b/Firebase/Auth/Source/Public/FIRPhoneAuthCredential.h diff --git a/Firebase/Auth/Source/AuthProviders/Phone/FIRPhoneAuthProvider.h b/Firebase/Auth/Source/Public/FIRPhoneAuthProvider.h index 402edb5..402edb5 100644 --- a/Firebase/Auth/Source/AuthProviders/Phone/FIRPhoneAuthProvider.h +++ b/Firebase/Auth/Source/Public/FIRPhoneAuthProvider.h diff --git a/Firebase/Auth/Source/AuthProviders/Twitter/FIRTwitterAuthProvider.h b/Firebase/Auth/Source/Public/FIRTwitterAuthProvider.h index d8f647d..d8f647d 100644 --- a/Firebase/Auth/Source/AuthProviders/Twitter/FIRTwitterAuthProvider.h +++ b/Firebase/Auth/Source/Public/FIRTwitterAuthProvider.h diff --git a/Firebase/Auth/Source/FIRUser.h b/Firebase/Auth/Source/Public/FIRUser.h index 9e3ac77..9e3ac77 100644 --- a/Firebase/Auth/Source/FIRUser.h +++ b/Firebase/Auth/Source/Public/FIRUser.h diff --git a/Firebase/Auth/Source/FIRUserInfo.h b/Firebase/Auth/Source/Public/FIRUserInfo.h index 03f2038..03f2038 100644 --- a/Firebase/Auth/Source/FIRUserInfo.h +++ b/Firebase/Auth/Source/Public/FIRUserInfo.h diff --git a/Firebase/Auth/Source/FirebaseAuth.h b/Firebase/Auth/Source/Public/FirebaseAuth.h index ef4aca6..ef4aca6 100644 --- a/Firebase/Auth/Source/FirebaseAuth.h +++ b/Firebase/Auth/Source/Public/FirebaseAuth.h diff --git a/Firebase/Auth/Source/FirebaseAuthVersion.h b/Firebase/Auth/Source/Public/FirebaseAuthVersion.h index 1b2d06a..1b2d06a 100644 --- a/Firebase/Auth/Source/FirebaseAuthVersion.h +++ b/Firebase/Auth/Source/Public/FirebaseAuthVersion.h diff --git a/Firebase/Auth/Source/RPCs/FIRAuthBackend.m b/Firebase/Auth/Source/RPCs/FIRAuthBackend.m index d89e3c6..26ce790 100644 --- a/Firebase/Auth/Source/RPCs/FIRAuthBackend.m +++ b/Firebase/Auth/Source/RPCs/FIRAuthBackend.m @@ -56,7 +56,7 @@ #import <GTMSessionFetcher/GTMSessionFetcherService.h> #if TARGET_OS_IOS -#import "../AuthProviders/Phone/FIRPhoneAuthProvider.h" +#import "FIRPhoneAuthProvider.h" #endif /** @var kClientVersionHeader diff --git a/Firebase/Core/FirebaseCore.podspec b/Firebase/Core/FirebaseCore.podspec index b4fbef1..ca172b6 100644 --- a/Firebase/Core/FirebaseCore.podspec +++ b/Firebase/Core/FirebaseCore.podspec @@ -23,14 +23,6 @@ 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 = - 'FirebaseCore.h', - 'FIRAnalyticsConfiguration.h', - 'FIRApp.h', - 'FIRConfiguration.h', - 'FIRLoggerLevel.h', - 'FIROptions.h', - 'FIRCoreSwiftNameSupport.h' - + s.public_header_files = 'Firebase/Core/Public/*.h' s.dependency 'GoogleToolboxForMac/NSData+zlib', '~> 2.1' end diff --git a/Firebase/Core/Private/FIRAnalyticsConfiguration+Internal.h b/Firebase/Core/Private/FIRAnalyticsConfiguration+Internal.h index 6c57a0f..8ea4cea 100644 --- a/Firebase/Core/Private/FIRAnalyticsConfiguration+Internal.h +++ b/Firebase/Core/Private/FIRAnalyticsConfiguration+Internal.h @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "../FIRAnalyticsConfiguration.h" +#import "FIRAnalyticsConfiguration.h" /// Values stored in analyticsEnabledState. Never alter these constants since they must match with /// values persisted to disk. diff --git a/Firebase/Core/Private/FIRNetworkLoggerProtocol.h b/Firebase/Core/Private/FIRNetworkLoggerProtocol.h index 7b7d094..70cc56d 100644 --- a/Firebase/Core/Private/FIRNetworkLoggerProtocol.h +++ b/Firebase/Core/Private/FIRNetworkLoggerProtocol.h @@ -17,7 +17,7 @@ @import Foundation; #import "FIRNetworkMessageCode.h" -#import "../FIRLoggerLevel.h" +#import "FIRLoggerLevel.h" /// The log levels used by FIRNetworkLogger. typedef NS_ENUM(NSInteger, FIRNetworkLogLevel) { diff --git a/Firebase/Core/Private/FIROptionsInternal.h b/Firebase/Core/Private/FIROptionsInternal.h index 2b30248..859ac5c 100644 --- a/Firebase/Core/Private/FIROptionsInternal.h +++ b/Firebase/Core/Private/FIROptionsInternal.h @@ -14,7 +14,7 @@ * limitations under the License. */ -#import "../FIROptions.h" +#import "FIROptions.h" /** * Keys for the strings in the plist file. diff --git a/Firebase/Core/FIRAnalyticsConfiguration.h b/Firebase/Core/Public/FIRAnalyticsConfiguration.h index f42eaf5..f42eaf5 100644 --- a/Firebase/Core/FIRAnalyticsConfiguration.h +++ b/Firebase/Core/Public/FIRAnalyticsConfiguration.h diff --git a/Firebase/Core/FIRApp.h b/Firebase/Core/Public/FIRApp.h index 8f52e1a..8f52e1a 100644 --- a/Firebase/Core/FIRApp.h +++ b/Firebase/Core/Public/FIRApp.h diff --git a/Firebase/Core/FIRConfiguration.h b/Firebase/Core/Public/FIRConfiguration.h index 496b211..496b211 100644 --- a/Firebase/Core/FIRConfiguration.h +++ b/Firebase/Core/Public/FIRConfiguration.h diff --git a/Firebase/Core/FIRCoreSwiftNameSupport.h b/Firebase/Core/Public/FIRCoreSwiftNameSupport.h index 55e1bcc..55e1bcc 100644 --- a/Firebase/Core/FIRCoreSwiftNameSupport.h +++ b/Firebase/Core/Public/FIRCoreSwiftNameSupport.h diff --git a/Firebase/Core/FIRLoggerLevel.h b/Firebase/Core/Public/FIRLoggerLevel.h index 70e99ee..70e99ee 100644 --- a/Firebase/Core/FIRLoggerLevel.h +++ b/Firebase/Core/Public/FIRLoggerLevel.h diff --git a/Firebase/Core/FIROptions.h b/Firebase/Core/Public/FIROptions.h index 7bc2406..7bc2406 100644 --- a/Firebase/Core/FIROptions.h +++ b/Firebase/Core/Public/FIROptions.h diff --git a/Firebase/Core/FirebaseCore.h b/Firebase/Core/Public/FirebaseCore.h index fa26f69..fa26f69 100644 --- a/Firebase/Core/FirebaseCore.h +++ b/Firebase/Core/Public/FirebaseCore.h diff --git a/Firebase/Database/FirebaseDatabase.podspec b/Firebase/Database/FirebaseDatabase.podspec index e41e7a5..758556b 100644 --- a/Firebase/Database/FirebaseDatabase.podspec +++ b/Firebase/Database/FirebaseDatabase.podspec @@ -25,17 +25,7 @@ Simplify your iOS development, grow your user base, and monetize more effectivel s.source_files = '**/*.[mh]', 'third_party/Wrap-leveldb/APLevelDB.mm', 'third_party/SocketRocket/fbase64.c' - s.public_header_files = - 'Api/FirebaseDatabase.h', - 'Api/FIRDataEventType.h', - 'Api/FIRDataSnapshot.h', - 'Api/FIRDatabaseQuery.h', - 'Api/FIRDatabaseSwiftNameSupport.h', - 'Api/FIRMutableData.h', - 'Api/FIRServerValue.h', - 'Api/FIRTransactionResult.h', - 'Api/FIRDatabase.h', - 'FIRDatabaseReference.h' + s.public_header_files = 'Public/*.h' s.library = 'c++' s.library = 'icucore' s.framework = 'CFNetwork' diff --git a/Firebase/Database/Api/FIRDataEventType.h b/Firebase/Database/Public/FIRDataEventType.h index fccc98a..fccc98a 100644 --- a/Firebase/Database/Api/FIRDataEventType.h +++ b/Firebase/Database/Public/FIRDataEventType.h diff --git a/Firebase/Database/Api/FIRDataSnapshot.h b/Firebase/Database/Public/FIRDataSnapshot.h index e615260..e615260 100644 --- a/Firebase/Database/Api/FIRDataSnapshot.h +++ b/Firebase/Database/Public/FIRDataSnapshot.h diff --git a/Firebase/Database/Api/FIRDatabase.h b/Firebase/Database/Public/FIRDatabase.h index ebdbf8a..ebdbf8a 100644 --- a/Firebase/Database/Api/FIRDatabase.h +++ b/Firebase/Database/Public/FIRDatabase.h diff --git a/Firebase/Database/Api/FIRDatabaseQuery.h b/Firebase/Database/Public/FIRDatabaseQuery.h index be4ad27..be4ad27 100644 --- a/Firebase/Database/Api/FIRDatabaseQuery.h +++ b/Firebase/Database/Public/FIRDatabaseQuery.h diff --git a/Firebase/Database/FIRDatabaseReference.h b/Firebase/Database/Public/FIRDatabaseReference.h index eb3fecd..eb3fecd 100644 --- a/Firebase/Database/FIRDatabaseReference.h +++ b/Firebase/Database/Public/FIRDatabaseReference.h diff --git a/Firebase/Database/Api/FIRDatabaseSwiftNameSupport.h b/Firebase/Database/Public/FIRDatabaseSwiftNameSupport.h index 55e1bcc..55e1bcc 100644 --- a/Firebase/Database/Api/FIRDatabaseSwiftNameSupport.h +++ b/Firebase/Database/Public/FIRDatabaseSwiftNameSupport.h diff --git a/Firebase/Database/Api/FIRMutableData.h b/Firebase/Database/Public/FIRMutableData.h index 5c26024..5c26024 100644 --- a/Firebase/Database/Api/FIRMutableData.h +++ b/Firebase/Database/Public/FIRMutableData.h diff --git a/Firebase/Database/Api/FIRServerValue.h b/Firebase/Database/Public/FIRServerValue.h index f5eadd5..f5eadd5 100644 --- a/Firebase/Database/Api/FIRServerValue.h +++ b/Firebase/Database/Public/FIRServerValue.h diff --git a/Firebase/Database/Api/FIRTransactionResult.h b/Firebase/Database/Public/FIRTransactionResult.h index 3c2d39a..3c2d39a 100644 --- a/Firebase/Database/Api/FIRTransactionResult.h +++ b/Firebase/Database/Public/FIRTransactionResult.h diff --git a/Firebase/Database/Api/FirebaseDatabase.h b/Firebase/Database/Public/FirebaseDatabase.h index e52f5d6..e52f5d6 100644 --- a/Firebase/Database/Api/FirebaseDatabase.h +++ b/Firebase/Database/Public/FirebaseDatabase.h diff --git a/Firebase/Messaging/FirebaseMessaging.podspec b/Firebase/Messaging/FirebaseMessaging.podspec index e721813..9a1c473 100644 --- a/Firebase/Messaging/FirebaseMessaging.podspec +++ b/Firebase/Messaging/FirebaseMessaging.podspec @@ -23,10 +23,7 @@ Simplify your iOS development, grow your user base, and monetize more effectivel s.source_files = '**/*.[mh]' s.requires_arc = '*.m' - s.public_header_files = - 'Public/FirebaseMessaging.h', - 'Public/FIRMessaging.h' - + s.public_header_files = 'Public/*.h' s.library = 'sqlite3' s.xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) ' + diff --git a/Firebase/Storage/FirebaseStorage.podspec b/Firebase/Storage/FirebaseStorage.podspec index 05d23ae..fb4094c 100644 --- a/Firebase/Storage/FirebaseStorage.podspec +++ b/Firebase/Storage/FirebaseStorage.podspec @@ -21,21 +21,8 @@ Simplify your iOS development, grow your user base, and monetize more effectivel s.social_media_url = 'https://twitter.com/Firebase' s.ios.deployment_target = '7.0' s.osx.deployment_target = '10.10' - s.source_files = '**/*.[mh]' - s.public_header_files = - 'FirebaseStorage.h', - 'FIRStorage.h', - 'FIRStorageConstants.h', - 'FIRStorageDownloadTask.h', - 'FIRStorageMetadata.h', - 'FIRStorageObservableTask.h', - 'FIRStorageReference.h', - 'FIRStorageSwiftNameSupport.h', - 'FIRStorageTask.h', - 'FIRStorageTaskSnapshot.h', - 'FIRStorageUploadTask.h' - + s.public_header_files = 'Public/*.h' s.ios.framework = 'MobileCoreServices' s.osx.framework = 'CoreServices' # s.dependency 'FirebaseCommunity/Core' diff --git a/Firebase/Storage/FIRStorage.h b/Firebase/Storage/Public/FIRStorage.h index 3b37a0e..3b37a0e 100644 --- a/Firebase/Storage/FIRStorage.h +++ b/Firebase/Storage/Public/FIRStorage.h diff --git a/Firebase/Storage/FIRStorageConstants.h b/Firebase/Storage/Public/FIRStorageConstants.h index cf6c3b8..cf6c3b8 100644 --- a/Firebase/Storage/FIRStorageConstants.h +++ b/Firebase/Storage/Public/FIRStorageConstants.h diff --git a/Firebase/Storage/FIRStorageDownloadTask.h b/Firebase/Storage/Public/FIRStorageDownloadTask.h index 252b910..252b910 100644 --- a/Firebase/Storage/FIRStorageDownloadTask.h +++ b/Firebase/Storage/Public/FIRStorageDownloadTask.h diff --git a/Firebase/Storage/FIRStorageMetadata.h b/Firebase/Storage/Public/FIRStorageMetadata.h index 8d844f7..8d844f7 100644 --- a/Firebase/Storage/FIRStorageMetadata.h +++ b/Firebase/Storage/Public/FIRStorageMetadata.h diff --git a/Firebase/Storage/FIRStorageObservableTask.h b/Firebase/Storage/Public/FIRStorageObservableTask.h index 502aba5..502aba5 100644 --- a/Firebase/Storage/FIRStorageObservableTask.h +++ b/Firebase/Storage/Public/FIRStorageObservableTask.h diff --git a/Firebase/Storage/FIRStorageReference.h b/Firebase/Storage/Public/FIRStorageReference.h index 0b85267..0b85267 100644 --- a/Firebase/Storage/FIRStorageReference.h +++ b/Firebase/Storage/Public/FIRStorageReference.h diff --git a/Firebase/Storage/FIRStorageSwiftNameSupport.h b/Firebase/Storage/Public/FIRStorageSwiftNameSupport.h index 55e1bcc..55e1bcc 100644 --- a/Firebase/Storage/FIRStorageSwiftNameSupport.h +++ b/Firebase/Storage/Public/FIRStorageSwiftNameSupport.h diff --git a/Firebase/Storage/FIRStorageTask.h b/Firebase/Storage/Public/FIRStorageTask.h index 0428220..0428220 100644 --- a/Firebase/Storage/FIRStorageTask.h +++ b/Firebase/Storage/Public/FIRStorageTask.h diff --git a/Firebase/Storage/FIRStorageTaskSnapshot.h b/Firebase/Storage/Public/FIRStorageTaskSnapshot.h index b654c09..b654c09 100644 --- a/Firebase/Storage/FIRStorageTaskSnapshot.h +++ b/Firebase/Storage/Public/FIRStorageTaskSnapshot.h diff --git a/Firebase/Storage/FIRStorageUploadTask.h b/Firebase/Storage/Public/FIRStorageUploadTask.h index cdf1d29..cdf1d29 100644 --- a/Firebase/Storage/FIRStorageUploadTask.h +++ b/Firebase/Storage/Public/FIRStorageUploadTask.h diff --git a/Firebase/Storage/FirebaseStorage.h b/Firebase/Storage/Public/FirebaseStorage.h index 1e5dfa4..1e5dfa4 100644 --- a/Firebase/Storage/FirebaseStorage.h +++ b/Firebase/Storage/Public/FirebaseStorage.h diff --git a/FirebaseCommunity.podspec b/FirebaseCommunity.podspec index 654f6c9..7b06860 100644 --- a/FirebaseCommunity.podspec +++ b/FirebaseCommunity.podspec @@ -28,14 +28,7 @@ Firebase Development CocoaPod including experimental and community supported fea s.subspec 'Core' do |sp| sp.source_files = 'Firebase/Core/**/*.[mh]' - sp.public_header_files = - 'Firebase/Core/FirebaseCore.h', - 'Firebase/Core/FIRAnalyticsConfiguration.h', - 'Firebase/Core/FIRApp.h', - 'Firebase/Core/FIRConfiguration.h', - 'Firebase/Core/FIRLoggerLevel.h', - 'Firebase/Core/FIROptions.h', - 'Firebase/Core/FIRCoreSwiftNameSupport.h' + sp.public_header_files = 'Firebase/Core/Public/*.h' sp.dependency 'GoogleToolboxForMac/NSData+zlib', '~> 2.1' sp.dependency 'FirebaseCommunity/Root' end @@ -50,26 +43,7 @@ Firebase Development CocoaPod including experimental and community supported fea 'Firebase/Auth/Source/**/FIRAuthAPNSTokenType.[mh]', 'Firebase/Auth/Source/**/FIRAuthAPNSToken.[mh]', 'Firebase/Auth/Source/**/FIRPhoneAuthProvider.[mh]' - sp.public_header_files = - 'Firebase/Auth/Source/FirebaseAuth.h', - 'Firebase/Auth/Source/FirebaseAuthVersion.h', - 'Firebase/Auth/Source/FIRAdditionalUserInfo.h', - 'Firebase/Auth/Source/FIRAuth.h', - 'Firebase/Auth/Source/FIRAuthAPNSTokenType.h', - 'Firebase/Auth/Source/FIRAuthCredential.h', - 'Firebase/Auth/Source/FIRAuthDataResult.h', - 'Firebase/Auth/Source/FIRAuthErrors.h', - 'Firebase/Auth/Source/FIRAuthSwiftNameSupport.h', - 'Firebase/Auth/Source/AuthProviders/EmailPassword/FIREmailAuthProvider.h', - 'Firebase/Auth/Source/AuthProviders/Facebook/FIRFacebookAuthProvider.h', - 'Firebase/Auth/Source/AuthProviders/GitHub/FIRGitHubAuthProvider.h', - 'Firebase/Auth/Source/AuthProviders/Google/FIRGoogleAuthProvider.h', - 'Firebase/Auth/Source/AuthProviders/OAuth/FIROAuthProvider.h', - 'Firebase/Auth/Source/AuthProviders/Phone/FIRPhoneAuthCredential.h', - 'Firebase/Auth/Source/AuthProviders/Phone/FIRPhoneAuthProvider.h', - 'Firebase/Auth/Source/AuthProviders/Twitter/FIRTwitterAuthProvider.h', - 'Firebase/Auth/Source/FIRUser.h', - 'Firebase/Auth/Source/FIRUserInfo.h' + sp.public_header_files = 'Firebase/Auth/Source/Public/*.h' sp.preserve_paths = 'Firebase/Auth/README.md', 'Firebase/Auth/CHANGELOG.md' @@ -86,17 +60,7 @@ Firebase Development CocoaPod including experimental and community supported fea sp.source_files = 'Firebase/Database/**/*.[mh]', 'Firebase/Database/third_party/Wrap-leveldb/APLevelDB.mm', 'Firebase/Database/third_party/SocketRocket/fbase64.c' - sp.public_header_files = - 'Firebase/Database/Api/FirebaseDatabase.h', - 'Firebase/Database/Api/FIRDataEventType.h', - 'Firebase/Database/Api/FIRDataSnapshot.h', - 'Firebase/Database/Api/FIRDatabaseQuery.h', - 'Firebase/Database/Api/FIRDatabaseSwiftNameSupport.h', - 'Firebase/Database/Api/FIRMutableData.h', - 'Firebase/Database/Api/FIRServerValue.h', - 'Firebase/Database/Api/FIRTransactionResult.h', - 'Firebase/Database/Api/FIRDatabase.h', - 'Firebase/Database/FIRDatabaseReference.h' + sp.public_header_files = 'Firebase/Database/Public/*.h' sp.library = 'c++' sp.library = 'icucore' sp.framework = 'CFNetwork' @@ -112,9 +76,7 @@ Firebase Development CocoaPod including experimental and community supported fea sp.source_files = 'Firebase/Messaging/**/*.[mh]' sp.requires_arc = 'Firebase/Messaging/*.m' - sp.public_header_files = - 'Firebase/Messaging/Public/FirebaseMessaging.h', - 'Firebase/Messaging/Public/FIRMessaging.h' + sp.public_header_files = 'Firebase/Messaging/Public/*.h' sp.library = 'sqlite3' sp.xcconfig ={ 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) ' + @@ -130,18 +92,7 @@ Firebase Development CocoaPod including experimental and community supported fea s.subspec 'Storage' do |sp| sp.source_files = 'Firebase/Storage/**/*.[mh]' - sp.public_header_files = - 'Firebase/Storage/FirebaseStorage.h', - 'Firebase/Storage/FIRStorage.h', - 'Firebase/Storage/FIRStorageConstants.h', - 'Firebase/Storage/FIRStorageDownloadTask.h', - 'Firebase/Storage/FIRStorageMetadata.h', - 'Firebase/Storage/FIRStorageObservableTask.h', - 'Firebase/Storage/FIRStorageReference.h', - 'Firebase/Storage/FIRStorageSwiftNameSupport.h', - 'Firebase/Storage/FIRStorageTask.h', - 'Firebase/Storage/FIRStorageTaskSnapshot.h', - 'Firebase/Storage/FIRStorageUploadTask.h' + sp.public_header_files = 'Firebase/Storage/Public/*.h' sp.ios.framework = 'MobileCoreServices' sp.osx.framework = 'CoreServices' sp.dependency 'FirebaseCommunity/Core' |