Skip to content

Storage: Repo-relative headers and SPM #5851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 19, 2020
Merged

Storage: Repo-relative headers and SPM #5851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c4fa907
Storage: Repo-relative headers and SPM
paulb777 Jun 18, 2020
e6e3c62
style
paulb777 Jun 18, 2020
f1e1bb0
Fix check module check
paulb777 Jun 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions FirebaseStorage/Sources/FIRStorage.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#import <FirebaseStorage/FIRStorage.h>
#import <FirebaseStorage/FIRStorageReference.h>
#import "FirebaseStorage/Sources/Public/FIRStorage.h"
#import "FirebaseStorage/Sources/Public/FIRStorageReference.h"

#import "FirebaseStorage/Sources/FIRStorageComponent.h"
#import "FirebaseStorage/Sources/FIRStorageConstants_Private.h"
Expand All @@ -26,8 +26,12 @@
#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
#import "Interop/Auth/Public/FIRAuthInterop.h"

#if SWIFT_PACKAGE
@import GTMSessionFetcherCore;
#else
#import <GTMSessionFetcher/GTMSessionFetcher.h>
#import <GTMSessionFetcher/GTMSessionFetcherLogging.h>
#endif

static NSMutableDictionary<
NSString * /* app name */,
Expand Down
2 changes: 1 addition & 1 deletion FirebaseStorage/Sources/FIRStorageComponent.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#import "FirebaseStorage/Sources/FIRStorageComponent.h"

#import <FirebaseStorage/FIRStorage.h>
#import "FirebaseStorage/Sources/Public/FIRStorage.h"

#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
#import "Interop/Auth/Public/FIRAuthInterop.h"
Expand Down
2 changes: 1 addition & 1 deletion FirebaseStorage/Sources/FIRStorageConstants.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#import <FirebaseStorage/FIRStorageConstants.h>
#import "FirebaseStorage/Sources/Public/FIRStorageConstants.h"

#import "FirebaseStorage/Sources/FIRStorageConstants_Private.h"

Expand Down
2 changes: 1 addition & 1 deletion FirebaseStorage/Sources/FIRStorageDeleteTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

#import <FirebaseStorage/FIRStorageTask.h>
#import "FirebaseStorage/Sources/Public/FIRStorageTask.h"

@class GTMSessionFetcherService;

Expand Down
2 changes: 1 addition & 1 deletion FirebaseStorage/Sources/FIRStorageDownloadTask.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#import <FirebaseStorage/FIRStorageDownloadTask.h>
#import "FirebaseStorage/Sources/Public/FIRStorageDownloadTask.h"

#import "FirebaseStorage/Sources/FIRStorageConstants_Private.h"
#import "FirebaseStorage/Sources/FIRStorageDownloadTask_Private.h"
Expand Down
2 changes: 1 addition & 1 deletion FirebaseStorage/Sources/FIRStorageDownloadTask_Private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#import <Foundation/Foundation.h>

#import <FirebaseStorage/FIRStorageDownloadTask.h>
#import "FirebaseStorage/Sources/Public/FIRStorageDownloadTask.h"

@class FIRStorageReference;
@class GTMSessionFetcherService;
Expand Down
2 changes: 1 addition & 1 deletion FirebaseStorage/Sources/FIRStorageErrors.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

#import <FirebaseStorage/FIRStorageConstants.h>
#import "FirebaseStorage/Sources/Public/FIRStorageConstants.h"

NS_ASSUME_NONNULL_BEGIN

Expand Down
3 changes: 2 additions & 1 deletion FirebaseStorage/Sources/FIRStorageErrors.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@

#import "FirebaseStorage/Sources/FIRStorageErrors.h"

#import <FirebaseStorage/FIRStorageReference.h>
#import "FirebaseStorage/Sources/Public/FIRStorageReference.h"

#import "FirebaseStorage/Sources/FIRStorageConstants_Private.h"
#import "FirebaseStorage/Sources/FIRStorageReference_Private.h"

Expand Down
2 changes: 1 addition & 1 deletion FirebaseStorage/Sources/FIRStorageGetDownloadURLTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

#import <FirebaseStorage/FIRStorageTask.h>
#import "FirebaseStorage/Sources/Public/FIRStorageTask.h"

@class GTMSessionFetcherService;

