Storage - new public header structure (#6172)

paulb777 · web-flow · commit 54c9f526e2ff · 2020-07-31T07:22:41.000-07:00
diff --git a/FirebaseStorage.podspec b/FirebaseStorage.podspec
@@ -31,7 +31,7 @@ Firebase Storage provides robust, secure file uploads and downloads from Firebas
     'Interop/Auth/Public/*.h',
     'FirebaseCore/Sources/Private/*.h',
   ]
-  s.public_header_files = 'FirebaseStorage/Sources/Public/*.h'
+  s.public_header_files = 'FirebaseStorage/Sources/Public/FirebaseStorage/*.h'
 
   s.ios.framework = 'MobileCoreServices'
   s.osx.framework = 'CoreServices'
diff --git a/FirebaseStorage/Sources/FIRStorage.m b/FirebaseStorage/Sources/FIRStorage.m
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FirebaseStorage/Sources/Public/FIRStorage.h"
-#import "FirebaseStorage/Sources/Public/FIRStorageReference.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorage.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageReference.h"
 
 #import "FirebaseStorage/Sources/FIRStorageComponent.h"
 #import "FirebaseStorage/Sources/FIRStorageConstants_Private.h"
diff --git a/FirebaseStorage/Sources/FIRStorageComponent.m b/FirebaseStorage/Sources/FIRStorageComponent.m
@@ -14,7 +14,7 @@
 
 #import "FirebaseStorage/Sources/FIRStorageComponent.h"
 
-#import "FirebaseStorage/Sources/Public/FIRStorage.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorage.h"
 
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 #import "Interop/Auth/Public/FIRAuthInterop.h"
diff --git a/FirebaseStorage/Sources/FIRStorageConstants.m b/FirebaseStorage/Sources/FIRStorageConstants.m
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FirebaseStorage/Sources/Public/FIRStorageConstants.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageConstants.h"
 
 #import "FirebaseStorage/Sources/FIRStorageConstants_Private.h"
 
diff --git a/FirebaseStorage/Sources/FIRStorageDeleteTask.h b/FirebaseStorage/Sources/FIRStorageDeleteTask.h
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FirebaseStorage/Sources/Public/FIRStorageTask.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageTask.h"
 
 @class GTMSessionFetcherService;
 
diff --git a/FirebaseStorage/Sources/FIRStorageDownloadTask.m b/FirebaseStorage/Sources/FIRStorageDownloadTask.m
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FirebaseStorage/Sources/Public/FIRStorageDownloadTask.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageDownloadTask.h"
 
 #import "FirebaseStorage/Sources/FIRStorageConstants_Private.h"
 #import "FirebaseStorage/Sources/FIRStorageDownloadTask_Private.h"
diff --git a/FirebaseStorage/Sources/FIRStorageDownloadTask_Private.h b/FirebaseStorage/Sources/FIRStorageDownloadTask_Private.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FirebaseStorage/Sources/Public/FIRStorageDownloadTask.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageDownloadTask.h"
 
 @class FIRStorageReference;
 @class GTMSessionFetcherService;
diff --git a/FirebaseStorage/Sources/FIRStorageErrors.h b/FirebaseStorage/Sources/FIRStorageErrors.h
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FirebaseStorage/Sources/Public/FIRStorageConstants.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageConstants.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/FirebaseStorage/Sources/FIRStorageErrors.m b/FirebaseStorage/Sources/FIRStorageErrors.m
@@ -14,7 +14,7 @@
 
 #import "FirebaseStorage/Sources/FIRStorageErrors.h"
 
-#import "FirebaseStorage/Sources/Public/FIRStorageReference.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageReference.h"
 
 #import "FirebaseStorage/Sources/FIRStorageConstants_Private.h"
 #import "FirebaseStorage/Sources/FIRStorageReference_Private.h"
diff --git a/FirebaseStorage/Sources/FIRStorageGetDownloadURLTask.h b/FirebaseStorage/Sources/FIRStorageGetDownloadURLTask.h
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FirebaseStorage/Sources/Public/FIRStorageTask.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageTask.h"
 
 @class GTMSessionFetcherService;
 
