Skip to content

Commit e09c378

Browse files
authored
Reenable any GTMSessionFetcher 2.x dependency (#10131)
1 parent 1358e34 commit e09c378

File tree

5 files changed

+11
-2
lines changed

5 files changed

+11
-2
lines changed

FirebaseCore/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Firebase 9.6.0
2+
- [fixed] Update dependency specification for GTMSessionFetcher to allow all 2.x versions. (#10131)
3+
14
# Firebase 9.5.0
25
- [fixed] Zip Distribution Fixed Promises module name issue impacting lld builds. (#10071)
36
- [fixed] Limit dependency GTMSessionFetcher version update to < 2.1.0 to avoid a new deprecation

FirebaseStorageInternal.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Objective-C Implementations for FirebaseStorage. This pod should not be directly
4444
s.osx.framework = 'CoreServices'
4545

4646
s.dependency 'FirebaseCore', '~> 9.0'
47-
s.dependency 'GTMSessionFetcher/Core', '>= 1.7', '< 2.1'
47+
s.dependency 'GTMSessionFetcher/Core', '>= 1.7', '< 3.0'
4848
s.pod_target_xcconfig = {
4949
'GCC_C_LANGUAGE_STANDARD' => 'c99',
5050
'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"'

FirebaseStorageInternal/Sources/FIRStorageTokenAuthorizer.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@ NS_ASSUME_NONNULL_BEGIN
3232
* If no authentication provider exists or no token is found, no token is added
3333
* and the request is passed.
3434
*/
35+
#pragma clang diagnostic push
36+
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
3537
@interface FIRStorageTokenAuthorizer : NSObject <GTMFetcherAuthorizationProtocol>
38+
#pragma clang diagnostic pop
3639

3740
/**
3841
* Initializes the token authorizer with an instance of FIRApp.

FirebaseStorageInternal/Sources/FIRStorageTokenAuthorizer.m

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,12 @@ - (instancetype)initWithGoogleAppID:(NSString *)googleAppID
5858

5959
#pragma mark - GTMFetcherAuthorizationProtocol methods
6060

61+
#pragma clang diagnostic push
62+
#pragma clang diagnostic ignored "-Wdeprecated-implementations"
6163
- (void)authorizeRequest:(NSMutableURLRequest *)request
6264
delegate:(id)delegate
6365
didFinishSelector:(SEL)sel {
66+
#pragma clang diagnostic push
6467
// Set version header on each request
6568
NSString *versionString = [NSString stringWithFormat:@"ios/%@", FIRFirebaseVersion()];
6669
[request setValue:versionString forHTTPHeaderField:@"x-firebase-storage-version"];

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ let package = Package(
165165
.package(
166166
name: "GTMSessionFetcher",
167167
url: "https://github.com/google/gtm-session-fetcher.git",
168-
"1.7.2" ..< "2.1.0"
168+
"1.7.2" ..< "3.0.0"
169169
),
170170
.package(
171171
name: "nanopb",

0 commit comments

Comments
 (0)