Merge branch 'develop' into features/add_filters

# Conflicts: # dydx/Podfile.lock # dydx/Pods/AmplitudeSwift/Sources/Amplitude/Constants.swift # dydx/Pods/Local Podspecs/abacus.podspec.json # dydx/Pods/Manifest.lock # dydx/Pods/Pods.xcodeproj/project.pbxproj # dydx/Pods/Target Support Files/AmplitudeSwift/AmplitudeSwift-Info.plist # dydx/Pods/Target Support Files/AmplitudeSwift/ResourceBundle-Amplitude-AmplitudeSwift-Info.plist # podspecs/Abacus.podspec
dydxprotocol · Sep 11, 2024 · 79fedb9 · 79fedb9
2 parents a3aa2f8 + a0109b8
commit 79fedb9
Show file tree

Hide file tree

Showing 11 changed files with 84 additions and 82 deletions.
diff --git a/dydx/Podfile.lock b/dydx/Podfile.lock
@@ -1,6 +1,6 @@
 PODS:
-  - Abacus (1.10.2)
-  - AmplitudeSwift (1.9.1):
+  - Abacus (1.10.3)
+  - AmplitudeSwift (1.9.2):
     - AnalyticsConnector (~> 1.0.1)
   - AnalyticsConnector (1.0.3)
   - AppsFlyerFramework (6.15.2):
@@ -382,8 +382,8 @@ CHECKOUT OPTIONS:
     :git: https://github.com/dydxprotocol/Charts.git
 
 SPEC CHECKSUMS:
-  Abacus: 19aaf307228b07739932f54fffa6dee3e3ac6125
-  AmplitudeSwift: f01a962a2cb28dee9807a5b8a362da339d86f00e
+  Abacus: 8e4875792b01c8eb94543a351a5d6876d22062e0
+  AmplitudeSwift: 6c2c689f7dc83e6d9d90b7f53b93433c1436196a
   AnalyticsConnector: a53214d38ae22734c6266106c0492b37832633a9
   AppsFlyerFramework: 3c6c50b7b3f0f37f648a5b23114940e0766e65e8
   Atributika: ecedf5259e4aa3c6278d840b6c18d60c1a8b6ca0

diff --git a/dydx/Pods/AmplitudeSwift/Sources/Amplitude/Amplitude.swift b/dydx/Pods/AmplitudeSwift/Sources/Amplitude/Amplitude.swift
diff --git a/dydx/Pods/AmplitudeSwift/Sources/Amplitude/Constants.swift b/dydx/Pods/AmplitudeSwift/Sources/Amplitude/Constants.swift
diff --git a/dydx/Pods/AmplitudeSwift/Sources/Amplitude/ObjC/ObjCPlugin.swift b/dydx/Pods/AmplitudeSwift/Sources/Amplitude/ObjC/ObjCPlugin.swift
diff --git a/dydx/Pods/AmplitudeSwift/Sources/Amplitude/Sessions.swift b/dydx/Pods/AmplitudeSwift/Sources/Amplitude/Sessions.swift
diff --git a/dydx/Pods/Local Podspecs/abacus.podspec.json b/dydx/Pods/Local Podspecs/abacus.podspec.json
diff --git a/dydx/Pods/Manifest.lock b/dydx/Pods/Manifest.lock
diff --git a/dydx/Pods/Pods.xcodeproj/project.pbxproj b/dydx/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/dydx/Pods/Target Support Files/AmplitudeSwift/AmplitudeSwift-Info.plist b/dydx/Pods/Target Support Files/AmplitudeSwift/AmplitudeSwift-Info.plist
diff --git a/...ds/Target Support Files/AmplitudeSwift/ResourceBundle-Amplitude-AmplitudeSwift-Info.plist b/...ds/Target Support Files/AmplitudeSwift/ResourceBundle-Amplitude-AmplitudeSwift-Info.plist
diff --git a/podspecs/Abacus.podspec b/podspecs/Abacus.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'Abacus'
-spec.version = '1.10.2'
+spec.version = '1.10.3'
     spec.homepage                 = 'https://github.com/dydxprotocol/v4-abacus'
     spec.source                   = { :git => "[email protected]:dydxprotocol/v4-abacus.git", :tag => "v#{spec.version}" }
     spec.authors                  = ''