From 684506458677182ac6cc85eff8121cf71dfb7e9c Mon Sep 17 00:00:00 2001 From: Rui <102453770+ruixhuang@users.noreply.github.com> Date: Wed, 18 Sep 2024 11:04:21 -0700 Subject: [PATCH] Bump Abacus (#257) --- dydx/Podfile.lock | 4 +- dydx/Pods/Local Podspecs/abacus.podspec.json | 6 +- dydx/Pods/Manifest.lock | 4 +- dydx/Pods/Pods.xcodeproj/project.pbxproj | 116 +++++++++--------- .../dydxPortfolioPositionsViewPresenter.swift | 14 +-- .../Sections/dydxPortfolioPositionsView.swift | 10 +- podspecs/Abacus.podspec | 2 +- 7 files changed, 78 insertions(+), 78 deletions(-) diff --git a/dydx/Podfile.lock b/dydx/Podfile.lock index 4277c3829..cea0b27f2 100644 --- a/dydx/Podfile.lock +++ b/dydx/Podfile.lock @@ -1,5 +1,5 @@ PODS: - - Abacus (1.11.8) + - Abacus (1.11.10) - AmplitudeSwift (1.9.2): - AnalyticsConnector (~> 1.0.1) - AnalyticsConnector (1.0.3) @@ -382,7 +382,7 @@ CHECKOUT OPTIONS: :git: https://github.com/dydxprotocol/Charts.git SPEC CHECKSUMS: - Abacus: efa51dd0b59c431f3377054398c82884001f54eb + Abacus: 8c4072d2e5baa9f48abe95684ac854eaf37ab3d8 AmplitudeSwift: 6c2c689f7dc83e6d9d90b7f53b93433c1436196a AnalyticsConnector: a53214d38ae22734c6266106c0492b37832633a9 AppsFlyerFramework: 3c6c50b7b3f0f37f648a5b23114940e0766e65e8 diff --git a/dydx/Pods/Local Podspecs/abacus.podspec.json b/dydx/Pods/Local Podspecs/abacus.podspec.json index 616399c0c..374137478 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.11.8", + "version": "1.11.10", "homepage": "https://github.com/dydxprotocol/v4-abacus", "source": { "git": "git@github.com:dydxprotocol/v4-abacus.git", - "tag": "v1.11.8" + "tag": "v1.11.10" }, "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.11.8 $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.11.10 $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 4277c3829..cea0b27f2 100644 --- a/dydx/Pods/Manifest.lock +++ b/dydx/Pods/Manifest.lock @@ -1,5 +1,5 @@ PODS: - - Abacus (1.11.8) + - Abacus (1.11.10) - AmplitudeSwift (1.9.2): - AnalyticsConnector (~> 1.0.1) - AnalyticsConnector (1.0.3) @@ -382,7 +382,7 @@ CHECKOUT OPTIONS: :git: https://github.com/dydxprotocol/Charts.git SPEC CHECKSUMS: - Abacus: efa51dd0b59c431f3377054398c82884001f54eb + Abacus: 8c4072d2e5baa9f48abe95684ac854eaf37ab3d8 AmplitudeSwift: 6c2c689f7dc83e6d9d90b7f53b93433c1436196a AnalyticsConnector: a53214d38ae22734c6266106c0492b37832633a9 AppsFlyerFramework: 3c6c50b7b3f0f37f648a5b23114940e0766e65e8 diff --git a/dydx/Pods/Pods.xcodeproj/project.pbxproj b/dydx/Pods/Pods.xcodeproj/project.pbxproj index 216593a99..2d7bc91bb 100644 --- a/dydx/Pods/Pods.xcodeproj/project.pbxproj +++ b/dydx/Pods/Pods.xcodeproj/project.pbxproj @@ -22,10 +22,10 @@ }; 2B2AD932AF1A90828B4DFC5AC6955ADA /* Abacus */ = { isa = PBXAggregateTarget; - buildConfigurationList = 13562B103525B713E62CE6D5F906AA7C /* Build configuration list for PBXAggregateTarget "Abacus" */; + buildConfigurationList = ACAB0B683EC8DCDD7E3E11C1B2145194 /* Build configuration list for PBXAggregateTarget "Abacus" */; buildPhases = ( - 6ACA105D797921FE263442EDEBE2C03F /* [CP-User] Build abacus */, - AA1B64E9C6788D4997BAAE34270C4FAB /* [CP] Copy dSYMs */, + 055B3E999695D45F41A06019730FA654 /* [CP-User] Build abacus */, + A7B97BC056493987E44669BE5A316342 /* [CP] Copy dSYMs */, ); dependencies = ( ); @@ -24931,6 +24931,16 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 055B3E999695D45F41A06019730FA654 /* [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.11.10 $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"; + }; 17C778F960D9549C1C96DE7384A527F6 /* [CP] Copy XCFrameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -24948,17 +24958,7 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/FirebaseAnalytics/FirebaseAnalytics-xcframeworks.sh\"\n"; showEnvVarsInLog = 0; }; - 6ACA105D797921FE263442EDEBE2C03F /* [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.11.8 $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"; - }; - AA1B64E9C6788D4997BAAE34270C4FAB /* [CP] Copy dSYMs */ = { + A7B97BC056493987E44669BE5A316342 /* [CP] Copy dSYMs */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -35227,6 +35227,24 @@ }; name = Debug; }; + 2BCCA19F33CBD1A4F3558DF5A4E55C72 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = C04AB0409BFEEDA4532A2A0B538DA8A7 /* 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; + }; 2D06B2817B4987F6B0AEDCB2629A38CB /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 9DDFD0C9A9CADF3968831FC7D10FBEBE /* Pods-iOS-PlatformParticles.release.xcconfig */; @@ -35381,23 +35399,6 @@ }; name = Release; }; - 3604005C005D8DD99120677F1D23A470 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 41314D7B95A0B34C71BD65F325E4C9F3 /* 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; - }; 372F0D6B058EE3D21656CFF914431462 /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 06C54C061438C95989EBC20963727989 /* CocoaLumberjack.release.xcconfig */; @@ -39650,24 +39651,6 @@ }; name = Debug; }; - C018E8D91DDC50E76A6E24620F8A5C5D /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = C04AB0409BFEEDA4532A2A0B538DA8A7 /* 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; - }; C101CCE11C7E04747FBCB27F85D41DE2 /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = A373234E2FC2BC03F8ADD1E1DD5E656C /* ReachabilitySwift.release.xcconfig */; @@ -41028,6 +41011,23 @@ }; name = Release; }; + E691DC26D33257AD51EC805D4CE83EB2 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 41314D7B95A0B34C71BD65F325E4C9F3 /* 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; + }; E6D52DC507994CF28D6A7F3D3D2983F9 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 8D38E806B912DAE81912DFEB55902030 /* Pods-iOS-PlatformParticlesTests.debug.xcconfig */; @@ -42218,15 +42218,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 13562B103525B713E62CE6D5F906AA7C /* Build configuration list for PBXAggregateTarget "Abacus" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 3604005C005D8DD99120677F1D23A470 /* Debug */, - C018E8D91DDC50E76A6E24620F8A5C5D /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 154B2784AFA17D7529A892A9F7F49549 /* Build configuration list for PBXNativeTarget "Pods-iOS-dydxFormatter" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -42965,6 +42956,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + ACAB0B683EC8DCDD7E3E11C1B2145194 /* Build configuration list for PBXAggregateTarget "Abacus" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + E691DC26D33257AD51EC805D4CE83EB2 /* Debug */, + 2BCCA19F33CBD1A4F3558DF5A4E55C72 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; ACDE3CA9049C25E8559F4981D000E658 /* Build configuration list for PBXNativeTarget "Pods-iOS-ParticlesCommonModels" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/dydx/dydxPresenters/dydxPresenters/_v4/Portfolio/Components/dydxPortfolioPositionsViewPresenter.swift b/dydx/dydxPresenters/dydxPresenters/_v4/Portfolio/Components/dydxPortfolioPositionsViewPresenter.swift index f10833fab..866141183 100644 --- a/dydx/dydxPresenters/dydxPresenters/_v4/Portfolio/Components/dydxPortfolioPositionsViewPresenter.swift +++ b/dydx/dydxPresenters/dydxPresenters/_v4/Portfolio/Components/dydxPortfolioPositionsViewPresenter.swift @@ -25,7 +25,7 @@ class dydxPortfolioPositionsViewPresenter: HostedViewPresenter(420.42), - let vaultApy = Optional(Double.random(in: -30...30)) { + // TODO: replace with actual vault info from abacus + let vaultBalance = Double?(420.42), + let vaultApy = Double?(Double.random(in: -30...30)) { viewModel.vaultBalance = dydxFormatter.shared.dollar(number: vaultBalance, digits: 2) viewModel.vaultApy = vaultApy } diff --git a/dydx/dydxViews/dydxViews/_v4/Portfolio/Components/Sections/dydxPortfolioPositionsView.swift b/dydx/dydxViews/dydxViews/_v4/Portfolio/Components/Sections/dydxPortfolioPositionsView.swift index 9160e6e67..7a34d4df5 100644 --- a/dydx/dydxViews/dydxViews/_v4/Portfolio/Components/Sections/dydxPortfolioPositionsView.swift +++ b/dydx/dydxViews/dydxViews/_v4/Portfolio/Components/Sections/dydxPortfolioPositionsView.swift @@ -256,7 +256,7 @@ public class dydxPortfolioPositionsViewModel: PlatformViewModel { @Published public var vaultBalance: String? @Published public var vaultApy: Double? @Published public var vaultTapAction: (() -> Void)? - + public var contentChanged: (() -> Void)? init( @@ -334,7 +334,7 @@ public class dydxPortfolioPositionsViewModel: PlatformViewModel { .wrappedInAnyView() } } - + @ViewBuilder public var apyAccessory: some View { if let vaultApy, let vaultApyText = dydxFormatter.shared.percent(number: vaultApy, digits: 2) { @@ -347,7 +347,7 @@ public class dydxPortfolioPositionsViewModel: PlatformViewModel { .cornerRadius(4) } } - + public var megaVaultBalanceRowHeader: some View { HStack(spacing: 0) { Text(localizerPathKey: "APP.GENERAL.DETAILS") @@ -360,7 +360,7 @@ public class dydxPortfolioPositionsViewModel: PlatformViewModel { } .padding(.horizontal, 16) } - + @ViewBuilder public var megaVaultBalanceRow: some View { if let vaultBalance { @@ -386,7 +386,7 @@ public class dydxPortfolioPositionsViewModel: PlatformViewModel { .cornerRadius(16) } } - + @ViewBuilder public var megaVaultSection: some View { if dydxBoolFeatureFlag.isVaultEnabled.isEnabled { diff --git a/podspecs/Abacus.podspec b/podspecs/Abacus.podspec index 1583d982c..c3892307f 100644 --- a/podspecs/Abacus.podspec +++ b/podspecs/Abacus.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |spec| spec.name = 'Abacus' -spec.version = '1.11.8' +spec.version = '1.11.10' spec.homepage = 'https://github.com/dydxprotocol/v4-abacus' spec.source = { :git => "git@github.com:dydxprotocol/v4-abacus.git", :tag => "v#{spec.version}" } spec.authors = ''