diff --git a/FirebaseAnalytics.podspec b/FirebaseAnalytics.podspec index 73b53744aa3..a735fb20ead 100644 --- a/FirebaseAnalytics.podspec +++ b/FirebaseAnalytics.podspec @@ -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' diff --git a/FirebaseAppCheck.podspec b/FirebaseAppCheck.podspec index b47e53b176c..c2632222f39 100644 --- a/FirebaseAppCheck.podspec +++ b/FirebaseAppCheck.podspec @@ -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', diff --git a/FirebaseAppDistribution.podspec b/FirebaseAppDistribution.podspec index 4d588e1075c..01fa97a270c 100644 --- a/FirebaseAppDistribution.podspec +++ b/FirebaseAppDistribution.podspec @@ -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 = { diff --git a/FirebaseAuth.podspec b/FirebaseAuth.podspec index 8357e9df8d1..cd7f217fbbe 100644 --- a/FirebaseAuth.podspec +++ b/FirebaseAuth.podspec @@ -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| diff --git a/FirebaseCore.podspec b/FirebaseCore.podspec index a665008438c..78a66ecddde 100644 --- a/FirebaseCore.podspec +++ b/FirebaseCore.podspec @@ -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 = { diff --git a/FirebaseCoreInternal.podspec b/FirebaseCoreInternal.podspec index 1aaad594c31..acbc572d227 100644 --- a/FirebaseCoreInternal.podspec +++ b/FirebaseCoreInternal.podspec @@ -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 } diff --git a/FirebaseCrashlytics.podspec b/FirebaseCrashlytics.podspec index 25c2f7b09dd..8fbe1b23ed2 100644 --- a/FirebaseCrashlytics.podspec +++ b/FirebaseCrashlytics.podspec @@ -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' diff --git a/FirebaseDatabase.podspec b/FirebaseDatabase.podspec index e9d692accb7..b04c608a369 100644 --- a/FirebaseDatabase.podspec +++ b/FirebaseDatabase.podspec @@ -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}"' diff --git a/FirebaseDynamicLinks.podspec b/FirebaseDynamicLinks.podspec index 48efe770eee..f5e4242871c 100644 --- a/FirebaseDynamicLinks.podspec +++ b/FirebaseDynamicLinks.podspec @@ -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 diff --git a/FirebaseInAppMessaging.podspec b/FirebaseInAppMessaging.podspec index 82ee836e18b..ef7db6dd192 100644 --- a/FirebaseInAppMessaging.podspec +++ b/FirebaseInAppMessaging.podspec @@ -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| diff --git a/FirebaseInstallations.podspec b/FirebaseInstallations.podspec index 148cdb0a3e7..48214947c54 100644 --- a/FirebaseInstallations.podspec +++ b/FirebaseInstallations.podspec @@ -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 = { diff --git a/FirebaseMLModelDownloader.podspec b/FirebaseMLModelDownloader.podspec index 0fdc9c30ef7..2649d7779f6 100644 --- a/FirebaseMLModelDownloader.podspec +++ b/FirebaseMLModelDownloader.podspec @@ -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 = { diff --git a/FirebaseMessaging.podspec b/FirebaseMessaging.podspec index 32b9e73a863..5ac8758db6b 100644 --- a/FirebaseMessaging.podspec +++ b/FirebaseMessaging.podspec @@ -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| diff --git a/FirebasePerformance.podspec b/FirebasePerformance.podspec index debb8bfe16d..06b11e984fb 100644 --- a/FirebasePerformance.podspec +++ b/FirebasePerformance.podspec @@ -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| diff --git a/FirebasePerformance/Sources/Instrumentation/FPRNetworkTrace.m b/FirebasePerformance/Sources/Instrumentation/FPRNetworkTrace.m index f3c7e32d2ff..3dc817f3e02 100644 --- a/FirebasePerformance/Sources/Instrumentation/FPRNetworkTrace.m +++ b/FirebasePerformance/Sources/Instrumentation/FPRNetworkTrace.m @@ -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; } @@ -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]; } } diff --git a/FirebasePerformance/Sources/Instrumentation/Network/FPRNSURLConnectionInstrument.m b/FirebasePerformance/Sources/Instrumentation/Network/FPRNSURLConnectionInstrument.m index 14c5840cc5f..82176dbda2c 100644 --- a/FirebasePerformance/Sources/Instrumentation/Network/FPRNSURLConnectionInstrument.m +++ b/FirebasePerformance/Sources/Instrumentation/Network/FPRNSURLConnectionInstrument.m @@ -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]; } @@ -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]; } @@ -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]; diff --git a/FirebaseRemoteConfig.podspec b/FirebaseRemoteConfig.podspec index 205a4379e25..82f429dd39d 100644 --- a/FirebaseRemoteConfig.podspec +++ b/FirebaseRemoteConfig.podspec @@ -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| diff --git a/FirebaseSessions.podspec b/FirebaseSessions.podspec index 07021c7ee8a..659bf09a9c3 100644 --- a/FirebaseSessions.podspec +++ b/FirebaseSessions.podspec @@ -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' diff --git a/FirebaseStorage.podspec b/FirebaseStorage.podspec index 36f88e3d037..0c7b6c2e1aa 100644 --- a/FirebaseStorage.podspec +++ b/FirebaseStorage.podspec @@ -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 } diff --git a/GoogleAppMeasurement.podspec b/GoogleAppMeasurement.podspec index 915d098653b..bb9a5224aed 100644 --- a/GoogleAppMeasurement.podspec +++ b/GoogleAppMeasurement.podspec @@ -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'