diff --git a/FirebaseStorage/Sources/FIRStorageGetMetadataTask.h b/FirebaseStorage/Sources/FIRStorageGetMetadataTask.h
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FirebaseStorage/Sources/Public/FIRStorageTask.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageTask.h"
 
 @class GTMSessionFetcherService;
 
diff --git a/FirebaseStorage/Sources/FIRStorageGetMetadataTask.m b/FirebaseStorage/Sources/FIRStorageGetMetadataTask.m
@@ -14,7 +14,7 @@
 
 #import "FirebaseStorage/Sources/FIRStorageGetMetadataTask.h"
 
-#import "FirebaseStorage/Sources/Public/FIRStorageConstants.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageConstants.h"
 
 #import "FirebaseStorage/Sources/FIRStorageMetadata_Private.h"
 #import "FirebaseStorage/Sources/FIRStorageTask_Private.h"
diff --git a/FirebaseStorage/Sources/FIRStorageListResult.m b/FirebaseStorage/Sources/FIRStorageListResult.m
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FirebaseStorage/Sources/Public/FIRStorageListResult.h"
-#import "FirebaseStorage/Sources/Public/FIRStorageReference.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageListResult.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageReference.h"
 
 #import "FirebaseStorage/Sources/FIRStorageConstants_Private.h"
 
diff --git a/FirebaseStorage/Sources/FIRStorageListResult_Private.h b/FirebaseStorage/Sources/FIRStorageListResult_Private.h
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FirebaseStorage/Sources/Public/FIRStorageListResult.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageListResult.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/FirebaseStorage/Sources/FIRStorageListTask.h b/FirebaseStorage/Sources/FIRStorageListTask.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#import "FirebaseStorage/Sources/Public/FIRStorageListResult.h"
-#import "FirebaseStorage/Sources/Public/FIRStorageTask.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageListResult.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageTask.h"
 
 @class GTMSessionFetcherService;
 
diff --git a/FirebaseStorage/Sources/FIRStorageMetadata.m b/FirebaseStorage/Sources/FIRStorageMetadata.m
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FirebaseStorage/Sources/Public/FIRStorageMetadata.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageMetadata.h"
 
-#import "FirebaseStorage/Sources/Public/FIRStorageConstants.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageConstants.h"
 
 #import "FirebaseStorage/Sources/FIRStorageConstants_Private.h"
 #import "FirebaseStorage/Sources/FIRStorageMetadata_Private.h"
diff --git a/FirebaseStorage/Sources/FIRStorageMetadata_Private.h b/FirebaseStorage/Sources/FIRStorageMetadata_Private.h
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FirebaseStorage/Sources/Public/FIRStorageMetadata.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageMetadata.h"
 
 #import "FirebaseStorage/Sources/FIRStorageConstants_Private.h"
 
diff --git a/FirebaseStorage/Sources/FIRStorageObservableTask.m b/FirebaseStorage/Sources/FIRStorageObservableTask.m
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FirebaseStorage/Sources/Public/FIRStorageObservableTask.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageObservableTask.h"
 #import "FirebaseStorage/Sources/FIRStorageObservableTask_Private.h"
 #import "FirebaseStorage/Sources/FIRStorageTask_Private.h"
 
diff --git a/FirebaseStorage/Sources/FIRStorageObservableTask_Private.h b/FirebaseStorage/Sources/FIRStorageObservableTask_Private.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FirebaseStorage/Sources/Public/FIRStorageObservableTask.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageObservableTask.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/FirebaseStorage/Sources/FIRStorageReference.m b/FirebaseStorage/Sources/FIRStorageReference.m
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FirebaseStorage/Sources/Public/FIRStorageReference.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageReference.h"
 
 #import "FirebaseStorage/Sources/FIRStorageConstants_Private.h"
 #import "FirebaseStorage/Sources/FIRStorageDeleteTask.h"
@@ -29,7 +29,7 @@
 #import "FirebaseStorage/Sources/FIRStorageUploadTask_Private.h"
 #import "FirebaseStorage/Sources/FIRStorageUtils.h"
 #import "FirebaseStorage/Sources/FIRStorage_Private.h"