Expand Down
2 changes: 1 addition & 1 deletion FirebaseStorage/Sources/FIRStorageGetMetadataTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

#import <FirebaseStorage/FIRStorageTask.h>
#import "FirebaseStorage/Sources/Public/FIRStorageTask.h"

@class GTMSessionFetcherService;

Expand Down
3 changes: 2 additions & 1 deletion FirebaseStorage/Sources/FIRStorageGetMetadataTask.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@

#import "FirebaseStorage/Sources/FIRStorageGetMetadataTask.h"

#import <FirebaseStorage/FIRStorageConstants.h>
#import "FirebaseStorage/Sources/Public/FIRStorageConstants.h"

#import "FirebaseStorage/Sources/FIRStorageMetadata_Private.h"
#import "FirebaseStorage/Sources/FIRStorageTask_Private.h"
#import "FirebaseStorage/Sources/FIRStorageUtils.h"
Expand Down
5 changes: 3 additions & 2 deletions FirebaseStorage/Sources/FIRStorageListResult.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#import <FirebaseStorage/FIRStorageListResult.h>
#import <FirebaseStorage/FIRStorageReference.h>
#import "FirebaseStorage/Sources/Public/FIRStorageListResult.h"
#import "FirebaseStorage/Sources/Public/FIRStorageReference.h"

#import "FirebaseStorage/Sources/FIRStorageConstants_Private.h"

@implementation FIRStorageListResult
Expand Down
2 changes: 1 addition & 1 deletion FirebaseStorage/Sources/FIRStorageListResult_Private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

#import <FirebaseStorage/FIRStorageListResult.h>
#import "FirebaseStorage/Sources/Public/FIRStorageListResult.h"

NS_ASSUME_NONNULL_BEGIN

Expand Down
4 changes: 2 additions & 2 deletions FirebaseStorage/Sources/FIRStorageListTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* limitations under the License.
*/

#import <FirebaseStorage/FIRStorageListResult.h>
#import <FirebaseStorage/FIRStorageTask.h>
#import "FirebaseStorage/Sources/Public/FIRStorageListResult.h"
#import "FirebaseStorage/Sources/Public/FIRStorageTask.h"

@class GTMSessionFetcherService;

Expand Down
5 changes: 3 additions & 2 deletions FirebaseStorage/Sources/FIRStorageMetadata.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#import <FirebaseStorage/FIRStorageMetadata.h>
#import "FirebaseStorage/Sources/Public/FIRStorageMetadata.h"

#import "FirebaseStorage/Sources/Public/FIRStorageConstants.h"

#import <FirebaseStorage/FIRStorageConstants.h>
#import "FirebaseStorage/Sources/FIRStorageConstants_Private.h"
#import "FirebaseStorage/Sources/FIRStorageMetadata_Private.h"
#import "FirebaseStorage/Sources/FIRStorageUtils.h"
Expand Down
3 changes: 2 additions & 1 deletion FirebaseStorage/Sources/FIRStorageMetadata_Private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
* limitations under the License.
*/

#import <FirebaseStorage/FIRStorageMetadata.h>
#import "FirebaseStorage/Sources/Public/FIRStorageMetadata.h"

#import "FirebaseStorage/Sources/FIRStorageConstants_Private.h"

@class FIRStorageReference;
Expand Down
2 changes: 1 addition & 1 deletion FirebaseStorage/Sources/FIRStorageObservableTask.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#import <FirebaseStorage/FIRStorageObservableTask.h>
#import "FirebaseStorage/Sources/Public/FIRStorageObservableTask.h"
#import "FirebaseStorage/Sources/FIRStorageObservableTask_Private.h"
#import "FirebaseStorage/Sources/FIRStorageTask_Private.h"

Expand Down
2 changes: 1 addition & 1 deletion FirebaseStorage/Sources/FIRStorageObservableTask_Private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#import <Foundation/Foundation.h>

#import <FirebaseStorage/FIRStorageObservableTask.h>
#import "FirebaseStorage/Sources/Public/FIRStorageObservableTask.h"

NS_ASSUME_NONNULL_BEGIN

Expand Down
8 changes: 6 additions & 2 deletions FirebaseStorage/Sources/FIRStorageReference.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#import <FirebaseStorage/FIRStorageReference.h>
#import "FirebaseStorage/Sources/Public/FIRStorageReference.h"

