Skip to content

[Firebase 11] Bump deps on GULs to v8 and GDT to v10 #13036

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 4 commits into from
May 31, 2024
Merged

[Firebase 11] Bump deps on GULs to v8 and GDT to v10 #13036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9784cbb
[Firebase 11] Bump GoogleUtilities dependencies to v8
ncooke3 May 30, 2024
56c694d
Fix missed version specifiers
ncooke3 May 30, 2024
e2acec9
[Firebase 11] Add bridged casts in FirebasePerformance (#13040)
andrewheard May 30, 2024
088b245
Bump base version pinning for GoogleDataTransport
ncooke3 May 30, 2024
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: 4 additions & 4 deletions FirebaseAnalytics.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ Pod::Spec.new do |s|

s.dependency 'FirebaseCore', '~> 10.0'
s.dependency 'FirebaseInstallations', '~> 10.0'
s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 7.11'
s.dependency 'GoogleUtilities/MethodSwizzler', '~> 7.11'
s.dependency 'GoogleUtilities/NSData+zlib', '~> 7.11'
s.dependency 'GoogleUtilities/Network', '~> 7.11'
s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 8.0'
s.dependency 'GoogleUtilities/MethodSwizzler', '~> 8.0'
s.dependency 'GoogleUtilities/NSData+zlib', '~> 8.0'
s.dependency 'GoogleUtilities/Network', '~> 8.0'
s.dependency 'nanopb', '>= 2.30908.0', '< 2.30911.0'

s.default_subspecs = 'AdIdSupport'
Expand Down
4 changes: 2 additions & 2 deletions FirebaseAppCheck.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ Pod::Spec.new do |s|
s.dependency 'FirebaseAppCheckInterop', '~> 10.17'
s.dependency 'FirebaseCore', '~> 10.18'
s.dependency 'PromisesObjC', '~> 2.1'
s.dependency 'GoogleUtilities/Environment', '~> 7.13'
s.dependency 'GoogleUtilities/UserDefaults', '~> 7.13'
s.dependency 'GoogleUtilities/Environment', '~> 8.0'
s.dependency 'GoogleUtilities/UserDefaults', '~> 8.0'

s.pod_target_xcconfig = {
'GCC_C_LANGUAGE_STANDARD' => 'c99',
Expand Down
4 changes: 2 additions & 2 deletions FirebaseAppDistribution.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ iOS SDK for App Distribution for Firebase.
s.public_header_files = base_dir + 'Public/FirebaseAppDistribution/*.h'

s.dependency 'FirebaseCore', '~> 10.0'
s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 7.8'
s.dependency 'GoogleUtilities/UserDefaults', '~> 7.8'
s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 8.0'
s.dependency 'GoogleUtilities/UserDefaults', '~> 8.0'
s.dependency 'FirebaseInstallations', '~> 10.0'

s.pod_target_xcconfig = {
Expand Down
4 changes: 2 additions & 2 deletions FirebaseAuth.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ supports email and password accounts, as well as several 3rd party authenticatio
s.dependency 'FirebaseAppCheckInterop', '~> 10.17'
s.dependency 'FirebaseCore', '~> 10.0'
s.dependency 'FirebaseCoreExtension', '~> 10.0'
s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 7.8'
s.dependency 'GoogleUtilities/Environment', '~> 7.8'
s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 8.0'
s.dependency 'GoogleUtilities/Environment', '~> 8.0'
s.dependency 'GTMSessionFetcher/Core', '>= 2.1', '< 4.0'
s.ios.dependency 'RecaptchaInterop', '~> 100.0'
s.test_spec 'unit' do |unit_tests|
Expand Down
4 changes: 2 additions & 2 deletions FirebaseCore.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ Firebase Core includes FIRApp and FIROptions which provide central configuration
s.watchos.framework = 'WatchKit'

# Remember to also update version in `cmake/external/GoogleUtilities.cmake`
s.dependency 'GoogleUtilities/Environment', '~> 7.12'
s.dependency 'GoogleUtilities/Logger', '~> 7.12'
s.dependency 'GoogleUtilities/Environment', '~> 8.0'
s.dependency 'GoogleUtilities/Logger', '~> 8.0'
s.dependency 'FirebaseCoreInternal', '~> 10.0'

s.pod_target_xcconfig = {
Expand Down
2 changes: 1 addition & 1 deletion FirebaseCoreInternal.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Pod::Spec.new do |s|

s.swift_version = '5.3'

s.dependency 'GoogleUtilities/NSData+zlib', '~> 7.8'
s.dependency 'GoogleUtilities/NSData+zlib', '~> 8.0'

s.test_spec 'Unit' do |unit_tests|
unit_tests.scheme = { :code_coverage => true }
Expand Down
4 changes: 2 additions & 2 deletions FirebaseCrashlytics.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ Pod::Spec.new do |s|
s.dependency 'FirebaseSessions', '~> 10.5'
s.dependency 'FirebaseRemoteConfigInterop', '~> 10.23'
s.dependency 'PromisesObjC', '~> 2.1'
s.dependency 'GoogleDataTransport', '~> 9.2'
s.dependency 'GoogleUtilities/Environment', '~> 7.8'
s.dependency 'GoogleDataTransport', '~> 10.0'
s.dependency 'GoogleUtilities/Environment', '~> 8.0'
s.dependency 'nanopb', '>= 2.30908.0', '< 2.30911.0'

s.libraries = 'c++', 'z'
Expand Down
2 changes: 1 addition & 1 deletion FirebaseDatabase.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Simplify your iOS development, grow your user base, and monetize more effectivel
s.dependency 'FirebaseCore', '~> 10.0'
s.dependency 'FirebaseAppCheckInterop', '~> 10.17'
s.dependency 'FirebaseSharedSwift', '~> 10.0'
s.dependency 'GoogleUtilities/UserDefaults', '~> 7.13'
s.dependency 'GoogleUtilities/UserDefaults', '~> 8.0'
s.pod_target_xcconfig = {
'GCC_C_LANGUAGE_STANDARD' => 'c99',
'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"'
Expand Down
4 changes: 2 additions & 2 deletions FirebaseDynamicLinks.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Firebase Dynamic Links are deep links that enhance user experience and increase
# Supply plist for custom domain testing.
'FirebaseDynamicLinks/Tests/Unit/DL-Info.plist'
unit_tests.dependency 'OCMock'
unit_tests.dependency 'GoogleUtilities/MethodSwizzler', '~> 7.8'
unit_tests.dependency 'GoogleUtilities/SwizzlerTestHelpers', '~> 7.8'
unit_tests.dependency 'GoogleUtilities/MethodSwizzler', '~> 8.0'
unit_tests.dependency 'GoogleUtilities/SwizzlerTestHelpers', '~> 8.0'
end
end
4 changes: 2 additions & 2 deletions FirebaseInAppMessaging.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ See more product details at https://firebase.google.com/products/in-app-messagin
s.dependency 'FirebaseCore', '~> 10.0'
s.dependency 'FirebaseInstallations', '~> 10.0'
s.dependency 'FirebaseABTesting', '~> 10.0'
s.dependency 'GoogleUtilities/Environment', '~> 7.13'
s.dependency 'GoogleUtilities/UserDefaults', '~> 7.13'
s.dependency 'GoogleUtilities/Environment', '~> 8.0'
s.dependency 'GoogleUtilities/UserDefaults', '~> 8.0'
s.dependency 'nanopb', '>= 2.30908.0', '< 2.30911.0'

s.test_spec 'unit' do |unit_tests|
Expand Down
4 changes: 2 additions & 2 deletions FirebaseInstallations.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ Pod::Spec.new do |s|
s.framework = 'Security'
s.dependency 'FirebaseCore', '~> 10.0'
s.dependency 'PromisesObjC', '~> 2.1'
s.dependency 'GoogleUtilities/Environment', '~> 7.8'
s.dependency 'GoogleUtilities/UserDefaults', '~> 7.8'
s.dependency 'GoogleUtilities/Environment', '~> 8.0'
s.dependency 'GoogleUtilities/UserDefaults', '~> 8.0'

preprocessor_definitions = ''
s.pod_target_xcconfig = {
Expand Down
6 changes: 3 additions & 3 deletions FirebaseMLModelDownloader.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ Pod::Spec.new do |s|
s.framework = 'Foundation'
s.dependency 'FirebaseCore', '~> 10.0'
s.dependency 'FirebaseInstallations', '~> 10.0'
s.dependency 'GoogleDataTransport', '~> 9.2'
s.dependency 'GoogleDataTransport', '~> 10.0'
# TODO: Revisit this dependency
s.dependency 'GoogleUtilities/Logger', '~> 7.13'
s.dependency 'GoogleUtilities/UserDefaults', '~> 7.13'
s.dependency 'GoogleUtilities/Logger', '~> 8.0'
s.dependency 'GoogleUtilities/UserDefaults', '~> 8.0'
s.dependency 'SwiftProtobuf', '~> 1.19'

s.pod_target_xcconfig = {
Expand Down
10 changes: 5 additions & 5 deletions FirebaseMessaging.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ device, and it is completely free.
s.weak_framework = 'UserNotifications'
s.dependency 'FirebaseInstallations', '~> 10.0'
s.dependency 'FirebaseCore', '~> 10.0'
s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 7.8'
s.dependency 'GoogleUtilities/Reachability', '~> 7.8'
s.dependency 'GoogleUtilities/Environment', '~> 7.8'
s.dependency 'GoogleUtilities/UserDefaults', '~> 7.8'
s.dependency 'GoogleDataTransport', '~> 9.3'
s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 8.0'
s.dependency 'GoogleUtilities/Reachability', '~> 8.0'
s.dependency 'GoogleUtilities/Environment', '~> 8.0'
s.dependency 'GoogleUtilities/UserDefaults', '~> 8.0'
s.dependency 'GoogleDataTransport', '~> 10.0'
s.dependency 'nanopb', '>= 2.30908.0', '< 2.30911.0'

s.test_spec 'unit' do |unit_tests|
Expand Down
10 changes: 5 additions & 5 deletions FirebasePerformance.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ Firebase Performance library to measure performance of Mobile and Web Apps.
s.dependency 'FirebaseInstallations', '~> 10.0'
s.dependency 'FirebaseRemoteConfig', '~> 10.0'
s.dependency 'FirebaseSessions', '~> 10.5'
s.dependency 'GoogleDataTransport', '~> 9.2'
s.dependency 'GoogleUtilities/Environment', '~> 7.13'
s.dependency 'GoogleUtilities/ISASwizzler', '~> 7.13'
s.dependency 'GoogleUtilities/MethodSwizzler', '~> 7.13'
s.dependency 'GoogleUtilities/UserDefaults', '~> 7.13'
s.dependency 'GoogleDataTransport', '~> 10.0'
s.dependency 'GoogleUtilities/Environment', '~> 8.0'
s.dependency 'GoogleUtilities/ISASwizzler', '~> 8.0'
s.dependency 'GoogleUtilities/MethodSwizzler', '~> 8.0'
s.dependency 'GoogleUtilities/UserDefaults', '~> 8.0'
s.dependency 'nanopb', '>= 2.30908.0', '< 2.30911.0'

s.test_spec 'unit' do |unit_tests|
Expand Down
23 changes: 13 additions & 10 deletions FirebasePerformance/Sources/Instrumentation/FPRNetworkTrace.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,18 +427,20 @@ - (void)removeAttribute:(NSString *)attribute {

+ (void)addNetworkTrace:(FPRNetworkTrace *)networkTrace toObject:(id)object {
if (object != nil && networkTrace != nil) {
[GULObjectSwizzler setAssociatedObject:object
key:kFPRNetworkTracePropertyName
value:networkTrace
association:GUL_ASSOCIATION_RETAIN_NONATOMIC];
[GULObjectSwizzler
setAssociatedObject:object
key:(__bridge const void *_Nonnull)kFPRNetworkTracePropertyName
value:networkTrace
association:GUL_ASSOCIATION_RETAIN_NONATOMIC];
}
}

+ (FPRNetworkTrace *)networkTraceFromObject:(id)object {
FPRNetworkTrace *networkTrace = nil;
if (object != nil) {
id traceObject = [GULObjectSwizzler getAssociatedObject:object
key:kFPRNetworkTracePropertyName];
id traceObject = [GULObjectSwizzler
getAssociatedObject:object
key:(__bridge const void *_Nonnull)kFPRNetworkTracePropertyName];
if ([traceObject isKindOfClass:[FPRNetworkTrace class]]) {
networkTrace = (FPRNetworkTrace *)traceObject;
}
Expand All @@ -449,10 +451,11 @@ + (FPRNetworkTrace *)networkTraceFromObject:(id)object {

+ (void)removeNetworkTraceFromObject:(id)object {
if (object != nil) {
[GULObjectSwizzler setAssociatedObject:object
key:kFPRNetworkTracePropertyName
value:nil
association:GUL_ASSOCIATION_RETAIN_NONATOMIC];
[GULObjectSwizzler
setAssociatedObject:object
key:(__bridge const void *_Nonnull)kFPRNetworkTracePropertyName
value:nil
association:GUL_ASSOCIATION_RETAIN_NONATOMIC];
}
}

Expand Down
11 changes: 6 additions & 5 deletions FirebasePerformance/Sources/Instrumentation/Network/FPRNSURLConnectionInstrument.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,13 @@ void InstrumentInitWithRequestDelegate(FPRClassInstrumentor *instrumentor,
[delegateInstrument registerClass:[delegate class]];
[delegateInstrument registerObject:delegate];
[GULObjectSwizzler setAssociatedObject:connection
key:kFPRDelegateKey
key:(__bridge const void *_Nonnull)kFPRDelegateKey
value:delegate
association:GUL_ASSOCIATION_ASSIGN];
} else {
delegate = [[FPRNSURLConnectionDelegate alloc] init];
[GULObjectSwizzler setAssociatedObject:connection
key:kFPRDelegateKey
key:(__bridge const void *_Nonnull)kFPRDelegateKey
value:delegate
association:GUL_ASSOCIATION_ASSIGN];
}
Expand Down Expand Up @@ -133,13 +133,13 @@ void InstrumentInitWithRequestDelegateStartImmediately(
[delegateInstrument registerObject:delegate];

[GULObjectSwizzler setAssociatedObject:connection
key:kFPRDelegateKey
key:(__bridge const void *_Nonnull)kFPRDelegateKey
value:delegate
association:GUL_ASSOCIATION_ASSIGN];
} else {
delegate = [[FPRNSURLConnectionDelegate alloc] init];
[GULObjectSwizzler setAssociatedObject:connection
key:kFPRDelegateKey
key:(__bridge const void *_Nonnull)kFPRDelegateKey
value:delegate
association:GUL_ASSOCIATION_ASSIGN];
}
Expand All @@ -161,7 +161,8 @@ void InstrumentConnectionStart(FPRClassInstrumentor *instrumentor) {
[selectorInstrumentor setReplacingBlock:^(id object) {
typedef void (*OriginalImp)(id, SEL);
NSURLConnection *connection = (NSURLConnection *)object;
if ([GULObjectSwizzler getAssociatedObject:connection key:kFPRDelegateKey]) {
if ([GULObjectSwizzler getAssociatedObject:connection
key:(__bridge const void *_Nonnull)kFPRDelegateKey]) {
FPRNetworkTrace *trace =
[[FPRNetworkTrace alloc] initWithURLRequest:connection.originalRequest];
[trace start];
Expand Down
4 changes: 2 additions & 2 deletions FirebaseRemoteConfig.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ app update.
s.dependency 'FirebaseSharedSwift', '~> 10.0'
s.dependency 'FirebaseCore', '~> 10.0'
s.dependency 'FirebaseInstallations', '~> 10.0'
s.dependency 'GoogleUtilities/Environment', '~> 7.8'
s.dependency 'GoogleUtilities/NSData+zlib', '~> 7.8'
s.dependency 'GoogleUtilities/Environment', '~> 8.0'
s.dependency 'GoogleUtilities/NSData+zlib', '~> 8.0'
s.dependency 'FirebaseRemoteConfigInterop', '~> 10.23'

s.test_spec 'unit' do |unit_tests|
Expand Down
6 changes: 3 additions & 3 deletions FirebaseSessions.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ Pod::Spec.new do |s|
s.dependency 'FirebaseCore', '~> 10.5'
s.dependency 'FirebaseCoreExtension', '~> 10.0'
s.dependency 'FirebaseInstallations', '~> 10.0'
s.dependency 'GoogleDataTransport', '~> 9.2'
s.dependency 'GoogleUtilities/Environment', '~> 7.13'
s.dependency 'GoogleUtilities/UserDefaults', '~> 7.13'
s.dependency 'GoogleDataTransport', '~> 10.0'
s.dependency 'GoogleUtilities/Environment', '~> 8.0'
s.dependency 'GoogleUtilities/UserDefaults', '~> 8.0'
s.dependency 'nanopb', '>= 2.30908.0', '< 2.30911.0'
s.dependency 'PromisesSwift', '~> 2.1'

Expand Down
2 changes: 1 addition & 1 deletion FirebaseStorage.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Firebase Storage provides robust, secure file uploads and downloads from Firebas
s.dependency 'FirebaseCore', '~> 10.0'
s.dependency 'FirebaseCoreExtension', '~> 10.0'
s.dependency 'GTMSessionFetcher/Core', '>= 2.1', '< 4.0'
s.dependency 'GoogleUtilities/Environment', '~> 7.12'
s.dependency 'GoogleUtilities/Environment', '~> 8.0'

s.test_spec 'ObjCIntegration' do |objc_tests|
objc_tests.scheme = { :code_coverage => true }
Expand Down
8 changes: 4 additions & 4 deletions GoogleAppMeasurement.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ Pod::Spec.new do |s|
s.libraries = 'c++', 'sqlite3', 'z'
s.frameworks = 'StoreKit'

s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 7.11'
s.dependency 'GoogleUtilities/MethodSwizzler', '~> 7.11'
s.dependency 'GoogleUtilities/NSData+zlib', '~> 7.11'
s.dependency 'GoogleUtilities/Network', '~> 7.11'
s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 8.0'
s.dependency 'GoogleUtilities/MethodSwizzler', '~> 8.0'
s.dependency 'GoogleUtilities/NSData+zlib', '~> 8.0'
s.dependency 'GoogleUtilities/Network', '~> 8.0'
s.dependency 'nanopb', '>= 2.30908.0', '< 2.30911.0'

s.default_subspecs = 'AdIdSupport'
Expand Down
Loading