From ebc5e887e27458b13d9f218929555a5fa53d9fd0 Mon Sep 17 00:00:00 2001 From: mike-dydx <149746839+mike-dydx@users.noreply.github.com> Date: Mon, 28 Oct 2024 22:17:03 -0400 Subject: [PATCH] test --- dydx/Podfile.lock | 7 +- dydx/Pods/Local Podspecs/abacus.podspec.json | 4 +- dydx/Pods/Manifest.lock | 7 +- dydx/Pods/Pods.xcodeproj/project.pbxproj | 116 +++++++++---------- podspecs/Abacus.podspec | 2 +- scripts/bump_abacus.sh | 2 +- 6 files changed, 72 insertions(+), 66 deletions(-) diff --git a/dydx/Podfile.lock b/dydx/Podfile.lock index eece124e7..daab1e1c3 100644 --- a/dydx/Podfile.lock +++ b/dydx/Podfile.lock @@ -1,5 +1,5 @@ PODS: - - Abacus (1.13.13) + - Abacus (1.13.14) - AmplitudeSwift (1.9.4): - AnalyticsConnector (~> 1.0.1) - AnalyticsConnector (1.0.3) @@ -377,12 +377,15 @@ EXTERNAL SOURCES: :git: https://github.com/dydxprotocol/Charts.git CHECKOUT OPTIONS: + Abacus: + :commit: feeedfbc26fd9ad8327a4d3a8f5ee92b925a5914 + :git: "git@github.com:dydxprotocol/v4-abacus.git" DGCharts: :commit: 5fcd52176925ef8112f79d7bed933f87fab1d738 :git: https://github.com/dydxprotocol/Charts.git SPEC CHECKSUMS: - Abacus: 2868046638aa194188f754d36dc3063e226c9332 + Abacus: a7768fbbe3ec6ea7569462fdf45218ef75cc188c AmplitudeSwift: d10ae6afdb0740e4ae843866bce8ab1119a53d74 AnalyticsConnector: a53214d38ae22734c6266106c0492b37832633a9 AppsFlyerFramework: ad7ff0d22aa36c7f8cc4f71a5424e19b89ccb8ae diff --git a/dydx/Pods/Local Podspecs/abacus.podspec.json b/dydx/Pods/Local Podspecs/abacus.podspec.json index 66c00963d..00a56b297 100644 --- a/dydx/Pods/Local Podspecs/abacus.podspec.json +++ b/dydx/Pods/Local Podspecs/abacus.podspec.json @@ -1,6 +1,6 @@ { "name": "Abacus", - "version": "1.13.13", + "version": "1.13.14", "homepage": "https://github.com/dydxprotocol/v4-abacus", "source": { "git": "git@github.com:dydxprotocol/v4-abacus.git", @@ -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.13 $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.14 $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 eece124e7..daab1e1c3 100644 --- a/dydx/Pods/Manifest.lock +++ b/dydx/Pods/Manifest.lock @@ -1,5 +1,5 @@ PODS: - - Abacus (1.13.13) + - Abacus (1.13.14) - AmplitudeSwift (1.9.4): - AnalyticsConnector (~> 1.0.1) - AnalyticsConnector (1.0.3) @@ -377,12 +377,15 @@ EXTERNAL SOURCES: :git: https://github.com/dydxprotocol/Charts.git CHECKOUT OPTIONS: + Abacus: + :commit: feeedfbc26fd9ad8327a4d3a8f5ee92b925a5914 + :git: "git@github.com:dydxprotocol/v4-abacus.git" DGCharts: :commit: 5fcd52176925ef8112f79d7bed933f87fab1d738 :git: https://github.com/dydxprotocol/Charts.git SPEC CHECKSUMS: - Abacus: 2868046638aa194188f754d36dc3063e226c9332 + Abacus: a7768fbbe3ec6ea7569462fdf45218ef75cc188c AmplitudeSwift: d10ae6afdb0740e4ae843866bce8ab1119a53d74 AnalyticsConnector: a53214d38ae22734c6266106c0492b37832633a9 AppsFlyerFramework: ad7ff0d22aa36c7f8cc4f71a5424e19b89ccb8ae diff --git a/dydx/Pods/Pods.xcodeproj/project.pbxproj b/dydx/Pods/Pods.xcodeproj/project.pbxproj index 90d170f38..0bbaaf933 100644 --- a/dydx/Pods/Pods.xcodeproj/project.pbxproj +++ b/dydx/Pods/Pods.xcodeproj/project.pbxproj @@ -22,10 +22,10 @@ }; 2B2AD932AF1A90828B4DFC5AC6955ADA /* Abacus */ = { isa = PBXAggregateTarget; - buildConfigurationList = CF3C148334D5E62788E4A28A3F1C47FD /* Build configuration list for PBXAggregateTarget "Abacus" */; + buildConfigurationList = 9310CB6B0E10FCBB49C61AB6FBEEDE82 /* Build configuration list for PBXAggregateTarget "Abacus" */; buildPhases = ( - D523D9F4D2556BD4761A6A721AC7DA75 /* [CP-User] Build abacus */, - A29E2B073C57E44916A8E000A2C8DED9 /* [CP] Copy dSYMs */, + 316C579E2D03B021287C2D0A27880761 /* [CP-User] Build abacus */, + 89BF1F0140C82FF56656E0CE3760945B /* [CP] Copy dSYMs */, ); dependencies = ( ); @@ -24933,7 +24933,17 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/FirebaseAnalytics/FirebaseAnalytics-xcframeworks.sh\"\n"; showEnvVarsInLog = 0; }; - A29E2B073C57E44916A8E000A2C8DED9 /* [CP] Copy dSYMs */ = { + 316C579E2D03B021287C2D0A27880761 /* [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.14 $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"; + }; + 89BF1F0140C82FF56656E0CE3760945B /* [CP] Copy dSYMs */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -24967,16 +24977,6 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/GoogleAppMeasurement/GoogleAppMeasurement-xcframeworks.sh\"\n"; showEnvVarsInLog = 0; }; - D523D9F4D2556BD4761A6A721AC7DA75 /* [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.13 $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"; - }; DB7C100E6D7A5CF954757DB8962D9B72 /* [CP] Copy XCFrameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -34497,23 +34497,6 @@ }; name = Debug; }; - 230AC033214266EE3460DDE10D836923 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = D10DBF2FFCAE2CFAFDB147B38E7246C5 /* 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; - }; 23854AA373D54375FBA34311ACCF4901 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = A09C43F55B0966677531E2A9506168BE /* Pods-iOS-CameraParticlesTests.debug.xcconfig */; @@ -37034,24 +37017,6 @@ }; name = Debug; }; - 6FE119859914A2C2505DB058533C3E0E /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 3F58A67E444353CF2F3A3D37E5BBE252 /* 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; - }; 719C7B984B146728BD933E6F5C582262 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 9CE2881EB65C2A6EFD47C23FE58F61E7 /* GoogleToolboxForMac.debug.xcconfig */; @@ -38658,6 +38623,23 @@ }; name = Debug; }; + 9CCBEA560382B9F08888321E167DB436 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = D10DBF2FFCAE2CFAFDB147B38E7246C5 /* 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; + }; 9F513E21DA7993DF5C490175F404D841 /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 7B3435E206CB2F60782F8B3CDAAB4A48 /* Pods-iOS-dydxStateManagerTests.release.xcconfig */; @@ -41961,6 +41943,24 @@ }; name = Debug; }; + FAD54B698B1A423EEAA9B696DD8CD5A2 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 3F58A67E444353CF2F3A3D37E5BBE252 /* 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; + }; FC1DF3EE50011D4C5159689FE8BB2778 /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 76AF4B14CDD27DB0126DE93402215E9F /* AppsFlyerFramework.release.xcconfig */; @@ -42757,6 +42757,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 9310CB6B0E10FCBB49C61AB6FBEEDE82 /* Build configuration list for PBXAggregateTarget "Abacus" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 9CCBEA560382B9F08888321E167DB436 /* Debug */, + FAD54B698B1A423EEAA9B696DD8CD5A2 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 97EF2F979CB9563D7A72E198C55ABCCC /* Build configuration list for PBXNativeTarget "Pods-iOS-PlatformRoutingTests" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -43045,15 +43054,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - CF3C148334D5E62788E4A28A3F1C47FD /* Build configuration list for PBXAggregateTarget "Abacus" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 230AC033214266EE3460DDE10D836923 /* Debug */, - 6FE119859914A2C2505DB058533C3E0E /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; CFD4ED8C83FEDE7F633D76AE647342E2 /* Build configuration list for PBXNativeTarget "Validator" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/podspecs/Abacus.podspec b/podspecs/Abacus.podspec index 6934b527d..a741a23ca 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.13' +spec.version = '1.13.14' spec.homepage = 'https://github.com/dydxprotocol/v4-abacus' spec.source = { :git => "git@github.com:dydxprotocol/v4-abacus.git", :branch => "mike/fix-serialization" } spec.authors = '' diff --git a/scripts/bump_abacus.sh b/scripts/bump_abacus.sh index 424230a63..f2f3485b9 100755 --- a/scripts/bump_abacus.sh +++ b/scripts/bump_abacus.sh @@ -51,7 +51,7 @@ else git push --tags origin main fi - +git checkout mike/fix-serialization cd $scriptDir/.. echo "=================================="