#import <FirebaseStorage/FIRStorageTaskSnapshot.h>
#import "FirebaseStorage/Sources/FIRStorageConstants_Private.h"
#import "FirebaseStorage/Sources/FIRStorageDeleteTask.h"
#import "FirebaseStorage/Sources/FIRStorageDownloadTask_Private.h"
Expand All @@ -30,11 +29,16 @@
#import "FirebaseStorage/Sources/FIRStorageUploadTask_Private.h"
#import "FirebaseStorage/Sources/FIRStorageUtils.h"
#import "FirebaseStorage/Sources/FIRStorage_Private.h"
#import "FirebaseStorage/Sources/Public/FIRStorageTaskSnapshot.h"

#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"

#if SWIFT_PACKAGE
@import GTMSessionFetcherCore;
#else
#import <GTMSessionFetcher/GTMSessionFetcher.h>
#import <GTMSessionFetcher/GTMSessionFetcherService.h>
#endif

@implementation FIRStorageReference

Expand Down
2 changes: 1 addition & 1 deletion FirebaseStorage/Sources/FIRStorageReference_Private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

#import <FirebaseStorage/FIRStorageReference.h>
#import "FirebaseStorage/Sources/Public/FIRStorageReference.h"

#import "FirebaseStorage/Sources/FIRStoragePath.h"

Expand Down
13 changes: 9 additions & 4 deletions FirebaseStorage/Sources/FIRStorageTask.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,22 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#import <FirebaseStorage/FIRStorageTask.h>
#import "FirebaseStorage/Sources/Public/FIRStorageTask.h"

#import "FirebaseStorage/Sources/Public/FIRStorage.h"
#import "FirebaseStorage/Sources/Public/FIRStorageReference.h"
#import "FirebaseStorage/Sources/Public/FIRStorageTaskSnapshot.h"

#import <FirebaseStorage/FIRStorage.h>
#import <FirebaseStorage/FIRStorageReference.h>
#import <FirebaseStorage/FIRStorageTaskSnapshot.h>
#import "FirebaseStorage/Sources/FIRStorageReference_Private.h"
#import "FirebaseStorage/Sources/FIRStorageTaskSnapshot_Private.h"
#import "FirebaseStorage/Sources/FIRStorageTask_Private.h"
#import "FirebaseStorage/Sources/FIRStorage_Private.h"

#if SWIFT_PACKAGE
@import GTMSessionFetcherCore;
#else
#import <GTMSessionFetcher/GTMSessionFetcherService.h>
#endif

@implementation FIRStorageTask

Expand Down
3 changes: 2 additions & 1 deletion FirebaseStorage/Sources/FIRStorageTaskSnapshot.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#import <FirebaseStorage/FIRStorageTaskSnapshot.h>
#import "FirebaseStorage/Sources/Public/FIRStorageTaskSnapshot.h"

#import "FirebaseStorage/Sources/FIRStorageTaskSnapshot_Private.h"

#import "FirebaseStorage/Sources/FIRStorageTask_Private.h"
Expand Down
2 changes: 1 addition & 1 deletion FirebaseStorage/Sources/FIRStorageTaskSnapshot_Private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#import <Foundation/Foundation.h>

#import <FirebaseStorage/FIRStorageTaskSnapshot.h>
#import "FirebaseStorage/Sources/Public/FIRStorageTaskSnapshot.h"

#import "FirebaseStorage/Sources/FIRStorageConstants_Private.h"

Expand Down
9 changes: 7 additions & 2 deletions FirebaseStorage/Sources/FIRStorageTask_Private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,21 @@
* limitations under the License.
*/

#import <FirebaseStorage/FIRStorageReference.h>
#import <FirebaseStorage/FIRStorageTaskSnapshot.h>
#import "FirebaseStorage/Sources/Public/FIRStorageReference.h"
#import "FirebaseStorage/Sources/Public/FIRStorageTaskSnapshot.h"

#import "FirebaseStorage/Sources/FIRStorageConstants_Private.h"
#import "FirebaseStorage/Sources/FIRStorageErrors.h"
#import "FirebaseStorage/Sources/FIRStorageReference_Private.h"
#import "FirebaseStorage/Sources/FIRStorageTaskSnapshot_Private.h"
#import "FirebaseStorage/Sources/FIRStorageUtils.h"

