diff --git a/dydx/Podfile.lock b/dydx/Podfile.lock index 8111e8bb6..61b70363e 100644 --- a/dydx/Podfile.lock +++ b/dydx/Podfile.lock @@ -1,5 +1,5 @@ PODS: - - Abacus (1.13.43) + - Abacus (1.13.44) - AmplitudeSwift (1.11.2): - AnalyticsConnector (~> 1.3.0) - AnalyticsConnector (1.3.1) @@ -379,7 +379,7 @@ CHECKOUT OPTIONS: :git: https://github.com/dydxprotocol/Charts.git SPEC CHECKSUMS: - Abacus: 35d2c5bcaf2129cc2fc0045875bc6ff9831a5e31 + Abacus: 696dd5dd93f6abc6cd19d5b9f134ff8f3b220f7c AmplitudeSwift: ec670fe6f0a0b673bde44b6f02359993cc5513b1 AnalyticsConnector: 3def11199b4ddcad7202c778bde982ec5da0ebb3 AppsFlyerFramework: ad7ff0d22aa36c7f8cc4f71a5424e19b89ccb8ae diff --git a/dydx/Pods/Local Podspecs/abacus.podspec.json b/dydx/Pods/Local Podspecs/abacus.podspec.json index 5e10ddf7e..719434e5f 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.13.43", + "version": "1.13.44", "homepage": "https://github.com/dydxprotocol/v4-abacus", "source": { "git": "git@github.com:dydxprotocol/v4-abacus.git", - "tag": "v1.13.43" + "tag": "v1.13.44" }, "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.13.43 $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.13.44 $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 8111e8bb6..61b70363e 100644 --- a/dydx/Pods/Manifest.lock +++ b/dydx/Pods/Manifest.lock @@ -1,5 +1,5 @@ PODS: - - Abacus (1.13.43) + - Abacus (1.13.44) - AmplitudeSwift (1.11.2): - AnalyticsConnector (~> 1.3.0) - AnalyticsConnector (1.3.1) @@ -379,7 +379,7 @@ CHECKOUT OPTIONS: :git: https://github.com/dydxprotocol/Charts.git SPEC CHECKSUMS: - Abacus: 35d2c5bcaf2129cc2fc0045875bc6ff9831a5e31 + Abacus: 696dd5dd93f6abc6cd19d5b9f134ff8f3b220f7c AmplitudeSwift: ec670fe6f0a0b673bde44b6f02359993cc5513b1 AnalyticsConnector: 3def11199b4ddcad7202c778bde982ec5da0ebb3 AppsFlyerFramework: ad7ff0d22aa36c7f8cc4f71a5424e19b89ccb8ae diff --git a/dydx/Pods/Pods.xcodeproj/project.pbxproj b/dydx/Pods/Pods.xcodeproj/project.pbxproj index 511e5dbc3..25812f40a 100644 --- a/dydx/Pods/Pods.xcodeproj/project.pbxproj +++ b/dydx/Pods/Pods.xcodeproj/project.pbxproj @@ -22,10 +22,10 @@ }; 2B2AD932AF1A90828B4DFC5AC6955ADA /* Abacus */ = { isa = PBXAggregateTarget; - buildConfigurationList = 925166792FC97706C493A99F556CA8C5 /* Build configuration list for PBXAggregateTarget "Abacus" */; + buildConfigurationList = 15C8D7641FAF8D9A42866F040883DA12 /* Build configuration list for PBXAggregateTarget "Abacus" */; buildPhases = ( - F70339D3857B35324AAD2848E9E77B50 /* [CP-User] Build abacus */, - 8F7FB2D960DE2853EDBCE1CF2F9840C9 /* [CP] Copy dSYMs */, + 49CFC8D9D3C752E0969151D63C04319F /* [CP-User] Build abacus */, + B8B760B80B8C128A96C9C8685427889D /* [CP] Copy dSYMs */, ); dependencies = ( ); @@ -24398,6 +24398,16 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 49CFC8D9D3C752E0969151D63C04319F /* [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.13.44 $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"; + }; 8E8D34C230FC9C9B9E5C6BD6D3637DB3 /* [CP] Copy XCFrameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -24415,7 +24425,7 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/GoogleAppMeasurement/GoogleAppMeasurement-xcframeworks.sh\"\n"; showEnvVarsInLog = 0; }; - 8F7FB2D960DE2853EDBCE1CF2F9840C9 /* [CP] Copy dSYMs */ = { + B8B760B80B8C128A96C9C8685427889D /* [CP] Copy dSYMs */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -24466,16 +24476,6 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/FirebaseAnalytics/FirebaseAnalytics-xcframeworks.sh\"\n"; showEnvVarsInLog = 0; }; - F70339D3857B35324AAD2848E9E77B50 /* [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.13.43 $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 */ @@ -38850,24 +38850,6 @@ }; name = Debug; }; - B9D50002C6EFE073E2ADECCB12316FF0 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 5DC709D7414D72BDA4F4BE38D913028A /* Abacus.release.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - IPHONEOS_DEPLOYMENT_TARGET = 16.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; - }; BA769822B394D3DBE8C87326DE8461F9 /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 42DD9F68DC98058184CBCF67284265B9 /* Pods-iOS-dydxChartTests.release.xcconfig */; @@ -39653,6 +39635,23 @@ }; name = Debug; }; + D0AA477AE3ACEF9C66B2797F0CF96D82 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 3D745CCF4B22CD99369258B46BEC7099 /* Abacus.debug.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + IPHONEOS_DEPLOYMENT_TARGET = 16.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + SDKROOT = iphoneos; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; D37BA8376F970DA8A2D8CFAFFE486465 /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 50EF2E805696FBD14CDC78CCB671EDEC /* SDWebImage.release.xcconfig */; @@ -40199,6 +40198,24 @@ }; name = Release; }; + E5D82864E9CB0DC805E39F4E32184EB9 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 5DC709D7414D72BDA4F4BE38D913028A /* Abacus.release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + IPHONEOS_DEPLOYMENT_TARGET = 16.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; + }; E615F7D22189C285FF4A3E3DB524B447 /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 9B4F831E564E173DCEA74EFCA6D0B63E /* SDWebImageSwiftUI.release.xcconfig */; @@ -40326,23 +40343,6 @@ }; name = Debug; }; - E93D3E7B4C96B5500B55B7E654BB06C4 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 3D745CCF4B22CD99369258B46BEC7099 /* Abacus.debug.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - IPHONEOS_DEPLOYMENT_TARGET = 16.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - SDKROOT = iphoneos; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; E9E54556857E8B0B1D138B35A42C8426 /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 286ED6DAF3E56042DDC51899FBC76525 /* Pods-iOS-FirebaseStaticInjectionsTests.release.xcconfig */; @@ -41310,6 +41310,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 15C8D7641FAF8D9A42866F040883DA12 /* Build configuration list for PBXAggregateTarget "Abacus" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + D0AA477AE3ACEF9C66B2797F0CF96D82 /* Debug */, + E5D82864E9CB0DC805E39F4E32184EB9 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 1C6D3571E60B17DD013E2F7A4D3FB3BE /* Build configuration list for PBXNativeTarget "Pods-iOS-CameraParticlesTests" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -41814,15 +41823,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 925166792FC97706C493A99F556CA8C5 /* Build configuration list for PBXAggregateTarget "Abacus" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - E93D3E7B4C96B5500B55B7E654BB06C4 /* Debug */, - B9D50002C6EFE073E2ADECCB12316FF0 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 982F3119E89AA6FCB4A544E91BCAE388 /* Build configuration list for PBXNativeTarget "FirebaseCore" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/dydx/dydxPresenters/dydxPresenters/_v4/MarketInfo/Components/dydxMarketPriceCandlesViewPresenter.swift b/dydx/dydxPresenters/dydxPresenters/_v4/MarketInfo/Components/dydxMarketPriceCandlesViewPresenter.swift index d213e14f9..8f846bff6 100644 --- a/dydx/dydxPresenters/dydxPresenters/_v4/MarketInfo/Components/dydxMarketPriceCandlesViewPresenter.swift +++ b/dydx/dydxPresenters/dydxPresenters/_v4/MarketInfo/Components/dydxMarketPriceCandlesViewPresenter.swift @@ -215,10 +215,10 @@ class dydxMarketPriceCandlesViewPresenter: HostedViewPresenter Bool { + guard let object = object as? CandleDataPoint else { return false } + + return barY == object.barY && + candleLabel == object.candleLabel && + candleOpen == object.candleOpen && + candleClose == object.candleClose && + candleHigh == object.candleHigh && + candleLow == object.candleLow && + graphingX == object.graphingX && + lineY == object.lineY && + resolution == object.resolution && + marketCandle == object.marketCandle + } + private lazy var unitInterval: Double = { switch resolution { case .FIVEMINS: diff --git a/podspecs/Abacus.podspec b/podspecs/Abacus.podspec index cbd3138b3..ab5b1242f 100644 --- a/podspecs/Abacus.podspec +++ b/podspecs/Abacus.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |spec| spec.name = 'Abacus' -spec.version = '1.13.43' +spec.version = '1.13.44' spec.homepage = 'https://github.com/dydxprotocol/v4-abacus' spec.source = { :git => "git@github.com:dydxprotocol/v4-abacus.git", :tag => "v#{spec.version}" } spec.authors = ''