-#import "FirebaseStorage/Sources/Public/FIRStorageTaskSnapshot.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageTaskSnapshot.h"
 
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
diff --git a/FirebaseStorage/Sources/FIRStorageReference_Private.h b/FirebaseStorage/Sources/FIRStorageReference_Private.h
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FirebaseStorage/Sources/Public/FIRStorageReference.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageReference.h"
 
 #import "FirebaseStorage/Sources/FIRStoragePath.h"
 
diff --git a/FirebaseStorage/Sources/FIRStorageTask.m b/FirebaseStorage/Sources/FIRStorageTask.m
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FirebaseStorage/Sources/Public/FIRStorageTask.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageTask.h"
 
-#import "FirebaseStorage/Sources/Public/FIRStorage.h"
-#import "FirebaseStorage/Sources/Public/FIRStorageReference.h"
-#import "FirebaseStorage/Sources/Public/FIRStorageTaskSnapshot.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorage.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageReference.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageTaskSnapshot.h"
 
 #import "FirebaseStorage/Sources/FIRStorageReference_Private.h"
 #import "FirebaseStorage/Sources/FIRStorageTaskSnapshot_Private.h"
diff --git a/FirebaseStorage/Sources/FIRStorageTaskSnapshot.m b/FirebaseStorage/Sources/FIRStorageTaskSnapshot.m
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FirebaseStorage/Sources/Public/FIRStorageTaskSnapshot.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageTaskSnapshot.h"
 
 #import "FirebaseStorage/Sources/FIRStorageTaskSnapshot_Private.h"
 
diff --git a/FirebaseStorage/Sources/FIRStorageTaskSnapshot_Private.h b/FirebaseStorage/Sources/FIRStorageTaskSnapshot_Private.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FirebaseStorage/Sources/Public/FIRStorageTaskSnapshot.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageTaskSnapshot.h"
 
 #import "FirebaseStorage/Sources/FIRStorageConstants_Private.h"
 
diff --git a/FirebaseStorage/Sources/FIRStorageTask_Private.h b/FirebaseStorage/Sources/FIRStorageTask_Private.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#import "FirebaseStorage/Sources/Public/FIRStorageReference.h"
-#import "FirebaseStorage/Sources/Public/FIRStorageTaskSnapshot.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageReference.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageTaskSnapshot.h"
 
 #import "FirebaseStorage/Sources/FIRStorageConstants_Private.h"
 #import "FirebaseStorage/Sources/FIRStorageErrors.h"
diff --git a/FirebaseStorage/Sources/FIRStorageTokenAuthorizer.m b/FirebaseStorage/Sources/FIRStorageTokenAuthorizer.m
@@ -14,8 +14,8 @@
 
 #import "FirebaseStorage/Sources/FIRStorageTokenAuthorizer.h"
 
-#import "FirebaseStorage/Sources/Public/FIRStorage.h"
-#import "FirebaseStorage/Sources/Public/FIRStorageConstants.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorage.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageConstants.h"
 
 #import "FirebaseStorage/Sources/FIRStorageConstants_Private.h"
 #import "FirebaseStorage/Sources/FIRStorageErrors.h"
diff --git a/FirebaseStorage/Sources/FIRStorageUpdateMetadataTask.h b/FirebaseStorage/Sources/FIRStorageUpdateMetadataTask.h
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FirebaseStorage/Sources/Public/FIRStorageTask.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageTask.h"
 
 @class GTMSessionFetcherService;
 
diff --git a/FirebaseStorage/Sources/FIRStorageUploadTask.m b/FirebaseStorage/Sources/FIRStorageUploadTask.m
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FirebaseStorage/Sources/Public/FIRStorageUploadTask.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageUploadTask.h"
 
 #import "FirebaseStorage/Sources/FIRStorageConstants_Private.h"
 #import "FirebaseStorage/Sources/FIRStorageMetadata_Private.h"