#if SWIFT_PACKAGE
@import GTMSessionFetcherCore;
#else
#import <GTMSessionFetcher/GTMSessionFetcher.h>
#import <GTMSessionFetcher/GTMSessionFetcherService.h>
#endif

NS_ASSUME_NONNULL_BEGIN

Expand Down
4 changes: 4 additions & 0 deletions FirebaseStorage/Sources/FIRStorageTokenAuthorizer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@
* limitations under the License.
*/

#if SWIFT_PACKAGE
@import GTMSessionFetcherCore;
#else
#import <GTMSessionFetcher/GTMSessionFetcherService.h>
#endif

@protocol FIRAuthInterop;

Expand Down
5 changes: 3 additions & 2 deletions FirebaseStorage/Sources/FIRStorageTokenAuthorizer.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@

#import "FirebaseStorage/Sources/FIRStorageTokenAuthorizer.h"

#import <FirebaseStorage/FIRStorage.h>
#import <FirebaseStorage/FIRStorageConstants.h>
#import "FirebaseStorage/Sources/Public/FIRStorage.h"
#import "FirebaseStorage/Sources/Public/FIRStorageConstants.h"

#import "FirebaseStorage/Sources/FIRStorageConstants_Private.h"
#import "FirebaseStorage/Sources/FIRStorageErrors.h"

Expand Down
2 changes: 1 addition & 1 deletion FirebaseStorage/Sources/FIRStorageUpdateMetadataTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

#import <FirebaseStorage/FIRStorageTask.h>
#import "FirebaseStorage/Sources/Public/FIRStorageTask.h"

@class GTMSessionFetcherService;

Expand Down
6 changes: 5 additions & 1 deletion FirebaseStorage/Sources/FIRStorageUploadTask.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,19 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#import <FirebaseStorage/FIRStorageUploadTask.h>
#import "FirebaseStorage/Sources/Public/FIRStorageUploadTask.h"

#import "FirebaseStorage/Sources/FIRStorageConstants_Private.h"
#import "FirebaseStorage/Sources/FIRStorageMetadata_Private.h"
#import "FirebaseStorage/Sources/FIRStorageObservableTask_Private.h"
#import "FirebaseStorage/Sources/FIRStorageTask_Private.h"
#import "FirebaseStorage/Sources/FIRStorageUploadTask_Private.h"

#if SWIFT_PACKAGE
@import GTMSessionFetcherCore;
#else
#import <GTMSessionFetcher/GTMSessionUploadFetcher.h>
#endif

@implementation FIRStorageUploadTask

Expand Down
4 changes: 4 additions & 0 deletions FirebaseStorage/Sources/FIRStorageUtils.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,11 @@
#import "FirebaseStorage/Sources/FIRStorageErrors.h"
#import "FirebaseStorage/Sources/FIRStoragePath.h"

#if SWIFT_PACKAGE
@import GTMSessionFetcherCore;
#else
#import <GTMSessionFetcher/GTMSessionFetcher.h>
#endif

// This is the list at https://cloud.google.com/storage/docs/json_api/ without &, ; and +.
NSString *const kGCSObjectAllowedCharacterSet =
Expand Down
8 changes: 5 additions & 3 deletions FirebaseStorage/Tests/Integration/FIRStorageIntegrationTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#import <FirebaseAuth/FirebaseAuth.h>
#import <FirebaseStorage/FirebaseStorage.h>
#import <XCTest/XCTest.h>

#import "FirebaseStorage/Sources/Public/FirebaseStorage.h"

#import <FirebaseAuth/FirebaseAuth.h>

#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"

#import "Credentials.h"
#import "FirebaseStorage/Tests/Integration/Credentials.h"

NSTimeInterval kFIRStorageIntegrationTestTimeout = 60;

Expand Down
2 changes: 1 addition & 1 deletion FirebaseStorage/Tests/Unit/FIRStorageDeleteTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#import "FIRStorageTestHelpers.h"
#import "FirebaseStorage/Sources/FIRStorageDeleteTask.h"
#import "FirebaseStorage/Tests/Unit/FIRStorageTestHelpers.h"

@interface FIRStorageDeleteTests : XCTestCase

Expand Down
Loading