Group public headers into Public directories (#112)

Author: paulb777

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

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"
 

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"

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"
 

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

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'

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

Firebase/Auth/Source/FIRAdditionalUserInfo.h renamed to Firebase/Auth/Source/Public/FIRAdditionalUserInfo.h

@@ -56,7 +56,7 @@
 #import <GTMSessionFetcher/GTMSessionFetcherService.h>
 
 #if TARGET_OS_IOS
-#import "../AuthProviders/Phone/FIRPhoneAuthProvider.h"
+#import "FIRPhoneAuthProvider.h"
 #endif
 
 /** @var kClientVersionHeader

Firebase/Auth/Source/FIRAuth.h renamed to Firebase/Auth/Source/Public/FIRAuth.h

@@ -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

Firebase/Auth/Source/FIRAuthAPNSTokenType.h renamed to Firebase/Auth/Source/Public/FIRAuthAPNSTokenType.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.

Firebase/Auth/Source/FIRAuthCredential.h renamed to Firebase/Auth/Source/Public/FIRAuthCredential.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) {

Firebase/Auth/Source/FIRAuthDataResult.h renamed to Firebase/Auth/Source/Public/FIRAuthDataResult.h

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "../FIROptions.h"
+#import "FIROptions.h"
 
 /**
  * Keys for the strings in the plist file.

Firebase/Auth/Source/FIRAuthErrors.h renamed to Firebase/Auth/Source/Public/FIRAuthErrors.h

@@ -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'

Firebase/Auth/Source/FIRAuthSwiftNameSupport.h renamed to Firebase/Auth/Source/Public/FIRAuthSwiftNameSupport.h

@@ -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) ' +

Firebase/Auth/Source/AuthProviders/EmailPassword/FIREmailAuthProvider.h renamed to Firebase/Auth/Source/Public/FIREmailAuthProvider.h

@@ -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'

Firebase/Auth/Source/AuthProviders/Facebook/FIRFacebookAuthProvider.h renamed to Firebase/Auth/Source/Public/FIRFacebookAuthProvider.h

@@ -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'