diff --git a/FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorage.h b/FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorage.h
diff --git a/FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageConstants.h b/FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageConstants.h
diff --git a/FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageDownloadTask.h b/FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageDownloadTask.h
diff --git a/FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageListResult.h b/FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageListResult.h
diff --git a/FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageMetadata.h b/FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageMetadata.h
diff --git a/FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageObservableTask.h b/FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageObservableTask.h
diff --git a/FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageReference.h b/FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageReference.h
diff --git a/FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageTask.h b/FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageTask.h
diff --git a/FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageTaskSnapshot.h b/FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageTaskSnapshot.h
diff --git a/FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageUploadTask.h b/FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageUploadTask.h
diff --git a/FirebaseStorage/Sources/Public/FirebaseStorage/FirebaseStorage.h b/FirebaseStorage/Sources/Public/FirebaseStorage/FirebaseStorage.h
diff --git a/FirebaseStorage/Tests/Integration/FIRStorageIntegrationTests.m b/FirebaseStorage/Tests/Integration/FIRStorageIntegrationTests.m
@@ -14,7 +14,7 @@
 
 #import <XCTest/XCTest.h>
 
-#import "FirebaseStorage/Sources/Public/FirebaseStorage.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FirebaseStorage.h"
 
 #import <FirebaseAuth/FirebaseAuth.h>
 
diff --git a/FirebaseStorage/Tests/Unit/FIRStorageMetadataTests.m b/FirebaseStorage/Tests/Unit/FIRStorageMetadataTests.m
@@ -14,9 +14,9 @@
 
 #import <XCTest/XCTest.h>
 
-#import "FirebaseStorage/Sources/Public/FIRStorageMetadata.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageMetadata.h"
 
-#import "FirebaseStorage/Sources/Public/FIRStorageMetadata.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageMetadata.h"
 
 #import "FirebaseStorage/Sources/FIRStorageGetDownloadURLTask.h"
 #import "FirebaseStorage/Sources/FIRStorageGetDownloadURLTask_Private.h"
diff --git a/FirebaseStorage/Tests/Unit/FIRStorageReferenceTests.m b/FirebaseStorage/Tests/Unit/FIRStorageReferenceTests.m
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FirebaseStorage/Sources/Public/FIRStorage.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorage.h"
 
 #import "FirebaseStorage/Sources/FIRStorageComponent.h"
 #import "FirebaseStorage/Sources/FIRStorageReference_Private.h"
diff --git a/FirebaseStorage/Tests/Unit/FIRStorageTestHelpers.h b/FirebaseStorage/Tests/Unit/FIRStorageTestHelpers.h
@@ -20,10 +20,10 @@
 
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
-#import "FirebaseStorage/Sources/Public/FIRStorageConstants.h"
-#import "FirebaseStorage/Sources/Public/FIRStorageMetadata.h"
-#import "FirebaseStorage/Sources/Public/FIRStorageReference.h"
-#import "FirebaseStorage/Sources/Public/FIRStorageTask.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageConstants.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageMetadata.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageReference.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageTask.h"
 
 #import "FirebaseStorage/Sources/FIRStorageConstants_Private.h"
 #import "FirebaseStorage/Sources/FIRStorageErrors.h"
diff --git a/FirebaseStorage/Tests/Unit/FIRStorageTests.m b/FirebaseStorage/Tests/Unit/FIRStorageTests.m
@@ -14,7 +14,7 @@
 
 #import "FirebaseStorage/Tests/Unit/FIRStorageTestHelpers.h"
 
-#import "FirebaseStorage/Sources/Public/FIRStorageReference.h"
+#import "FirebaseStorage/Sources/Public/FirebaseStorage/FIRStorageReference.h"
 
 #import "FirebaseStorage/Sources/FIRStorageComponent.h"
 #import "FirebaseStorage/Sources/FIRStorageReference_Private.h"

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ Firebase Storage provides robust, secure file uploads and downloads from Firebas`
`31`	`31`	`'Interop/Auth/Public/*.h',`
`32`	`32`	`'FirebaseCore/Sources/Private/*.h',`
`33`	`33`	`]`
`34`		`- s.public_header_files = 'FirebaseStorage/Sources/Public/*.h'`
	`34`	`+ s.public_header_files = 'FirebaseStorage/Sources/Public/FirebaseStorage/*.h'`
`35`	`35`
`36`	`36`	`s.ios.framework = 'MobileCoreServices'`
`37`	`37`	`s.osx.framework = 'CoreServices'`