From fb1ec23459a48898ff6aff11c02d95689f9f667a Mon Sep 17 00:00:00 2001 From: Rui Date: Wed, 22 Nov 2023 13:45:38 -0800 Subject: [PATCH] Bump Abacus and check for transferStatus.squidTransactionStatus. --- dydx/Podfile.lock | 112 ++++----- .../FirebaseCore/Extension/FIRLogger.h | 5 + .../FirebaseCore/Extension/FIRLogger.h | 5 + .../FirebaseCore/Sources/FIRLogger.m | 4 + .../FirebaseCore/Extension/FIRLogger.h | 5 + .../FirebaseCore/Extension/FIRLogger.h | 5 + .../FirebaseCore/Extension/FIRLogger.h | 5 + .../FirebaseCore/Extension/FIRLogger.h | 5 + .../FirebaseCore/Extension/FIRLogger.h | 5 + .../Sources/Gauges/CPU/FPRCPUGaugeCollector.m | 2 +- .../FirebaseCore/Extension/FIRLogger.h | 5 + dydx/Pods/Local Podspecs/abacus.podspec.json | 6 +- dydx/Pods/Manifest.lock | 112 ++++----- dydx/Pods/Pods.xcodeproj/project.pbxproj | 134 +++++------ .../SDWebImage/Core/SDAnimatedImage.h | 6 +- .../SDWebImage/Core/SDAnimatedImage.m | 53 +++-- .../SDWebImage/Core/SDAnimatedImageView.m | 11 + .../SDWebImage/Core/SDImageIOAnimatedCoder.m | 214 +++++++++++++++++- .../SDWebImage/Core/UIImage+Transform.h | 2 + .../SDWebImage/Core/UIImage+Transform.m | 70 +++++- .../FirebaseABTesting-Info.plist | 2 +- .../FirebaseCore/FirebaseCore-Info.plist | 2 +- .../FirebaseCore/FirebaseCore.debug.xcconfig | 2 +- .../FirebaseCore.release.xcconfig | 2 +- .../FirebaseCoreExtension-Info.plist | 2 +- .../FirebaseCoreInternal-Info.plist | 2 +- .../FirebaseCrashlytics-Info.plist | 2 +- .../FirebaseInstallations-Info.plist | 2 +- .../FirebaseMessaging-Info.plist | 2 +- .../FirebasePerformance-Info.plist | 2 +- .../FirebasePerformance.debug.xcconfig | 2 +- .../FirebasePerformance.release.xcconfig | 2 +- .../FirebaseRemoteConfig-Info.plist | 2 +- .../FirebaseSessions-Info.plist | 2 +- .../FirebaseSharedSwift-Info.plist | 2 +- .../SDWebImage/SDWebImage-Info.plist | 2 +- .../dydxTransferStatusViewBuilder.swift | 4 + podspecs/Abacus.podspec | 2 +- 38 files changed, 579 insertions(+), 225 deletions(-) diff --git a/dydx/Podfile.lock b/dydx/Podfile.lock index 2bff87bef..5928dc5e5 100644 --- a/dydx/Podfile.lock +++ b/dydx/Podfile.lock @@ -1,5 +1,5 @@ PODS: - - Abacus (1.0.25) + - Abacus (1.0.29) - Amplitude-iOS (4.10.0) - AppsFlyerFramework (6.12.2): - AppsFlyerFramework/Main (= 6.12.2) @@ -19,27 +19,27 @@ PODS: - EasyTipView (2.1.0) - EFQRCode (6.2.1): - swift_qrcodejs (~> 2.2.2) - - Firebase/AnalyticsWithoutAdIdSupport (10.17.0): + - Firebase/AnalyticsWithoutAdIdSupport (10.18.0): - Firebase/CoreOnly - - FirebaseAnalytics/WithoutAdIdSupport (~> 10.17.0) - - Firebase/Core (10.17.0): + - FirebaseAnalytics/WithoutAdIdSupport (~> 10.18.0) + - Firebase/Core (10.18.0): - Firebase/CoreOnly - - FirebaseAnalytics (~> 10.17.0) - - Firebase/CoreOnly (10.17.0): - - FirebaseCore (= 10.17.0) - - Firebase/Messaging (10.17.0): + - FirebaseAnalytics (~> 10.18.0) + - Firebase/CoreOnly (10.18.0): + - FirebaseCore (= 10.18.0) + - Firebase/Messaging (10.18.0): - Firebase/CoreOnly - - FirebaseMessaging (~> 10.17.0) - - Firebase/Performance (10.17.0): + - FirebaseMessaging (~> 10.18.0) + - Firebase/Performance (10.18.0): - Firebase/CoreOnly - - FirebasePerformance (~> 10.17.0) - - Firebase/RemoteConfig (10.17.0): + - FirebasePerformance (~> 10.18.0) + - Firebase/RemoteConfig (10.18.0): - Firebase/CoreOnly - - FirebaseRemoteConfig (~> 10.17.0) - - FirebaseABTesting (10.17.0): + - FirebaseRemoteConfig (~> 10.18.0) + - FirebaseABTesting (10.18.0): - FirebaseCore (~> 10.0) - - FirebaseAnalytics (10.17.0): - - FirebaseAnalytics/AdIdSupport (= 10.17.0) + - FirebaseAnalytics (10.18.0): + - FirebaseAnalytics/AdIdSupport (= 10.18.0) - FirebaseCore (~> 10.0) - FirebaseInstallations (~> 10.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.11) @@ -47,33 +47,33 @@ PODS: - GoogleUtilities/Network (~> 7.11) - "GoogleUtilities/NSData+zlib (~> 7.11)" - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseAnalytics/AdIdSupport (10.17.0): + - FirebaseAnalytics/AdIdSupport (10.18.0): - FirebaseCore (~> 10.0) - FirebaseInstallations (~> 10.0) - - GoogleAppMeasurement (= 10.17.0) + - GoogleAppMeasurement (= 10.18.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.11) - GoogleUtilities/MethodSwizzler (~> 7.11) - GoogleUtilities/Network (~> 7.11) - "GoogleUtilities/NSData+zlib (~> 7.11)" - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseAnalytics/WithoutAdIdSupport (10.17.0): + - FirebaseAnalytics/WithoutAdIdSupport (10.18.0): - FirebaseCore (~> 10.0) - FirebaseInstallations (~> 10.0) - - GoogleAppMeasurement/WithoutAdIdSupport (= 10.17.0) + - GoogleAppMeasurement/WithoutAdIdSupport (= 10.18.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.11) - GoogleUtilities/MethodSwizzler (~> 7.11) - GoogleUtilities/Network (~> 7.11) - "GoogleUtilities/NSData+zlib (~> 7.11)" - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseCore (10.17.0): + - FirebaseCore (10.18.0): - FirebaseCoreInternal (~> 10.0) - - GoogleUtilities/Environment (~> 7.8) - - GoogleUtilities/Logger (~> 7.8) - - FirebaseCoreExtension (10.17.0): + - GoogleUtilities/Environment (~> 7.12) + - GoogleUtilities/Logger (~> 7.12) + - FirebaseCoreExtension (10.18.0): - FirebaseCore (~> 10.0) - - FirebaseCoreInternal (10.17.0): + - FirebaseCoreInternal (10.18.0): - "GoogleUtilities/NSData+zlib (~> 7.8)" - - FirebaseCrashlytics (10.17.0): + - FirebaseCrashlytics (10.18.0): - FirebaseCore (~> 10.5) - FirebaseInstallations (~> 10.0) - FirebaseSessions (~> 10.5) @@ -81,12 +81,12 @@ PODS: - GoogleUtilities/Environment (~> 7.8) - nanopb (< 2.30910.0, >= 2.30908.0) - PromisesObjC (~> 2.1) - - FirebaseInstallations (10.17.0): + - FirebaseInstallations (10.18.0): - FirebaseCore (~> 10.0) - GoogleUtilities/Environment (~> 7.8) - GoogleUtilities/UserDefaults (~> 7.8) - PromisesObjC (~> 2.1) - - FirebaseMessaging (10.17.0): + - FirebaseMessaging (10.18.0): - FirebaseCore (~> 10.0) - FirebaseInstallations (~> 10.0) - GoogleDataTransport (~> 9.2) @@ -95,7 +95,7 @@ PODS: - GoogleUtilities/Reachability (~> 7.8) - GoogleUtilities/UserDefaults (~> 7.8) - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebasePerformance (10.17.0): + - FirebasePerformance (10.18.0): - FirebaseCore (~> 10.5) - FirebaseInstallations (~> 10.0) - FirebaseRemoteConfig (~> 10.0) @@ -105,14 +105,14 @@ PODS: - GoogleUtilities/ISASwizzler (~> 7.8) - GoogleUtilities/MethodSwizzler (~> 7.8) - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseRemoteConfig (10.17.0): + - FirebaseRemoteConfig (10.18.0): - FirebaseABTesting (~> 10.0) - FirebaseCore (~> 10.0) - FirebaseInstallations (~> 10.0) - FirebaseSharedSwift (~> 10.0) - GoogleUtilities/Environment (~> 7.8) - "GoogleUtilities/NSData+zlib (~> 7.8)" - - FirebaseSessions (10.17.0): + - FirebaseSessions (10.18.0): - FirebaseCore (~> 10.5) - FirebaseCoreExtension (~> 10.0) - FirebaseInstallations (~> 10.0) @@ -120,24 +120,24 @@ PODS: - GoogleUtilities/Environment (~> 7.10) - nanopb (< 2.30910.0, >= 2.30908.0) - PromisesSwift (~> 2.1) - - FirebaseSharedSwift (10.17.0) + - FirebaseSharedSwift (10.18.0) - FloatingPanel (2.7.0) - FullStory (1.29.0) - - GoogleAppMeasurement (10.17.0): - - GoogleAppMeasurement/AdIdSupport (= 10.17.0) + - GoogleAppMeasurement (10.18.0): + - GoogleAppMeasurement/AdIdSupport (= 10.18.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.11) - GoogleUtilities/MethodSwizzler (~> 7.11) - GoogleUtilities/Network (~> 7.11) - "GoogleUtilities/NSData+zlib (~> 7.11)" - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleAppMeasurement/AdIdSupport (10.17.0): - - GoogleAppMeasurement/WithoutAdIdSupport (= 10.17.0) + - GoogleAppMeasurement/AdIdSupport (10.18.0): + - GoogleAppMeasurement/WithoutAdIdSupport (= 10.18.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.11) - GoogleUtilities/MethodSwizzler (~> 7.11) - GoogleUtilities/Network (~> 7.11) - "GoogleUtilities/NSData+zlib (~> 7.11)" - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleAppMeasurement/WithoutAdIdSupport (10.17.0): + - GoogleAppMeasurement/WithoutAdIdSupport (10.18.0): - GoogleUtilities/AppDelegateSwizzler (~> 7.11) - GoogleUtilities/MethodSwizzler (~> 7.11) - GoogleUtilities/Network (~> 7.11) @@ -243,9 +243,9 @@ PODS: - PromisesObjC (= 2.3.1) - RDHCollectionViewGridLayout (1.2.5) - ReachabilitySwift (5.0.0) - - SDWebImage (5.18.3): - - SDWebImage/Core (= 5.18.3) - - SDWebImage/Core (5.18.3) + - SDWebImage (5.18.5): + - SDWebImage/Core (= 5.18.5) + - SDWebImage/Core (5.18.5) - SDWebImageSVGKitPlugin (1.4.0): - SDWebImage/Core (~> 5.10) - SVGKit (~> 3.0) @@ -376,7 +376,7 @@ CHECKOUT OPTIONS: :http: https://ios-releases.fullstory.com/fullstory-1.29.0-xcframework.tar.gz SPEC CHECKSUMS: - Abacus: adda053d053cbacb0579481b4b064b8fe2323588 + Abacus: a0095830abb42d305b76c324ac3e837f9b7d5ea7 Amplitude-iOS: 7d8cdc3408ba35c2e68368fc7c692cd104606b94 AppsFlyerFramework: 6eb4d89d2eb9a6632317f1055b359d9fd85fd5ff Atributika: 0eabae2cc37999e79c5b94f60213642946991b1c @@ -389,22 +389,22 @@ SPEC CHECKSUMS: DrawerMenu: f6ca91901e2b21086e3c19bcca278d3d3127e85f EasyTipView: a92b6edc377b81c5ac18e9fd35d5ee78e9409488 EFQRCode: a4d39ec3466b68dffa71de3b5caef7c9ceefdc53 - Firebase: f4ac0b02927af9253ae094d23deecf0890da7374 - FirebaseABTesting: 609e15b57b5f1096c8feb984e8995d9e769858fe - FirebaseAnalytics: b9284f9fff10157a843e0422e908711f7bf3b9f2 - FirebaseCore: 534544dd98cabcf4bf8598d88ec683b02319a528 - FirebaseCoreExtension: 47720bb330d7041047c0935a34a3a4b92f818074 - FirebaseCoreInternal: 2cf9202e226e3f78d2bf6d56c472686b935bfb7f - FirebaseCrashlytics: d78651ad7db206ef98269e103ac38d69d569200a - FirebaseInstallations: 9387bf15abfc69a714f54e54f74a251264fdb79b - FirebaseMessaging: 1367b28c0c83a63072af4a711328fcc2e6899902 - FirebasePerformance: ba663950bc790a4118c6aae13c6060e87888da75 - FirebaseRemoteConfig: 94ab72cd7aa865b6226ee527b1fa5c4f961a4e7b - FirebaseSessions: 49f39e5c10e3f9fdd38d01b748329bae2a2fa8ed - FirebaseSharedSwift: e8fe8d63d434266a1b2c7f02807d5b64462e1851 + Firebase: 414ad272f8d02dfbf12662a9d43f4bba9bec2a06 + FirebaseABTesting: d8b10ff4c6d1a9d6b11f02a08463ad5fd9fc6b1b + FirebaseAnalytics: 4d310b35c48eaa4a058ddc04bdca6bdb5dc0fe80 + FirebaseCore: 2322423314d92f946219c8791674d2f3345b598f + FirebaseCoreExtension: 62b201498aa10535801cdf3448c7f4db5e24ed80 + FirebaseCoreInternal: 8eb002e564b533bdcf1ba011f33f2b5c10e2ed4a + FirebaseCrashlytics: 86d5bce01f42fa1db265f87ff1d591f04db610ec + FirebaseInstallations: e842042ec6ac1fd2e37d7706363ebe7f662afea4 + FirebaseMessaging: 9bc34a98d2e0237e1b121915120d4d48ddcf301e + FirebasePerformance: c406a9198d8aabfbac281b42855f5122fc1bcf69 + FirebaseRemoteConfig: bbd42790a4e84fde6aab7eae810b608e7b5c0bf6 + FirebaseSessions: f90fe9212ee2818641eda051c0835c9c4e30d9ae + FirebaseSharedSwift: 62e248642c0582324d0390706cadd314687c116b FloatingPanel: c88e3fd981b7a74121ff48746fb14d496f5fd553 FullStory: 29e764d32050cb943d38b7b82c60b2f65f814737 - GoogleAppMeasurement: 4dcddfc7f102825c1c4e6422cb35567b101881a7 + GoogleAppMeasurement: 70ce9aa438cff1cfb31ea3e660bcc67734cb716e GoogleDataTransport: 54dee9d48d14580407f8f5fbf2f496e92437a2f2 GoogleToolboxForMac: 970a0066c5ac38b1bdd2abf94647fa7169ed1583 GoogleUtilities: 0759d1a57ebb953965c2dfe0ba4c82e95ccc2e34 @@ -424,7 +424,7 @@ SPEC CHECKSUMS: PromisesSwift: 28dca69a9c40779916ac2d6985a0192a5cb4a265 RDHCollectionViewGridLayout: 4b4229212ed8c136aa70101d92ecd43742ca62b6 ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825 - SDWebImage: 96e0c18ef14010b7485210e92fac888587ebb958 + SDWebImage: 7ac2b7ddc5e8484c79aa90fc4e30b149d6a2c88f SDWebImageSVGKitPlugin: 7542dd07c344ec3415ded0461a1161a6f087e0c9 SDWebImageSwiftUI: a3ed505b65903252560fcf37ff493d9d97648ae5 SimpleKeychain: 8193a9e40967eccac933c1fde82de46c07a5ae26 diff --git a/dydx/Pods/FirebaseABTesting/FirebaseCore/Extension/FIRLogger.h b/dydx/Pods/FirebaseABTesting/FirebaseCore/Extension/FIRLogger.h index 0a287f533..41c565366 100644 --- a/dydx/Pods/FirebaseABTesting/FirebaseCore/Extension/FIRLogger.h +++ b/dydx/Pods/FirebaseABTesting/FirebaseCore/Extension/FIRLogger.h @@ -52,6 +52,11 @@ extern "C" { */ void FIRSetAnalyticsDebugMode(BOOL analyticsDebugMode); +/** + * Gets the current FIRLoggerLevel. + */ +FIRLoggerLevel FIRGetLoggerLevel(void); + /** * Changes the default logging level of FirebaseLoggerLevelNotice to a user-specified level. * The default level cannot be set above FirebaseLoggerLevelNotice if the app is running from App diff --git a/dydx/Pods/FirebaseCore/FirebaseCore/Extension/FIRLogger.h b/dydx/Pods/FirebaseCore/FirebaseCore/Extension/FIRLogger.h index 0a287f533..41c565366 100644 --- a/dydx/Pods/FirebaseCore/FirebaseCore/Extension/FIRLogger.h +++ b/dydx/Pods/FirebaseCore/FirebaseCore/Extension/FIRLogger.h @@ -52,6 +52,11 @@ extern "C" { */ void FIRSetAnalyticsDebugMode(BOOL analyticsDebugMode); +/** + * Gets the current FIRLoggerLevel. + */ +FIRLoggerLevel FIRGetLoggerLevel(void); + /** * Changes the default logging level of FirebaseLoggerLevelNotice to a user-specified level. * The default level cannot be set above FirebaseLoggerLevelNotice if the app is running from App diff --git a/dydx/Pods/FirebaseCore/FirebaseCore/Sources/FIRLogger.m b/dydx/Pods/FirebaseCore/FirebaseCore/Sources/FIRLogger.m index cefb07d90..b9aa3d96d 100644 --- a/dydx/Pods/FirebaseCore/FirebaseCore/Sources/FIRLogger.m +++ b/dydx/Pods/FirebaseCore/FirebaseCore/Sources/FIRLogger.m @@ -90,6 +90,10 @@ void FIRLoggerInitializeASL(void) { sFIRAnalyticsDebugMode = analyticsDebugMode; } +FIRLoggerLevel FIRGetLoggerLevel(void) { + return (FIRLoggerLevel)GULGetLoggerLevel(); +} + void FIRSetLoggerLevel(FIRLoggerLevel loggerLevel) { FIRLoggerInitializeASL(); GULSetLoggerLevel((GULLoggerLevel)loggerLevel); diff --git a/dydx/Pods/FirebaseCoreExtension/FirebaseCore/Extension/FIRLogger.h b/dydx/Pods/FirebaseCoreExtension/FirebaseCore/Extension/FIRLogger.h index 0a287f533..41c565366 100644 --- a/dydx/Pods/FirebaseCoreExtension/FirebaseCore/Extension/FIRLogger.h +++ b/dydx/Pods/FirebaseCoreExtension/FirebaseCore/Extension/FIRLogger.h @@ -52,6 +52,11 @@ extern "C" { */ void FIRSetAnalyticsDebugMode(BOOL analyticsDebugMode); +/** + * Gets the current FIRLoggerLevel. + */ +FIRLoggerLevel FIRGetLoggerLevel(void); + /** * Changes the default logging level of FirebaseLoggerLevelNotice to a user-specified level. * The default level cannot be set above FirebaseLoggerLevelNotice if the app is running from App diff --git a/dydx/Pods/FirebaseCrashlytics/FirebaseCore/Extension/FIRLogger.h b/dydx/Pods/FirebaseCrashlytics/FirebaseCore/Extension/FIRLogger.h index 0a287f533..41c565366 100644 --- a/dydx/Pods/FirebaseCrashlytics/FirebaseCore/Extension/FIRLogger.h +++ b/dydx/Pods/FirebaseCrashlytics/FirebaseCore/Extension/FIRLogger.h @@ -52,6 +52,11 @@ extern "C" { */ void FIRSetAnalyticsDebugMode(BOOL analyticsDebugMode); +/** + * Gets the current FIRLoggerLevel. + */ +FIRLoggerLevel FIRGetLoggerLevel(void); + /** * Changes the default logging level of FirebaseLoggerLevelNotice to a user-specified level. * The default level cannot be set above FirebaseLoggerLevelNotice if the app is running from App diff --git a/dydx/Pods/FirebaseInstallations/FirebaseCore/Extension/FIRLogger.h b/dydx/Pods/FirebaseInstallations/FirebaseCore/Extension/FIRLogger.h index 0a287f533..41c565366 100644 --- a/dydx/Pods/FirebaseInstallations/FirebaseCore/Extension/FIRLogger.h +++ b/dydx/Pods/FirebaseInstallations/FirebaseCore/Extension/FIRLogger.h @@ -52,6 +52,11 @@ extern "C" { */ void FIRSetAnalyticsDebugMode(BOOL analyticsDebugMode); +/** + * Gets the current FIRLoggerLevel. + */ +FIRLoggerLevel FIRGetLoggerLevel(void); + /** * Changes the default logging level of FirebaseLoggerLevelNotice to a user-specified level. * The default level cannot be set above FirebaseLoggerLevelNotice if the app is running from App diff --git a/dydx/Pods/FirebaseMessaging/FirebaseCore/Extension/FIRLogger.h b/dydx/Pods/FirebaseMessaging/FirebaseCore/Extension/FIRLogger.h index 0a287f533..41c565366 100644 --- a/dydx/Pods/FirebaseMessaging/FirebaseCore/Extension/FIRLogger.h +++ b/dydx/Pods/FirebaseMessaging/FirebaseCore/Extension/FIRLogger.h @@ -52,6 +52,11 @@ extern "C" { */ void FIRSetAnalyticsDebugMode(BOOL analyticsDebugMode); +/** + * Gets the current FIRLoggerLevel. + */ +FIRLoggerLevel FIRGetLoggerLevel(void); + /** * Changes the default logging level of FirebaseLoggerLevelNotice to a user-specified level. * The default level cannot be set above FirebaseLoggerLevelNotice if the app is running from App diff --git a/dydx/Pods/FirebasePerformance/FirebaseCore/Extension/FIRLogger.h b/dydx/Pods/FirebasePerformance/FirebaseCore/Extension/FIRLogger.h index 0a287f533..41c565366 100644 --- a/dydx/Pods/FirebasePerformance/FirebaseCore/Extension/FIRLogger.h +++ b/dydx/Pods/FirebasePerformance/FirebaseCore/Extension/FIRLogger.h @@ -52,6 +52,11 @@ extern "C" { */ void FIRSetAnalyticsDebugMode(BOOL analyticsDebugMode); +/** + * Gets the current FIRLoggerLevel. + */ +FIRLoggerLevel FIRGetLoggerLevel(void); + /** * Changes the default logging level of FirebaseLoggerLevelNotice to a user-specified level. * The default level cannot be set above FirebaseLoggerLevelNotice if the app is running from App diff --git a/dydx/Pods/FirebasePerformance/FirebasePerformance/Sources/Gauges/CPU/FPRCPUGaugeCollector.m b/dydx/Pods/FirebasePerformance/FirebasePerformance/Sources/Gauges/CPU/FPRCPUGaugeCollector.m index 308076305..7e3742af0 100644 --- a/dydx/Pods/FirebasePerformance/FirebasePerformance/Sources/Gauges/CPU/FPRCPUGaugeCollector.m +++ b/dydx/Pods/FirebasePerformance/FirebasePerformance/Sources/Gauges/CPU/FPRCPUGaugeCollector.m @@ -45,7 +45,7 @@ @interface FPRCPUGaugeCollector () * * @return Instance of FPRCPUGaugeData. */ -FPRCPUGaugeData *fprCollectCPUMetric() { +FPRCPUGaugeData *fprCollectCPUMetric(void) { kern_return_t kernelReturnValue; mach_msg_type_number_t task_info_count; task_info_data_t taskInfo; diff --git a/dydx/Pods/FirebaseRemoteConfig/FirebaseCore/Extension/FIRLogger.h b/dydx/Pods/FirebaseRemoteConfig/FirebaseCore/Extension/FIRLogger.h index 0a287f533..41c565366 100644 --- a/dydx/Pods/FirebaseRemoteConfig/FirebaseCore/Extension/FIRLogger.h +++ b/dydx/Pods/FirebaseRemoteConfig/FirebaseCore/Extension/FIRLogger.h @@ -52,6 +52,11 @@ extern "C" { */ void FIRSetAnalyticsDebugMode(BOOL analyticsDebugMode); +/** + * Gets the current FIRLoggerLevel. + */ +FIRLoggerLevel FIRGetLoggerLevel(void); + /** * Changes the default logging level of FirebaseLoggerLevelNotice to a user-specified level. * The default level cannot be set above FirebaseLoggerLevelNotice if the app is running from App diff --git a/dydx/Pods/Local Podspecs/abacus.podspec.json b/dydx/Pods/Local Podspecs/abacus.podspec.json index 608616f0a..2516ecff9 100644 --- a/dydx/Pods/Local Podspecs/abacus.podspec.json +++ b/dydx/Pods/Local Podspecs/abacus.podspec.json @@ -1,10 +1,10 @@ { "name": "Abacus", - "version": "1.0.25", + "version": "1.0.29", "homepage": "https://github.com/dydxprotocol/v4-abacus", "source": { "git": "git@github.com:dydxprotocol/v4-abacus.git", - "tag": "v1.0.25" + "tag": "v1.0.29" }, "authors": "", "license": "", @@ -20,7 +20,7 @@ "name": "Build abacus", "execution_position": "before_compile", "shell_path": "/bin/sh", - "script": " if [ \"YES\" = \"$COCOAPODS_SKIP_KOTLIN_BUILD\" ]; then\n echo \"Skipping Gradle build task invocation due to COCOAPODS_SKIP_KOTLIN_BUILD environment variable set to \"YES\"\"\n exit 0\n fi\n set -evx\n \n REPO_ROOT=\"$PODS_TARGET_SRCROOT\"\n \n if [ ! -f $REPO_ROOT/gradlew ]; then\n rm -rf $PRODUCT_MODULE_NAME\n git clone git@github.com:dydxprotocol/v4-abacus.git --branch v1.0.25 $PRODUCT_MODULE_NAME\n \n \"$REPO_ROOT/gradlew\" -p \"$REPO_ROOT\" $KOTLIN_PROJECT_PATH:syncFramework -Pkotlin.native.cocoapods.platform=$PLATFORM_NAME -Pkotlin.native.cocoapods.archs=\"$ARCHS\" -Pkotlin.native.cocoapods.configuration=\"$CONFIGURATION\"\n \n # We will need to overwrite the dummy framework generated by cocoapods with the actual one from Kotlin\n \n TARGET_FRAMEWORK=\"${TARGET_BUILD_DIR}/${TARGET_NAME}.framework\"\n ABACUS_FRAMEWORK=\"$REPO_ROOT/build/cocoapods/framework/$PRODUCT_MODULE_NAME.framework\"\n rm -rf $TARGET_FRAMEWORK\n mkdir $TARGET_FRAMEWORK\n cp -rf $ABACUS_FRAMEWORK/* $TARGET_FRAMEWORK\n else\n \"$REPO_ROOT/gradlew\" -p \"$REPO_ROOT\" $KOTLIN_PROJECT_PATH:syncFramework -Pkotlin.native.cocoapods.platform=$PLATFORM_NAME -Pkotlin.native.cocoapods.archs=\"$ARCHS\" -Pkotlin.native.cocoapods.configuration=\"$CONFIGURATION\"\n fi\n" + "script": " if [ \"YES\" = \"$COCOAPODS_SKIP_KOTLIN_BUILD\" ]; then\n echo \"Skipping Gradle build task invocation due to COCOAPODS_SKIP_KOTLIN_BUILD environment variable set to \"YES\"\"\n exit 0\n fi\n set -evx\n \n REPO_ROOT=\"$PODS_TARGET_SRCROOT\"\n \n if [ ! -f $REPO_ROOT/gradlew ]; then\n rm -rf $PRODUCT_MODULE_NAME\n git clone git@github.com:dydxprotocol/v4-abacus.git --branch v1.0.29 $PRODUCT_MODULE_NAME\n \n \"$REPO_ROOT/gradlew\" -p \"$REPO_ROOT\" $KOTLIN_PROJECT_PATH:syncFramework -Pkotlin.native.cocoapods.platform=$PLATFORM_NAME -Pkotlin.native.cocoapods.archs=\"$ARCHS\" -Pkotlin.native.cocoapods.configuration=\"$CONFIGURATION\"\n \n # We will need to overwrite the dummy framework generated by cocoapods with the actual one from Kotlin\n \n TARGET_FRAMEWORK=\"${TARGET_BUILD_DIR}/${TARGET_NAME}.framework\"\n ABACUS_FRAMEWORK=\"$REPO_ROOT/build/cocoapods/framework/$PRODUCT_MODULE_NAME.framework\"\n rm -rf $TARGET_FRAMEWORK\n mkdir $TARGET_FRAMEWORK\n cp -rf $ABACUS_FRAMEWORK/* $TARGET_FRAMEWORK\n else\n \"$REPO_ROOT/gradlew\" -p \"$REPO_ROOT\" $KOTLIN_PROJECT_PATH:syncFramework -Pkotlin.native.cocoapods.platform=$PLATFORM_NAME -Pkotlin.native.cocoapods.archs=\"$ARCHS\" -Pkotlin.native.cocoapods.configuration=\"$CONFIGURATION\"\n fi\n" } ], "platforms": { diff --git a/dydx/Pods/Manifest.lock b/dydx/Pods/Manifest.lock index 2bff87bef..5928dc5e5 100644 --- a/dydx/Pods/Manifest.lock +++ b/dydx/Pods/Manifest.lock @@ -1,5 +1,5 @@ PODS: - - Abacus (1.0.25) + - Abacus (1.0.29) - Amplitude-iOS (4.10.0) - AppsFlyerFramework (6.12.2): - AppsFlyerFramework/Main (= 6.12.2) @@ -19,27 +19,27 @@ PODS: - EasyTipView (2.1.0) - EFQRCode (6.2.1): - swift_qrcodejs (~> 2.2.2) - - Firebase/AnalyticsWithoutAdIdSupport (10.17.0): + - Firebase/AnalyticsWithoutAdIdSupport (10.18.0): - Firebase/CoreOnly - - FirebaseAnalytics/WithoutAdIdSupport (~> 10.17.0) - - Firebase/Core (10.17.0): + - FirebaseAnalytics/WithoutAdIdSupport (~> 10.18.0) + - Firebase/Core (10.18.0): - Firebase/CoreOnly - - FirebaseAnalytics (~> 10.17.0) - - Firebase/CoreOnly (10.17.0): - - FirebaseCore (= 10.17.0) - - Firebase/Messaging (10.17.0): + - FirebaseAnalytics (~> 10.18.0) + - Firebase/CoreOnly (10.18.0): + - FirebaseCore (= 10.18.0) + - Firebase/Messaging (10.18.0): - Firebase/CoreOnly - - FirebaseMessaging (~> 10.17.0) - - Firebase/Performance (10.17.0): + - FirebaseMessaging (~> 10.18.0) + - Firebase/Performance (10.18.0): - Firebase/CoreOnly - - FirebasePerformance (~> 10.17.0) - - Firebase/RemoteConfig (10.17.0): + - FirebasePerformance (~> 10.18.0) + - Firebase/RemoteConfig (10.18.0): - Firebase/CoreOnly - - FirebaseRemoteConfig (~> 10.17.0) - - FirebaseABTesting (10.17.0): + - FirebaseRemoteConfig (~> 10.18.0) + - FirebaseABTesting (10.18.0): - FirebaseCore (~> 10.0) - - FirebaseAnalytics (10.17.0): - - FirebaseAnalytics/AdIdSupport (= 10.17.0) + - FirebaseAnalytics (10.18.0): + - FirebaseAnalytics/AdIdSupport (= 10.18.0) - FirebaseCore (~> 10.0) - FirebaseInstallations (~> 10.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.11) @@ -47,33 +47,33 @@ PODS: - GoogleUtilities/Network (~> 7.11) - "GoogleUtilities/NSData+zlib (~> 7.11)" - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseAnalytics/AdIdSupport (10.17.0): + - FirebaseAnalytics/AdIdSupport (10.18.0): - FirebaseCore (~> 10.0) - FirebaseInstallations (~> 10.0) - - GoogleAppMeasurement (= 10.17.0) + - GoogleAppMeasurement (= 10.18.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.11) - GoogleUtilities/MethodSwizzler (~> 7.11) - GoogleUtilities/Network (~> 7.11) - "GoogleUtilities/NSData+zlib (~> 7.11)" - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseAnalytics/WithoutAdIdSupport (10.17.0): + - FirebaseAnalytics/WithoutAdIdSupport (10.18.0): - FirebaseCore (~> 10.0) - FirebaseInstallations (~> 10.0) - - GoogleAppMeasurement/WithoutAdIdSupport (= 10.17.0) + - GoogleAppMeasurement/WithoutAdIdSupport (= 10.18.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.11) - GoogleUtilities/MethodSwizzler (~> 7.11) - GoogleUtilities/Network (~> 7.11) - "GoogleUtilities/NSData+zlib (~> 7.11)" - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseCore (10.17.0): + - FirebaseCore (10.18.0): - FirebaseCoreInternal (~> 10.0) - - GoogleUtilities/Environment (~> 7.8) - - GoogleUtilities/Logger (~> 7.8) - - FirebaseCoreExtension (10.17.0): + - GoogleUtilities/Environment (~> 7.12) + - GoogleUtilities/Logger (~> 7.12) + - FirebaseCoreExtension (10.18.0): - FirebaseCore (~> 10.0) - - FirebaseCoreInternal (10.17.0): + - FirebaseCoreInternal (10.18.0): - "GoogleUtilities/NSData+zlib (~> 7.8)" - - FirebaseCrashlytics (10.17.0): + - FirebaseCrashlytics (10.18.0): - FirebaseCore (~> 10.5) - FirebaseInstallations (~> 10.0) - FirebaseSessions (~> 10.5) @@ -81,12 +81,12 @@ PODS: - GoogleUtilities/Environment (~> 7.8) - nanopb (< 2.30910.0, >= 2.30908.0) - PromisesObjC (~> 2.1) - - FirebaseInstallations (10.17.0): + - FirebaseInstallations (10.18.0): - FirebaseCore (~> 10.0) - GoogleUtilities/Environment (~> 7.8) - GoogleUtilities/UserDefaults (~> 7.8) - PromisesObjC (~> 2.1) - - FirebaseMessaging (10.17.0): + - FirebaseMessaging (10.18.0): - FirebaseCore (~> 10.0) - FirebaseInstallations (~> 10.0) - GoogleDataTransport (~> 9.2) @@ -95,7 +95,7 @@ PODS: - GoogleUtilities/Reachability (~> 7.8) - GoogleUtilities/UserDefaults (~> 7.8) - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebasePerformance (10.17.0): + - FirebasePerformance (10.18.0): - FirebaseCore (~> 10.5) - FirebaseInstallations (~> 10.0) - FirebaseRemoteConfig (~> 10.0) @@ -105,14 +105,14 @@ PODS: - GoogleUtilities/ISASwizzler (~> 7.8) - GoogleUtilities/MethodSwizzler (~> 7.8) - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseRemoteConfig (10.17.0): + - FirebaseRemoteConfig (10.18.0): - FirebaseABTesting (~> 10.0) - FirebaseCore (~> 10.0) - FirebaseInstallations (~> 10.0) - FirebaseSharedSwift (~> 10.0) - GoogleUtilities/Environment (~> 7.8) - "GoogleUtilities/NSData+zlib (~> 7.8)" - - FirebaseSessions (10.17.0): + - FirebaseSessions (10.18.0): - FirebaseCore (~> 10.5) - FirebaseCoreExtension (~> 10.0) - FirebaseInstallations (~> 10.0) @@ -120,24 +120,24 @@ PODS: - GoogleUtilities/Environment (~> 7.10) - nanopb (< 2.30910.0, >= 2.30908.0) - PromisesSwift (~> 2.1) - - FirebaseSharedSwift (10.17.0) + - FirebaseSharedSwift (10.18.0) - FloatingPanel (2.7.0) - FullStory (1.29.0) - - GoogleAppMeasurement (10.17.0): - - GoogleAppMeasurement/AdIdSupport (= 10.17.0) + - GoogleAppMeasurement (10.18.0): + - GoogleAppMeasurement/AdIdSupport (= 10.18.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.11) - GoogleUtilities/MethodSwizzler (~> 7.11) - GoogleUtilities/Network (~> 7.11) - "GoogleUtilities/NSData+zlib (~> 7.11)" - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleAppMeasurement/AdIdSupport (10.17.0): - - GoogleAppMeasurement/WithoutAdIdSupport (= 10.17.0) + - GoogleAppMeasurement/AdIdSupport (10.18.0): + - GoogleAppMeasurement/WithoutAdIdSupport (= 10.18.0) - GoogleUtilities/AppDelegateSwizzler (~> 7.11) - GoogleUtilities/MethodSwizzler (~> 7.11) - GoogleUtilities/Network (~> 7.11) - "GoogleUtilities/NSData+zlib (~> 7.11)" - nanopb (< 2.30910.0, >= 2.30908.0) - - GoogleAppMeasurement/WithoutAdIdSupport (10.17.0): + - GoogleAppMeasurement/WithoutAdIdSupport (10.18.0): - GoogleUtilities/AppDelegateSwizzler (~> 7.11) - GoogleUtilities/MethodSwizzler (~> 7.11) - GoogleUtilities/Network (~> 7.11) @@ -243,9 +243,9 @@ PODS: - PromisesObjC (= 2.3.1) - RDHCollectionViewGridLayout (1.2.5) - ReachabilitySwift (5.0.0) - - SDWebImage (5.18.3): - - SDWebImage/Core (= 5.18.3) - - SDWebImage/Core (5.18.3) + - SDWebImage (5.18.5): + - SDWebImage/Core (= 5.18.5) + - SDWebImage/Core (5.18.5) - SDWebImageSVGKitPlugin (1.4.0): - SDWebImage/Core (~> 5.10) - SVGKit (~> 3.0) @@ -376,7 +376,7 @@ CHECKOUT OPTIONS: :http: https://ios-releases.fullstory.com/fullstory-1.29.0-xcframework.tar.gz SPEC CHECKSUMS: - Abacus: adda053d053cbacb0579481b4b064b8fe2323588 + Abacus: a0095830abb42d305b76c324ac3e837f9b7d5ea7 Amplitude-iOS: 7d8cdc3408ba35c2e68368fc7c692cd104606b94 AppsFlyerFramework: 6eb4d89d2eb9a6632317f1055b359d9fd85fd5ff Atributika: 0eabae2cc37999e79c5b94f60213642946991b1c @@ -389,22 +389,22 @@ SPEC CHECKSUMS: DrawerMenu: f6ca91901e2b21086e3c19bcca278d3d3127e85f EasyTipView: a92b6edc377b81c5ac18e9fd35d5ee78e9409488 EFQRCode: a4d39ec3466b68dffa71de3b5caef7c9ceefdc53 - Firebase: f4ac0b02927af9253ae094d23deecf0890da7374 - FirebaseABTesting: 609e15b57b5f1096c8feb984e8995d9e769858fe - FirebaseAnalytics: b9284f9fff10157a843e0422e908711f7bf3b9f2 - FirebaseCore: 534544dd98cabcf4bf8598d88ec683b02319a528 - FirebaseCoreExtension: 47720bb330d7041047c0935a34a3a4b92f818074 - FirebaseCoreInternal: 2cf9202e226e3f78d2bf6d56c472686b935bfb7f - FirebaseCrashlytics: d78651ad7db206ef98269e103ac38d69d569200a - FirebaseInstallations: 9387bf15abfc69a714f54e54f74a251264fdb79b - FirebaseMessaging: 1367b28c0c83a63072af4a711328fcc2e6899902 - FirebasePerformance: ba663950bc790a4118c6aae13c6060e87888da75 - FirebaseRemoteConfig: 94ab72cd7aa865b6226ee527b1fa5c4f961a4e7b - FirebaseSessions: 49f39e5c10e3f9fdd38d01b748329bae2a2fa8ed - FirebaseSharedSwift: e8fe8d63d434266a1b2c7f02807d5b64462e1851 + Firebase: 414ad272f8d02dfbf12662a9d43f4bba9bec2a06 + FirebaseABTesting: d8b10ff4c6d1a9d6b11f02a08463ad5fd9fc6b1b + FirebaseAnalytics: 4d310b35c48eaa4a058ddc04bdca6bdb5dc0fe80 + FirebaseCore: 2322423314d92f946219c8791674d2f3345b598f + FirebaseCoreExtension: 62b201498aa10535801cdf3448c7f4db5e24ed80 + FirebaseCoreInternal: 8eb002e564b533bdcf1ba011f33f2b5c10e2ed4a + FirebaseCrashlytics: 86d5bce01f42fa1db265f87ff1d591f04db610ec + FirebaseInstallations: e842042ec6ac1fd2e37d7706363ebe7f662afea4 + FirebaseMessaging: 9bc34a98d2e0237e1b121915120d4d48ddcf301e + FirebasePerformance: c406a9198d8aabfbac281b42855f5122fc1bcf69 + FirebaseRemoteConfig: bbd42790a4e84fde6aab7eae810b608e7b5c0bf6 + FirebaseSessions: f90fe9212ee2818641eda051c0835c9c4e30d9ae + FirebaseSharedSwift: 62e248642c0582324d0390706cadd314687c116b FloatingPanel: c88e3fd981b7a74121ff48746fb14d496f5fd553 FullStory: 29e764d32050cb943d38b7b82c60b2f65f814737 - GoogleAppMeasurement: 4dcddfc7f102825c1c4e6422cb35567b101881a7 + GoogleAppMeasurement: 70ce9aa438cff1cfb31ea3e660bcc67734cb716e GoogleDataTransport: 54dee9d48d14580407f8f5fbf2f496e92437a2f2 GoogleToolboxForMac: 970a0066c5ac38b1bdd2abf94647fa7169ed1583 GoogleUtilities: 0759d1a57ebb953965c2dfe0ba4c82e95ccc2e34 @@ -424,7 +424,7 @@ SPEC CHECKSUMS: PromisesSwift: 28dca69a9c40779916ac2d6985a0192a5cb4a265 RDHCollectionViewGridLayout: 4b4229212ed8c136aa70101d92ecd43742ca62b6 ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825 - SDWebImage: 96e0c18ef14010b7485210e92fac888587ebb958 + SDWebImage: 7ac2b7ddc5e8484c79aa90fc4e30b149d6a2c88f SDWebImageSVGKitPlugin: 7542dd07c344ec3415ded0461a1161a6f087e0c9 SDWebImageSwiftUI: a3ed505b65903252560fcf37ff493d9d97648ae5 SimpleKeychain: 8193a9e40967eccac933c1fde82de46c07a5ae26 diff --git a/dydx/Pods/Pods.xcodeproj/project.pbxproj b/dydx/Pods/Pods.xcodeproj/project.pbxproj index ca473c051..eae5781b9 100644 --- a/dydx/Pods/Pods.xcodeproj/project.pbxproj +++ b/dydx/Pods/Pods.xcodeproj/project.pbxproj @@ -23,10 +23,10 @@ }; 2B2AD932AF1A90828B4DFC5AC6955ADA /* Abacus */ = { isa = PBXAggregateTarget; - buildConfigurationList = 12391AE29F4B7F2E785D376A067A3B46 /* Build configuration list for PBXAggregateTarget "Abacus" */; + buildConfigurationList = 789036E4045BDF974F62654E40B272B7 /* Build configuration list for PBXAggregateTarget "Abacus" */; buildPhases = ( - 0690EDE0D5206818B8D2757DF3D05394 /* [CP-User] Build abacus */, - B812BCAA186496726DE640ADC79E1251 /* [CP] Copy dSYMs */, + E98189A2E68424F0E946407DFAD02AD4 /* [CP-User] Build abacus */, + 9FDD7D9FB5683ABC1CD297F26B8EC9F1 /* [CP] Copy dSYMs */, ); dependencies = ( ); @@ -23086,16 +23086,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 0690EDE0D5206818B8D2757DF3D05394 /* [CP-User] Build abacus */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - name = "[CP-User] Build abacus"; - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = " if [ \"YES\" = \"$COCOAPODS_SKIP_KOTLIN_BUILD\" ]; then\n echo \"Skipping Gradle build task invocation due to COCOAPODS_SKIP_KOTLIN_BUILD environment variable set to \"YES\"\"\n exit 0\n fi\n set -evx\n \n REPO_ROOT=\"$PODS_TARGET_SRCROOT\"\n \n if [ ! -f $REPO_ROOT/gradlew ]; then\n rm -rf $PRODUCT_MODULE_NAME\n git clone git@github.com:dydxprotocol/v4-abacus.git --branch v1.0.25 $PRODUCT_MODULE_NAME\n \n \"$REPO_ROOT/gradlew\" -p \"$REPO_ROOT\" $KOTLIN_PROJECT_PATH:syncFramework -Pkotlin.native.cocoapods.platform=$PLATFORM_NAME -Pkotlin.native.cocoapods.archs=\"$ARCHS\" -Pkotlin.native.cocoapods.configuration=\"$CONFIGURATION\"\n \n # We will need to overwrite the dummy framework generated by cocoapods with the actual one from Kotlin\n \n TARGET_FRAMEWORK=\"${TARGET_BUILD_DIR}/${TARGET_NAME}.framework\"\n ABACUS_FRAMEWORK=\"$REPO_ROOT/build/cocoapods/framework/$PRODUCT_MODULE_NAME.framework\"\n rm -rf $TARGET_FRAMEWORK\n mkdir $TARGET_FRAMEWORK\n cp -rf $ABACUS_FRAMEWORK/* $TARGET_FRAMEWORK\n else\n \"$REPO_ROOT/gradlew\" -p \"$REPO_ROOT\" $KOTLIN_PROJECT_PATH:syncFramework -Pkotlin.native.cocoapods.platform=$PLATFORM_NAME -Pkotlin.native.cocoapods.archs=\"$ARCHS\" -Pkotlin.native.cocoapods.configuration=\"$CONFIGURATION\"\n fi\n"; - }; 3848528C72BC011A1D8E8829E8F3E9B0 /* [CP] Copy XCFrameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -23147,40 +23137,50 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/FirebaseAnalytics/FirebaseAnalytics-xcframeworks.sh\"\n"; showEnvVarsInLog = 0; }; - A4E4DD90EFF0A112C3FD353ED0C021C5 /* [CP] Copy XCFrameworks */ = { + 9FDD7D9FB5683ABC1CD297F26B8EC9F1 /* [CP] Copy dSYMs */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/GoogleAppMeasurement/GoogleAppMeasurement-xcframeworks-input-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Abacus/Abacus-copy-dsyms-input-files.xcfilelist", ); - name = "[CP] Copy XCFrameworks"; + name = "[CP] Copy dSYMs"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/GoogleAppMeasurement/GoogleAppMeasurement-xcframeworks-output-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Abacus/Abacus-copy-dsyms-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/GoogleAppMeasurement/GoogleAppMeasurement-xcframeworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Abacus/Abacus-copy-dsyms.sh\"\n"; showEnvVarsInLog = 0; }; - B812BCAA186496726DE640ADC79E1251 /* [CP] Copy dSYMs */ = { + A4E4DD90EFF0A112C3FD353ED0C021C5 /* [CP] Copy XCFrameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Abacus/Abacus-copy-dsyms-input-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/GoogleAppMeasurement/GoogleAppMeasurement-xcframeworks-input-files.xcfilelist", ); - name = "[CP] Copy dSYMs"; + name = "[CP] Copy XCFrameworks"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Abacus/Abacus-copy-dsyms-output-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/GoogleAppMeasurement/GoogleAppMeasurement-xcframeworks-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Abacus/Abacus-copy-dsyms.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/GoogleAppMeasurement/GoogleAppMeasurement-xcframeworks.sh\"\n"; showEnvVarsInLog = 0; }; + E98189A2E68424F0E946407DFAD02AD4 /* [CP-User] Build abacus */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + name = "[CP-User] Build abacus"; + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = " if [ \"YES\" = \"$COCOAPODS_SKIP_KOTLIN_BUILD\" ]; then\n echo \"Skipping Gradle build task invocation due to COCOAPODS_SKIP_KOTLIN_BUILD environment variable set to \"YES\"\"\n exit 0\n fi\n set -evx\n \n REPO_ROOT=\"$PODS_TARGET_SRCROOT\"\n \n if [ ! -f $REPO_ROOT/gradlew ]; then\n rm -rf $PRODUCT_MODULE_NAME\n git clone git@github.com:dydxprotocol/v4-abacus.git --branch v1.0.29 $PRODUCT_MODULE_NAME\n \n \"$REPO_ROOT/gradlew\" -p \"$REPO_ROOT\" $KOTLIN_PROJECT_PATH:syncFramework -Pkotlin.native.cocoapods.platform=$PLATFORM_NAME -Pkotlin.native.cocoapods.archs=\"$ARCHS\" -Pkotlin.native.cocoapods.configuration=\"$CONFIGURATION\"\n \n # We will need to overwrite the dummy framework generated by cocoapods with the actual one from Kotlin\n \n TARGET_FRAMEWORK=\"${TARGET_BUILD_DIR}/${TARGET_NAME}.framework\"\n ABACUS_FRAMEWORK=\"$REPO_ROOT/build/cocoapods/framework/$PRODUCT_MODULE_NAME.framework\"\n rm -rf $TARGET_FRAMEWORK\n mkdir $TARGET_FRAMEWORK\n cp -rf $ABACUS_FRAMEWORK/* $TARGET_FRAMEWORK\n else\n \"$REPO_ROOT/gradlew\" -p \"$REPO_ROOT\" $KOTLIN_PROJECT_PATH:syncFramework -Pkotlin.native.cocoapods.platform=$PLATFORM_NAME -Pkotlin.native.cocoapods.archs=\"$ARCHS\" -Pkotlin.native.cocoapods.configuration=\"$CONFIGURATION\"\n fi\n"; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -31994,24 +31994,6 @@ }; name = Release; }; - 1625A76E3C8E0F91A27D99E4541FA72D /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 079E4D2DE62C5CCBDFD5694B331FBAEF /* Abacus.release.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - SDKROOT = iphoneos; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; 182ECF452A561CFF69F844B7146C7BF6 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 0050C99C18E95E3076210364F688E30D /* Pods-iOS-dydxCarteraTests.debug.xcconfig */; @@ -32946,6 +32928,23 @@ }; name = Debug; }; + 3CDAFCEE4798B9A8F01C87DE37B35108 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 97E4E2806D359BB63CB18257EAAC8E92 /* Abacus.debug.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + SDKROOT = iphoneos; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; 3D0D0AE9CE7D102D11C605F995B1C133 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = F9B1374D3C435701C24953F42964F923 /* Pods-iOS-AmplitudeInjectionsTests.debug.xcconfig */; @@ -33347,23 +33346,6 @@ }; name = Debug; }; - 4B904912B17AE45404C3432615D76720 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 97E4E2806D359BB63CB18257EAAC8E92 /* Abacus.debug.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - SDKROOT = iphoneos; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; 4B989FBC038A9AF68A700E2A8320D570 /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 63440E930F9C7F801CB26504704769E6 /* Pods-iOS-dydxFormatterTests.release.xcconfig */; @@ -37708,6 +37690,24 @@ }; name = Release; }; + DCA8713113B623A028C8B5B7DE21EB32 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 079E4D2DE62C5CCBDFD5694B331FBAEF /* Abacus.release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + SDKROOT = iphoneos; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; DCAE6415639B1FE00F20DF7E91B162A0 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = C50AC874EA11D0DC93642752C7F9F9DF /* COSTouchVisualizer.debug.xcconfig */; @@ -38798,15 +38798,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 12391AE29F4B7F2E785D376A067A3B46 /* Build configuration list for PBXAggregateTarget "Abacus" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 4B904912B17AE45404C3432615D76720 /* Debug */, - 1625A76E3C8E0F91A27D99E4541FA72D /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 13303C91F93DD6B6347990830CEDA531 /* Build configuration list for PBXNativeTarget "Pods-iOS-Utilities" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -39266,6 +39257,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 789036E4045BDF974F62654E40B272B7 /* Build configuration list for PBXAggregateTarget "Abacus" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 3CDAFCEE4798B9A8F01C87DE37B35108 /* Debug */, + DCA8713113B623A028C8B5B7DE21EB32 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 805BAF1F917EE02E2E063E34352CD236 /* Build configuration list for PBXNativeTarget "Pods-iOS-dydxFormatterTests" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/dydx/Pods/SDWebImage/SDWebImage/Core/SDAnimatedImage.h b/dydx/Pods/SDWebImage/SDWebImage/Core/SDAnimatedImage.h index 39b3d9090..78739c57f 100644 --- a/dydx/Pods/SDWebImage/SDWebImage/Core/SDAnimatedImage.h +++ b/dydx/Pods/SDWebImage/SDWebImage/Core/SDAnimatedImage.h @@ -72,7 +72,8 @@ // This class override these methods from UIImage(NSImage), and it supports NSSecureCoding. // You should use these methods to create a new animated image. Use other methods just call super instead. -// Pay attention, when the animated image frame count <= 1, all the `SDAnimatedImageProvider` protocol methods will return nil or 0 value, you'd better check the frame count before usage and keep fallback. +// @note Before 5.19, these initializer will return nil for static image (when all candidate SDAnimatedImageCoder returns nil instance), like JPEG data. After 5.19, these initializer will retry for static image as well, so JPEG data will return non-nil instance. +// @note When the animated image frame count <= 1, all the `SDAnimatedImageProvider` protocol methods will return nil or 0 value, you'd better check the frame count before usage and keep fallback. + (nullable instancetype)imageNamed:(nonnull NSString *)name; // Cache in memory, no Asset Catalog support #if __has_include() + (nullable instancetype)imageNamed:(nonnull NSString *)name inBundle:(nullable NSBundle *)bundle compatibleWithTraitCollection:(nullable UITraitCollection *)traitCollection; // Cache in memory, no Asset Catalog support @@ -88,7 +89,8 @@ /** Current animated image format. - @note This format is only valid when `animatedImageData` not nil + @note This format is only valid when `animatedImageData` not nil. + @note This actually just call `[NSData sd_imageFormatForImageData:self.animatedImageData]` */ @property (nonatomic, assign, readonly) SDImageFormat animatedImageFormat; diff --git a/dydx/Pods/SDWebImage/SDWebImage/Core/SDAnimatedImage.m b/dydx/Pods/SDWebImage/SDWebImage/Core/SDAnimatedImage.m index 10f5eb9d8..75ba2236d 100644 --- a/dydx/Pods/SDWebImage/SDWebImage/Core/SDAnimatedImage.m +++ b/dydx/Pods/SDWebImage/SDWebImage/Core/SDAnimatedImage.m @@ -34,7 +34,6 @@ static CGFloat SDImageScaleFromPath(NSString *string) { @interface SDAnimatedImage () @property (nonatomic, strong) id animatedCoder; -@property (nonatomic, assign, readwrite) SDImageFormat animatedImageFormat; @property (atomic, copy) NSArray *loadedAnimatedImageFrames; // Mark as atomic to keep thread-safe @property (nonatomic, assign, getter=isAllFramesLoaded) BOOL allFramesLoaded; @@ -115,7 +114,19 @@ + (instancetype)imageWithData:(NSData *)data scale:(CGFloat)scale { - (instancetype)initWithContentsOfFile:(NSString *)path { NSData *data = [NSData dataWithContentsOfFile:path]; - return [self initWithData:data scale:SDImageScaleFromPath(path)]; + if (!data) { + return nil; + } + CGFloat scale = SDImageScaleFromPath(path); + // path extension may be useful for coder like raw-image + NSString *fileExtensionHint = path.pathExtension; // without dot + if (fileExtensionHint.length == 0) { + // Ignore file extension which is empty + fileExtensionHint = nil; + } + SDImageCoderMutableOptions *mutableCoderOptions = [NSMutableDictionary dictionaryWithCapacity:1]; + mutableCoderOptions[SDImageCoderDecodeFileExtensionHint] = fileExtensionHint; + return [self initWithData:data scale:scale options:[mutableCoderOptions copy]]; } - (instancetype)initWithData:(NSData *)data { @@ -131,21 +142,38 @@ - (instancetype)initWithData:(NSData *)data scale:(CGFloat)scale options:(SDImag return nil; } id animatedCoder = nil; + SDImageCoderMutableOptions *mutableCoderOptions; + if (options != nil) { + mutableCoderOptions = [NSMutableDictionary dictionaryWithDictionary:options]; + } else { + mutableCoderOptions = [NSMutableDictionary dictionaryWithCapacity:1]; + } + mutableCoderOptions[SDImageCoderDecodeScaleFactor] = @(scale); + options = [mutableCoderOptions copy]; for (idcoder in [SDImageCodersManager sharedManager].coders.reverseObjectEnumerator) { if ([coder conformsToProtocol:@protocol(SDAnimatedImageCoder)]) { if ([coder canDecodeFromData:data]) { - if (!options) { - options = @{SDImageCoderDecodeScaleFactor : @(scale)}; - } animatedCoder = [[[coder class] alloc] initWithAnimatedImageData:data options:options]; break; } } } - if (!animatedCoder) { - return nil; + if (animatedCoder) { + // Animated Image + return [self initWithAnimatedCoder:animatedCoder scale:scale]; + } else { + // Static Image (Before 5.19 this code path return nil) + UIImage *image = [[SDImageCodersManager sharedManager] decodedImageWithData:data options:options]; + if (!image) { + return nil; + } +#if SD_MAC + self = [super initWithCGImage:image.CGImage scale:MAX(scale, 1) orientation:kCGImagePropertyOrientationUp]; +#else + self = [super initWithCGImage:image.CGImage scale:MAX(scale, 1) orientation:image.imageOrientation]; +#endif + return self; } - return [self initWithAnimatedCoder:animatedCoder scale:scale]; } - (instancetype)initWithAnimatedCoder:(id)animatedCoder scale:(CGFloat)scale { @@ -166,13 +194,14 @@ - (instancetype)initWithAnimatedCoder:(id)animatedCoder sc if (animatedCoder.animatedImageFrameCount > 1) { _animatedCoder = animatedCoder; } - NSData *data = [animatedCoder animatedImageData]; - SDImageFormat format = [NSData sd_imageFormatForImageData:data]; - _animatedImageFormat = format; } return self; } +- (SDImageFormat)animatedImageFormat { + return [NSData sd_imageFormatForImageData:self.animatedImageData]; +} + #pragma mark - Preload - (void)preloadAllFrames { if (!_animatedCoder) { @@ -205,7 +234,6 @@ - (void)unloadAllFrames { - (instancetype)initWithCoder:(NSCoder *)aDecoder { self = [super initWithCoder:aDecoder]; if (self) { - _animatedImageFormat = [aDecoder decodeIntegerForKey:NSStringFromSelector(@selector(animatedImageFormat))]; NSData *animatedImageData = [aDecoder decodeObjectOfClass:[NSData class] forKey:NSStringFromSelector(@selector(animatedImageData))]; if (!animatedImageData) { return self; @@ -232,7 +260,6 @@ - (instancetype)initWithCoder:(NSCoder *)aDecoder { - (void)encodeWithCoder:(NSCoder *)aCoder { [super encodeWithCoder:aCoder]; - [aCoder encodeInteger:self.animatedImageFormat forKey:NSStringFromSelector(@selector(animatedImageFormat))]; NSData *animatedImageData = self.animatedImageData; if (animatedImageData) { [aCoder encodeObject:animatedImageData forKey:NSStringFromSelector(@selector(animatedImageData))]; diff --git a/dydx/Pods/SDWebImage/SDWebImage/Core/SDAnimatedImageView.m b/dydx/Pods/SDWebImage/SDWebImage/Core/SDAnimatedImageView.m index db7d7675f..5b719ff4e 100644 --- a/dydx/Pods/SDWebImage/SDWebImage/Core/SDAnimatedImageView.m +++ b/dydx/Pods/SDWebImage/SDWebImage/Core/SDAnimatedImageView.m @@ -501,6 +501,17 @@ - (void)displayLayer:(CALayer *)layer } } +#if SD_UIKIT +- (void)traitCollectionDidChange:(UITraitCollection *)previousTraitCollection { + // See: #3635 + // From iOS 17, when UIImageView entering the background, it will receive the trait collection changes, and modify the CALayer.contents by `self.image.CGImage` + // However, For animated image, `self.image.CGImge != self.currentFrame.CGImage`, right ? + // So this cause the render issue, we need to reset the CALayer.contents again + [super traitCollectionDidChange:previousTraitCollection]; + [self.imageViewLayer setNeedsDisplay]; +} +#endif + #if SD_MAC // NSImageView use a subview. We need this subview's layer for actual rendering. // Why using this design may because of properties like `imageAlignment` and `imageScaling`, which it's not available for UIImageView.contentMode (it's impossible to align left and keep aspect ratio at the same time) diff --git a/dydx/Pods/SDWebImage/SDWebImage/Core/SDImageIOAnimatedCoder.m b/dydx/Pods/SDWebImage/SDWebImage/Core/SDImageIOAnimatedCoder.m index 9ceef23b6..a543ac57c 100644 --- a/dydx/Pods/SDWebImage/SDWebImage/Core/SDImageIOAnimatedCoder.m +++ b/dydx/Pods/SDWebImage/SDWebImage/Core/SDImageIOAnimatedCoder.m @@ -32,7 +32,7 @@ // This strip the un-wanted CGImageProperty, like the internal CGImageSourceRef in iOS 15+ // However, CGImageCreateCopy still keep those CGImageProperty, not suit for our use case -static CGImageRef __nullable SDCGImageCreateCopy(CGImageRef cg_nullable image) { +static CGImageRef __nullable SDCGImageCreateMutableCopy(CGImageRef cg_nullable image, CGBitmapInfo bitmapInfo) { if (!image) return nil; size_t width = CGImageGetWidth(image); size_t height = CGImageGetHeight(image); @@ -40,7 +40,6 @@ static CGImageRef __nullable SDCGImageCreateCopy(CGImageRef cg_nullable image) { size_t bitsPerPixel = CGImageGetBitsPerPixel(image); size_t bytesPerRow = CGImageGetBytesPerRow(image); CGColorSpaceRef space = CGImageGetColorSpace(image); - CGBitmapInfo bitmapInfo = CGImageGetBitmapInfo(image); CGDataProviderRef provider = CGImageGetDataProvider(image); const CGFloat *decode = CGImageGetDecode(image); bool shouldInterpolate = CGImageGetShouldInterpolate(image); @@ -49,6 +48,209 @@ static CGImageRef __nullable SDCGImageCreateCopy(CGImageRef cg_nullable image) { return newImage; } +static inline CGImageRef __nullable SDCGImageCreateCopy(CGImageRef cg_nullable image) { + if (!image) return nil; + return SDCGImageCreateMutableCopy(image, CGImageGetBitmapInfo(image)); +} + +static BOOL SDLoadOnePixelBitmapBuffer(CGImageRef imageRef, uint8_t *r, uint8_t *g, uint8_t *b, uint8_t *a) { + CGBitmapInfo bitmapInfo = CGImageGetBitmapInfo(imageRef); + CGImageAlphaInfo alphaInfo = bitmapInfo & kCGBitmapAlphaInfoMask; + CGBitmapInfo byteOrderInfo = bitmapInfo & kCGBitmapByteOrderMask; + + // Get pixels + CGDataProviderRef provider = CGImageGetDataProvider(imageRef); + if (!provider) { + return NO; + } + CFDataRef data = CGDataProviderCopyData(provider); + if (!data) { + return NO; + } + + CFRange range = CFRangeMake(0, 4); // one pixel + if (CFDataGetLength(data) < range.location + range.length) { + CFRelease(data); + return NO; + } + uint8_t pixel[4] = {0}; + CFDataGetBytes(data, range, pixel); + CFRelease(data); + + BOOL byteOrderNormal = NO; + switch (byteOrderInfo) { + case kCGBitmapByteOrderDefault: { + byteOrderNormal = YES; + } break; + case kCGBitmapByteOrder16Little: + case kCGBitmapByteOrder32Little: { + } break; + case kCGBitmapByteOrder16Big: + case kCGBitmapByteOrder32Big: { + byteOrderNormal = YES; + } break; + default: break; + } + switch (alphaInfo) { + case kCGImageAlphaPremultipliedFirst: + case kCGImageAlphaFirst: { + if (byteOrderNormal) { + // ARGB8888 + *a = pixel[0]; + *r = pixel[1]; + *g = pixel[2]; + *b = pixel[3]; + } else { + // BGRA8888 + *b = pixel[0]; + *g = pixel[1]; + *r = pixel[2]; + *a = pixel[3]; + } + } + break; + case kCGImageAlphaPremultipliedLast: + case kCGImageAlphaLast: { + if (byteOrderNormal) { + // RGBA8888 + *r = pixel[0]; + *g = pixel[1]; + *b = pixel[2]; + *a = pixel[3]; + } else { + // ABGR8888 + *a = pixel[0]; + *b = pixel[1]; + *g = pixel[2]; + *r = pixel[3]; + } + } + break; + case kCGImageAlphaNone: { + if (byteOrderNormal) { + // RGB + *r = pixel[0]; + *g = pixel[1]; + *b = pixel[2]; + } else { + // BGR + *b = pixel[0]; + *g = pixel[1]; + *r = pixel[2]; + } + } + break; + case kCGImageAlphaNoneSkipLast: { + if (byteOrderNormal) { + // RGBX + *r = pixel[0]; + *g = pixel[1]; + *b = pixel[2]; + } else { + // XBGR + *b = pixel[1]; + *g = pixel[2]; + *r = pixel[3]; + } + } + break; + case kCGImageAlphaNoneSkipFirst: { + if (byteOrderNormal) { + // XRGB + *r = pixel[1]; + *g = pixel[2]; + *b = pixel[3]; + } else { + // BGRX + *b = pixel[0]; + *g = pixel[1]; + *r = pixel[2]; + } + } + break; + case kCGImageAlphaOnly: { + // A + *a = pixel[0]; + } + break; + default: + break; + } + + return YES; +} + +static CGImageRef SDImageIOPNGPluginBuggyCreateWorkaround(CGImageRef cgImage) CF_RETURNS_RETAINED { + CGBitmapInfo bitmapInfo = CGImageGetBitmapInfo(cgImage); + CGImageAlphaInfo alphaInfo = (bitmapInfo & kCGBitmapAlphaInfoMask); + CGImageAlphaInfo newAlphaInfo = alphaInfo; + if (alphaInfo == kCGImageAlphaLast) { + newAlphaInfo = kCGImageAlphaPremultipliedLast; + } else if (alphaInfo == kCGImageAlphaFirst) { + newAlphaInfo = kCGImageAlphaPremultipliedFirst; + } + if (newAlphaInfo != alphaInfo) { + CGBitmapInfo byteOrderInfo = bitmapInfo & kCGBitmapByteOrderMask; + CGBitmapInfo newBitmapInfo = newAlphaInfo | byteOrderInfo; + if (SD_OPTIONS_CONTAINS(bitmapInfo, kCGBitmapFloatComponents)) { + // Keep float components + newBitmapInfo |= kCGBitmapFloatComponents; + } + // Create new CGImage with corrected alpha info... + CGImageRef newCGImage = SDCGImageCreateMutableCopy(cgImage, newBitmapInfo); + return newCGImage; + } else { + CGImageRetain(cgImage); + return cgImage; + } +} + +static BOOL SDImageIOPNGPluginBuggyNeedWorkaround(void) { + // See: #3605 FB13322459 + // ImageIO on iOS 17 (17.0~17.2), there is one serious problem on ImageIO PNG plugin. The decode result for indexed color PNG use the wrong CGImageAlphaInfo + // The returned CGImageAlphaInfo is alpha last, but the actual bitmap data is premultiplied alpha first, which cause many runtime render bug. + // So, we do a hack workaround: + // 1. Decode a indexed color PNG in runtime + // 2. If the bitmap is premultiplied alpha, then assume it's buggy + // 3. If buggy, then all premultiplied `CGImageAlphaInfo` will assume to be non-premultiplied + // :) + + if (@available(iOS 17, tvOS 17, macOS 14, watchOS 11, *)) { + // Continue + } else { + return NO; + } + static BOOL isBuggy = NO; + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + NSString *base64String = @"iVBORw0KGgoAAAANSUhEUgAAAAEAAAABAQMAAAAl21bKAAAAA1BMVEUyMjKlMgnVAAAAAXRSTlMyiDGJ5gAAAApJREFUCNdjYAAAAAIAAeIhvDMAAAAASUVORK5CYII="; + NSData *onePixelIndexedPNGData = [[NSData alloc] initWithBase64EncodedString:base64String options:NSDataBase64DecodingIgnoreUnknownCharacters]; + CGImageSourceRef source = CGImageSourceCreateWithData((__bridge CFDataRef)onePixelIndexedPNGData, nil); + NSCParameterAssert(source); + CGImageRef cgImage = CGImageSourceCreateImageAtIndex(source, 0, nil); + NSCParameterAssert(cgImage); + uint8_t r, g, b, a = 0; + BOOL success = SDLoadOnePixelBitmapBuffer(cgImage, &r, &g, &b, &a); + if (!success) { + isBuggy = NO; // Impossible... + } else { + if (r == 50 && g == 50 && b == 50 && a == 50) { + // Correct value + isBuggy = NO; + } else { +#if DEBUG + NSLog(@"Detected the current OS's ImageIO PNG Decoder is buggy on indexed color PNG. Perform workaround solution..."); + isBuggy = YES; +#endif + } + } + CFRelease(source); + CGImageRelease(cgImage); + }); + + return isBuggy; +} + @interface SDImageIOCoderFrame : NSObject @property (nonatomic, assign) NSUInteger index; // Frame index (zero based) @@ -323,6 +525,14 @@ + (UIImage *)createFrameAtIndex:(NSUInteger)index source:(CGImageSourceRef)sourc #endif } } + // :) + CFStringRef uttype = CGImageSourceGetType(source); + SDImageFormat imageFormat = [NSData sd_imageFormatFromUTType:uttype]; + if (imageFormat == SDImageFormatPNG && SDImageIOPNGPluginBuggyNeedWorkaround()) { + CGImageRef newImageRef = SDImageIOPNGPluginBuggyCreateWorkaround(imageRef); + CGImageRelease(imageRef); + imageRef = newImageRef; + } #if SD_UIKIT || SD_WATCH UIImageOrientation imageOrientation = [SDImageCoderHelper imageOrientationFromEXIFOrientation:exifOrientation]; diff --git a/dydx/Pods/SDWebImage/SDWebImage/Core/UIImage+Transform.h b/dydx/Pods/SDWebImage/SDWebImage/Core/UIImage+Transform.h index 699def7af..60b488ae9 100644 --- a/dydx/Pods/SDWebImage/SDWebImage/Core/UIImage+Transform.h +++ b/dydx/Pods/SDWebImage/SDWebImage/Core/UIImage+Transform.h @@ -107,6 +107,7 @@ typedef NS_OPTIONS(NSUInteger, SDRectCorner) { /** Return the pixel color at specify position. The point is from the top-left to the bottom-right and 0-based. The returned the color is always be RGBA format. The image must be CG-based. + @note The point's x/y will be converted into integer. @note The point's x/y should not be smaller than 0, or greater than or equal to width/height. @note The overhead of object creation means this method is best suited for infrequent color sampling. For heavy image processing, grab the raw bitmap data and process yourself. @@ -117,6 +118,7 @@ typedef NS_OPTIONS(NSUInteger, SDRectCorner) { /** Return the pixel color array with specify rectangle. The rect is from the top-left to the bottom-right and 0-based. The returned the color is always be RGBA format. The image must be CG-based. + @note The rect's origin and size will be converted into integer. @note The rect's width/height should not be smaller than or equal to 0. The minX/minY should not be smaller than 0. The maxX/maxY should not be greater than width/height. Attention this limit is different from `sd_colorAtPoint:` (point: (0, 0) like rect: (0, 0, 1, 1)) @note The overhead of object creation means this method is best suited for infrequent color sampling. For heavy image processing, grab the raw bitmap data and process yourself. diff --git a/dydx/Pods/SDWebImage/SDWebImage/Core/UIImage+Transform.m b/dydx/Pods/SDWebImage/SDWebImage/Core/UIImage+Transform.m index 43122df1c..cbfd14e5f 100644 --- a/dydx/Pods/SDWebImage/SDWebImage/Core/UIImage+Transform.m +++ b/dydx/Pods/SDWebImage/SDWebImage/Core/UIImage+Transform.m @@ -68,8 +68,10 @@ static inline CGRect SDCGRectFitWithScaleMode(CGRect rect, CGSize size, SDImageS case kCGBitmapByteOrderDefault: { byteOrderNormal = YES; } break; + case kCGBitmapByteOrder16Little: case kCGBitmapByteOrder32Little: { } break; + case kCGBitmapByteOrder16Big: case kCGBitmapByteOrder32Big: { byteOrderNormal = YES; } break; @@ -167,7 +169,32 @@ static inline CGRect SDCGRectFitWithScaleMode(CGRect rect, CGSize size, SDImageS default: break; } switch (alphaInfo) { - case kCGImageAlphaPremultipliedFirst: + case kCGImageAlphaPremultipliedFirst: { + if (byteOrderNormal) { + // ARGB8888-premultiplied + a = pixel[0] / 255.0; + r = pixel[1] / 255.0; + g = pixel[2] / 255.0; + b = pixel[3] / 255.0; + if (a > 0) { + r /= a; + g /= a; + b /= a; + } + } else { + // BGRA8888-premultiplied + b = pixel[0] / 255.0; + g = pixel[1] / 255.0; + r = pixel[2] / 255.0; + a = pixel[3] / 255.0; + if (a > 0) { + r /= a; + g /= a; + b /= a; + } + } + break; + } case kCGImageAlphaFirst: { if (byteOrderNormal) { // ARGB8888 @@ -184,7 +211,32 @@ static inline CGRect SDCGRectFitWithScaleMode(CGRect rect, CGSize size, SDImageS } } break; - case kCGImageAlphaPremultipliedLast: + case kCGImageAlphaPremultipliedLast: { + if (byteOrderNormal) { + // RGBA8888-premultiplied + r = pixel[0] / 255.0; + g = pixel[1] / 255.0; + b = pixel[2] / 255.0; + a = pixel[3] / 255.0; + if (a > 0) { + r /= a; + g /= a; + b /= a; + } + } else { + // ABGR8888-premultiplied + a = pixel[0] / 255.0; + b = pixel[1] / 255.0; + g = pixel[2] / 255.0; + r = pixel[3] / 255.0; + if (a > 0) { + r /= a; + g /= a; + b /= a; + } + } + break; + } case kCGImageAlphaLast: { if (byteOrderNormal) { // RGBA8888 @@ -544,9 +596,11 @@ - (nullable UIColor *)sd_colorAtPoint:(CGPoint)point { } // Check point - CGFloat width = CGImageGetWidth(imageRef); - CGFloat height = CGImageGetHeight(imageRef); - if (point.x < 0 || point.y < 0 || point.x >= width || point.y >= height) { + size_t width = CGImageGetWidth(imageRef); + size_t height = CGImageGetHeight(imageRef); + size_t x = point.x; + size_t y = point.y; + if (x < 0 || y < 0 || x >= width || y >= height) { CGImageRelease(imageRef); return nil; } @@ -568,7 +622,7 @@ - (nullable UIColor *)sd_colorAtPoint:(CGPoint)point { size_t components = CGImageGetBitsPerPixel(imageRef) / CGImageGetBitsPerComponent(imageRef); CGBitmapInfo bitmapInfo = CGImageGetBitmapInfo(imageRef); - CFRange range = CFRangeMake(bytesPerRow * point.y + components * point.x, components); + CFRange range = CFRangeMake(bytesPerRow * y + components * x, components); if (CFDataGetLength(data) < range.location + range.length) { CFRelease(data); CGImageRelease(imageRef); @@ -618,8 +672,8 @@ - (nullable UIColor *)sd_colorAtPoint:(CGPoint)point { } // Check rect - CGFloat width = CGImageGetWidth(imageRef); - CGFloat height = CGImageGetHeight(imageRef); + size_t width = CGImageGetWidth(imageRef); + size_t height = CGImageGetHeight(imageRef); if (CGRectGetWidth(rect) <= 0 || CGRectGetHeight(rect) <= 0 || CGRectGetMinX(rect) < 0 || CGRectGetMinY(rect) < 0 || CGRectGetMaxX(rect) > width || CGRectGetMaxY(rect) > height) { CGImageRelease(imageRef); return nil; diff --git a/dydx/Pods/Target Support Files/FirebaseABTesting/FirebaseABTesting-Info.plist b/dydx/Pods/Target Support Files/FirebaseABTesting/FirebaseABTesting-Info.plist index 85aca1fb3..a0f1ad27b 100644 --- a/dydx/Pods/Target Support Files/FirebaseABTesting/FirebaseABTesting-Info.plist +++ b/dydx/Pods/Target Support Files/FirebaseABTesting/FirebaseABTesting-Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 10.17.0 + 10.18.0 CFBundleSignature ???? CFBundleVersion diff --git a/dydx/Pods/Target Support Files/FirebaseCore/FirebaseCore-Info.plist b/dydx/Pods/Target Support Files/FirebaseCore/FirebaseCore-Info.plist index 85aca1fb3..a0f1ad27b 100644 --- a/dydx/Pods/Target Support Files/FirebaseCore/FirebaseCore-Info.plist +++ b/dydx/Pods/Target Support Files/FirebaseCore/FirebaseCore-Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 10.17.0 + 10.18.0 CFBundleSignature ???? CFBundleVersion diff --git a/dydx/Pods/Target Support Files/FirebaseCore/FirebaseCore.debug.xcconfig b/dydx/Pods/Target Support Files/FirebaseCore/FirebaseCore.debug.xcconfig index f03937c6f..73f69b89f 100644 --- a/dydx/Pods/Target Support Files/FirebaseCore/FirebaseCore.debug.xcconfig +++ b/dydx/Pods/Target Support Files/FirebaseCore/FirebaseCore.debug.xcconfig @@ -2,7 +2,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreInternal" "${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities" "${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC" GCC_C_LANGUAGE_STANDARD = c99 -GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 Firebase_VERSION=10.17.0 +GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 Firebase_VERSION=10.18.0 HEADER_SEARCH_PATHS = $(inherited) "${PODS_TARGET_SRCROOT}" LD_RUNPATH_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreInternal" "${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities" "${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC" OTHER_CFLAGS = $(inherited) -fno-autolink diff --git a/dydx/Pods/Target Support Files/FirebaseCore/FirebaseCore.release.xcconfig b/dydx/Pods/Target Support Files/FirebaseCore/FirebaseCore.release.xcconfig index f03937c6f..73f69b89f 100644 --- a/dydx/Pods/Target Support Files/FirebaseCore/FirebaseCore.release.xcconfig +++ b/dydx/Pods/Target Support Files/FirebaseCore/FirebaseCore.release.xcconfig @@ -2,7 +2,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreInternal" "${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities" "${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC" GCC_C_LANGUAGE_STANDARD = c99 -GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 Firebase_VERSION=10.17.0 +GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 Firebase_VERSION=10.18.0 HEADER_SEARCH_PATHS = $(inherited) "${PODS_TARGET_SRCROOT}" LD_RUNPATH_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreInternal" "${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities" "${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC" OTHER_CFLAGS = $(inherited) -fno-autolink diff --git a/dydx/Pods/Target Support Files/FirebaseCoreExtension/FirebaseCoreExtension-Info.plist b/dydx/Pods/Target Support Files/FirebaseCoreExtension/FirebaseCoreExtension-Info.plist index 85aca1fb3..a0f1ad27b 100644 --- a/dydx/Pods/Target Support Files/FirebaseCoreExtension/FirebaseCoreExtension-Info.plist +++ b/dydx/Pods/Target Support Files/FirebaseCoreExtension/FirebaseCoreExtension-Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 10.17.0 + 10.18.0 CFBundleSignature ???? CFBundleVersion diff --git a/dydx/Pods/Target Support Files/FirebaseCoreInternal/FirebaseCoreInternal-Info.plist b/dydx/Pods/Target Support Files/FirebaseCoreInternal/FirebaseCoreInternal-Info.plist index 85aca1fb3..a0f1ad27b 100644 --- a/dydx/Pods/Target Support Files/FirebaseCoreInternal/FirebaseCoreInternal-Info.plist +++ b/dydx/Pods/Target Support Files/FirebaseCoreInternal/FirebaseCoreInternal-Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 10.17.0 + 10.18.0 CFBundleSignature ???? CFBundleVersion diff --git a/dydx/Pods/Target Support Files/FirebaseCrashlytics/FirebaseCrashlytics-Info.plist b/dydx/Pods/Target Support Files/FirebaseCrashlytics/FirebaseCrashlytics-Info.plist index 85aca1fb3..a0f1ad27b 100644 --- a/dydx/Pods/Target Support Files/FirebaseCrashlytics/FirebaseCrashlytics-Info.plist +++ b/dydx/Pods/Target Support Files/FirebaseCrashlytics/FirebaseCrashlytics-Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 10.17.0 + 10.18.0 CFBundleSignature ???? CFBundleVersion diff --git a/dydx/Pods/Target Support Files/FirebaseInstallations/FirebaseInstallations-Info.plist b/dydx/Pods/Target Support Files/FirebaseInstallations/FirebaseInstallations-Info.plist index 85aca1fb3..a0f1ad27b 100644 --- a/dydx/Pods/Target Support Files/FirebaseInstallations/FirebaseInstallations-Info.plist +++ b/dydx/Pods/Target Support Files/FirebaseInstallations/FirebaseInstallations-Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 10.17.0 + 10.18.0 CFBundleSignature ???? CFBundleVersion diff --git a/dydx/Pods/Target Support Files/FirebaseMessaging/FirebaseMessaging-Info.plist b/dydx/Pods/Target Support Files/FirebaseMessaging/FirebaseMessaging-Info.plist index 85aca1fb3..a0f1ad27b 100644 --- a/dydx/Pods/Target Support Files/FirebaseMessaging/FirebaseMessaging-Info.plist +++ b/dydx/Pods/Target Support Files/FirebaseMessaging/FirebaseMessaging-Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 10.17.0 + 10.18.0 CFBundleSignature ???? CFBundleVersion diff --git a/dydx/Pods/Target Support Files/FirebasePerformance/FirebasePerformance-Info.plist b/dydx/Pods/Target Support Files/FirebasePerformance/FirebasePerformance-Info.plist index 85aca1fb3..a0f1ad27b 100644 --- a/dydx/Pods/Target Support Files/FirebasePerformance/FirebasePerformance-Info.plist +++ b/dydx/Pods/Target Support Files/FirebasePerformance/FirebasePerformance-Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 10.17.0 + 10.18.0 CFBundleSignature ???? CFBundleVersion diff --git a/dydx/Pods/Target Support Files/FirebasePerformance/FirebasePerformance.debug.xcconfig b/dydx/Pods/Target Support Files/FirebasePerformance/FirebasePerformance.debug.xcconfig index 4a9d12ed7..b0df28fe9 100644 --- a/dydx/Pods/Target Support Files/FirebasePerformance/FirebasePerformance.debug.xcconfig +++ b/dydx/Pods/Target Support Files/FirebasePerformance/FirebasePerformance.debug.xcconfig @@ -2,7 +2,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/FirebasePerformance FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseABTesting" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreExtension" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreInternal" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseInstallations" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseRemoteConfig" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseSessions" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseSharedSwift" "${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport" "${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities" "${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC" "${PODS_CONFIGURATION_BUILD_DIR}/PromisesSwift" "${PODS_CONFIGURATION_BUILD_DIR}/nanopb" GCC_C_LANGUAGE_STANDARD = c99 -GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 FIRPerformance_LIB_VERSION=10.17.0 PB_FIELD_32BIT=1 PB_NO_PACKED_STRUCTS=1 PB_ENABLE_MALLOC=1 +GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 FIRPerformance_LIB_VERSION=10.18.0 PB_FIELD_32BIT=1 PB_NO_PACKED_STRUCTS=1 PB_ENABLE_MALLOC=1 HEADER_SEARCH_PATHS = $(inherited) "${PODS_TARGET_SRCROOT}" LD_RUNPATH_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseABTesting" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreExtension" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreInternal" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseInstallations" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseRemoteConfig" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseSessions" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseSharedSwift" "${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport" "${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities" "${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC" "${PODS_CONFIGURATION_BUILD_DIR}/PromisesSwift" "${PODS_CONFIGURATION_BUILD_DIR}/nanopb" OTHER_LDFLAGS = $(inherited) -framework "CoreTelephony" -framework "FirebaseCore" -framework "FirebaseInstallations" -framework "FirebaseRemoteConfig" -framework "FirebaseSessions" -framework "Foundation" -framework "GoogleDataTransport" -framework "GoogleUtilities" -framework "Security" -framework "SystemConfiguration" -framework "UIKit" -framework "nanopb" diff --git a/dydx/Pods/Target Support Files/FirebasePerformance/FirebasePerformance.release.xcconfig b/dydx/Pods/Target Support Files/FirebasePerformance/FirebasePerformance.release.xcconfig index 4a9d12ed7..b0df28fe9 100644 --- a/dydx/Pods/Target Support Files/FirebasePerformance/FirebasePerformance.release.xcconfig +++ b/dydx/Pods/Target Support Files/FirebasePerformance/FirebasePerformance.release.xcconfig @@ -2,7 +2,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/FirebasePerformance FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseABTesting" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreExtension" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreInternal" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseInstallations" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseRemoteConfig" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseSessions" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseSharedSwift" "${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport" "${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities" "${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC" "${PODS_CONFIGURATION_BUILD_DIR}/PromisesSwift" "${PODS_CONFIGURATION_BUILD_DIR}/nanopb" GCC_C_LANGUAGE_STANDARD = c99 -GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 FIRPerformance_LIB_VERSION=10.17.0 PB_FIELD_32BIT=1 PB_NO_PACKED_STRUCTS=1 PB_ENABLE_MALLOC=1 +GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 FIRPerformance_LIB_VERSION=10.18.0 PB_FIELD_32BIT=1 PB_NO_PACKED_STRUCTS=1 PB_ENABLE_MALLOC=1 HEADER_SEARCH_PATHS = $(inherited) "${PODS_TARGET_SRCROOT}" LD_RUNPATH_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseABTesting" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreExtension" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreInternal" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseInstallations" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseRemoteConfig" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseSessions" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseSharedSwift" "${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport" "${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities" "${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC" "${PODS_CONFIGURATION_BUILD_DIR}/PromisesSwift" "${PODS_CONFIGURATION_BUILD_DIR}/nanopb" OTHER_LDFLAGS = $(inherited) -framework "CoreTelephony" -framework "FirebaseCore" -framework "FirebaseInstallations" -framework "FirebaseRemoteConfig" -framework "FirebaseSessions" -framework "Foundation" -framework "GoogleDataTransport" -framework "GoogleUtilities" -framework "Security" -framework "SystemConfiguration" -framework "UIKit" -framework "nanopb" diff --git a/dydx/Pods/Target Support Files/FirebaseRemoteConfig/FirebaseRemoteConfig-Info.plist b/dydx/Pods/Target Support Files/FirebaseRemoteConfig/FirebaseRemoteConfig-Info.plist index 85aca1fb3..a0f1ad27b 100644 --- a/dydx/Pods/Target Support Files/FirebaseRemoteConfig/FirebaseRemoteConfig-Info.plist +++ b/dydx/Pods/Target Support Files/FirebaseRemoteConfig/FirebaseRemoteConfig-Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 10.17.0 + 10.18.0 CFBundleSignature ???? CFBundleVersion diff --git a/dydx/Pods/Target Support Files/FirebaseSessions/FirebaseSessions-Info.plist b/dydx/Pods/Target Support Files/FirebaseSessions/FirebaseSessions-Info.plist index 85aca1fb3..a0f1ad27b 100644 --- a/dydx/Pods/Target Support Files/FirebaseSessions/FirebaseSessions-Info.plist +++ b/dydx/Pods/Target Support Files/FirebaseSessions/FirebaseSessions-Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 10.17.0 + 10.18.0 CFBundleSignature ???? CFBundleVersion diff --git a/dydx/Pods/Target Support Files/FirebaseSharedSwift/FirebaseSharedSwift-Info.plist b/dydx/Pods/Target Support Files/FirebaseSharedSwift/FirebaseSharedSwift-Info.plist index 85aca1fb3..a0f1ad27b 100644 --- a/dydx/Pods/Target Support Files/FirebaseSharedSwift/FirebaseSharedSwift-Info.plist +++ b/dydx/Pods/Target Support Files/FirebaseSharedSwift/FirebaseSharedSwift-Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 10.17.0 + 10.18.0 CFBundleSignature ???? CFBundleVersion diff --git a/dydx/Pods/Target Support Files/SDWebImage/SDWebImage-Info.plist b/dydx/Pods/Target Support Files/SDWebImage/SDWebImage-Info.plist index d6be81390..dd1d5e1e6 100644 --- a/dydx/Pods/Target Support Files/SDWebImage/SDWebImage-Info.plist +++ b/dydx/Pods/Target Support Files/SDWebImage/SDWebImage-Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 5.18.3 + 5.18.5 CFBundleSignature ???? CFBundleVersion diff --git a/dydx/dydxPresenters/dydxPresenters/_v4/Transfer/TransferStatus/dydxTransferStatusViewBuilder.swift b/dydx/dydxPresenters/dydxPresenters/_v4/Transfer/TransferStatus/dydxTransferStatusViewBuilder.swift index d2e7ff11a..832080ae8 100644 --- a/dydx/dydxPresenters/dydxPresenters/_v4/Transfer/TransferStatus/dydxTransferStatusViewBuilder.swift +++ b/dydx/dydxPresenters/dydxPresenters/_v4/Transfer/TransferStatus/dydxTransferStatusViewBuilder.swift @@ -315,6 +315,10 @@ private class dydxTransferStatusViewPresenter: HostedViewPresenter Bool { + if transferStatus.squidTransactionStatus == "success" { + return true + } + if transferStatus.status?.contains("executed") ?? false, let lastStatus = transferStatus.routeStatuses?.last, lastStatus.chainId == chainId, diff --git a/podspecs/Abacus.podspec b/podspecs/Abacus.podspec index ee668f79c..d6c29d0eb 100644 --- a/podspecs/Abacus.podspec +++ b/podspecs/Abacus.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |spec| spec.name = 'Abacus' -spec.version = '1.0.25' +spec.version = '1.0.29' spec.homepage = 'https://github.com/dydxprotocol/v4-abacus' spec.source = { :git => "git@github.com:dydxprotocol/v4-abacus.git", :tag => "v#{spec.version}" } spec.authors = ''