combine dependencies into one place

.swiftformat

@@ -10,7 +10,7 @@
 
 # format options
 
---exclude Sources/CustomDump,Sources/CasePaths,Sources/ConcurrencyExtras,Sources/IssueReporting,Sources/Perception,Sources/IdentifiedCollections,Sources/InternalCollectionsUtilities,Sources/OrderedCollections,Sources/ComposableArchitecture,Sources/KlaviyoSwift/Vendor,Tests/KlaviyoSwiftTests/Vendor,Tests/KlaviyoSwiftTests/__Snapshots__
+--exclude Sources/KlaviyoSDKDependencies,Sources/KlaviyoSwift/Vendor,Tests/KlaviyoSwiftTests/Vendor,Tests/KlaviyoSwiftTests/__Snapshots__
 --closingparen same-line
 --commas inline
 --comments indent

.swiftlint.yml

@@ -17,17 +17,7 @@ excluded: # paths to ignore during linting. Takes precedence over `included`.
   - Sources/KlaviyoSwift/Vendor
   - Tests/KlaviyoSwiftTests/Vendor
   - Tests/KlaviyoSwiftTests/__Snapshots__
-  - Sources/AnyCodable
-  - Sources/Collections
-  - Sources/ComposableArchitecture
-  - Sources/IdentifiedCollections
-  - Sources/InternalCollectionsUtilities
-  - Sources/OrderedCollections
-  - Sources/Perception
-  - Sources/IssueReporting
-  - Sources/ConcurrencyExtras
-  - Sources/CasePaths
-  - Sources/CustomDump
+  - Sources/KlaviyoSDKDependencies
 analyzer_rules: # Rules run by `swiftlint analyze` (experimental)
   - explicit_self
 

KlaviyoCore.podspec

@@ -12,4 +12,5 @@ Pod::Spec.new do |s|
   s.swift_version    = '5.7'
   s.platform         = :ios, '13.0'
   s.source_files     = 'Sources/KlaviyoCore/**/*.swift'
+  s.dependency     'KlaviyoSDKDependencies', '~>4.0.0'
 end

KlaviyoSDKDependencies.podspec

@@ -0,0 +1,15 @@
+Pod::Spec.new do |s|
+  s.name             = "KlaviyoSDKDependencies"
+  s.version          = "4.0.0"
+  s.summary          = "Dependency for the Klaviyo SDK"
+  s.description      = <<-DESC
+                        Klaviyo external dependencies all rolled in one package
+                       DESC
+  s.homepage         = "https://github.com/klaviyo/klaviyo-swift-sdk"
+  s.license          = { :type => "MIT", :file => "LICENSE" }
+  s.author           = { "Mobile @ Klaviyo" => "[email protected]" }
+  s.source           = { :git => "https://github.com/klaviyo/klaviyo-swift-sdk.git", :tag => s.version.to_s }
+  s.swift_version    = '5.7'
+  s.platform         = :ios, '13.0'
+  s.source_files     = 'Sources/KlaviyoCore/**/*.swift'
+end

KlaviyoSwift.podspec

@@ -17,4 +17,5 @@ Pod::Spec.new do |s|
   s.source_files = 'Sources/KlaviyoSwift/**/*.swift'
   s.resource_bundles = {"KlaviyoSwift" => ["Sources/KlaviyoSwift/PrivacyInfo.xcprivacy"]}
   s.dependency     'KlaviyoCore', '~> 4.0.0'
+  s.dependency     'KlaviyoSDKDependencies', '~>4.0.0'
 end

Package.swift

@@ -26,21 +26,20 @@ let package = Package(
     targets: [
         .target(
             name: "KlaviyoCore",
-            dependencies: ["AnyCodable"],
+            dependencies: ["KlaviyoSDKDependencies"],
             path: "Sources/KlaviyoCore"),
         .testTarget(
             name: "KlaviyoCoreTests",
             dependencies: [
                 "KlaviyoCore",
                 .product(name: "SnapshotTesting", package: "swift-snapshot-testing"),
-                "KCustomDump"
+                "KlaviyoSDKDependencies"
             ]),
         .target(
             name: "KlaviyoSwift",
             dependencies: [
                 "KlaviyoCore",
-                "KComposableArchitecture",
-                "AnyCodable"
+                "KlaviyoSDKDependencies"
             ],
             path: "Sources/KlaviyoSwift",
             resources: [.copy("PrivacyInfo.xcprivacy")]),
@@ -49,12 +48,9 @@ let package = Package(
             dependencies: [
                 "KlaviyoSwift",
                 .product(name: "SnapshotTesting", package: "swift-snapshot-testing"),
-                "KCustomDump",
+                "KlaviyoSDKDependencies",
                 .product(name: "CombineSchedulers", package: "combine-schedulers"),
                 "KlaviyoCore",
-                "KComposableArchitecture",
-                "KIssueReporting",
-                "KCasePaths",
                 .product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay")
             ],
             exclude: [
@@ -70,8 +66,7 @@ let package = Package(
             dependencies: [
                 "KlaviyoSwift",
                 "KlaviyoCore",
-                "KIssueReporting",
-                "KCustomDump"
+                "KlaviyoSDKDependencies"
             ]),
         .target(
             name: "KlaviyoSwiftExtension",
@@ -80,30 +75,7 @@ let package = Package(
 
         // Vendorized Things
         .target(
-            name: "KComposableArchitecture",
-            dependencies: [
-                "KCustomDump",
-                "KConcurrencyExtras",
-                "KCasePaths"
-            ],
-            path: "Sources/ComposableArchitecture"),
-        .target(
-            name: "AnyCodable",
-            dependencies: [],
-            path: "Sources/AnyCodable"),
-        .target(
-            name: "KConcurrencyExtras",
-            dependencies: [],
-            path: "Sources/ConcurrencyExtras"),
-        .target(
-            name: "KIssueReporting",
+            name: "KlaviyoSDKDependencies",
             dependencies: [],
-            path: "Sources/IssueReporting"),
-        .target(name: "KCasePaths",
-                dependencies: ["KIssueReporting"],
-                path: "Sources/CasePaths"),
-        .target(name: "KCustomDump",
-                dependencies: ["KIssueReporting"],
-                path: "Sources/CustomDump")
-
+            path: "Sources/KlaviyoSDKDependencies")
     ])

Package@swift-6.0.swift

@@ -25,21 +25,20 @@ let package = Package(
     targets: [
         .target(
             name: "KlaviyoCore",
-            dependencies: ["AnyCodable"],
+            dependencies: ["KlaviyoSDKDependencies"],
             path: "Sources/KlaviyoCore"),
         .testTarget(
             name: "KlaviyoCoreTests",
             dependencies: [
                 "KlaviyoCore",
                 .product(name: "SnapshotTesting", package: "swift-snapshot-testing"),
-                "KCustomDump"
+                "KlaviyoSDKDependencies"
             ]),
         .target(
             name: "KlaviyoSwift",
             dependencies: [
-                "AnyCodable",
-                "KlaviyoCore",
-                "KComposableArchitecture"
+                "KlaviyoSDKDependencies",
+                "KlaviyoCore"
             ],
             path: "Sources/KlaviyoSwift",
             resources: [.copy("PrivacyInfo.xcprivacy")]),
@@ -48,12 +47,9 @@ let package = Package(
             dependencies: [
                 "KlaviyoSwift",
                 .product(name: "SnapshotTesting", package: "swift-snapshot-testing"),
-                "KCustomDump",
+                "KlaviyoSDKDependencies",
                 .product(name: "CombineSchedulers", package: "combine-schedulers"),
                 "KlaviyoCore",
-                "KComposableArchitecture",
-                "KIssueReporting",
-                "KCasePaths",
                 .product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay")
             ],
             exclude: [
@@ -69,8 +65,7 @@ let package = Package(
             dependencies: [
                 "KlaviyoSwift",
                 "KlaviyoCore",
-                "KIssueReporting",
-                "KCustomDump"
+                "KlaviyoSDKDependencies"
             ]),
         .target(
             name: "KlaviyoSwiftExtension",
@@ -79,30 +74,8 @@ let package = Package(
 
         // Vendorized Things
         .target(
-            name: "KComposableArchitecture",
-            dependencies: [
-                "KCustomDump",
-                "KConcurrencyExtras",
-                "KCasePaths"
-            ],
-            path: "Sources/ComposableArchitecture"),
-        .target(
-            name: "AnyCodable",
-            dependencies: [],
-            path: "Sources/AnyCodable"),
-        .target(
-            name: "KConcurrencyExtras",
-            dependencies: [],
-            path: "Sources/ConcurrencyExtras"),
-        .target(
-            name: "KIssueReporting",
+            name: "KlaviyoSDKDependencies",
             dependencies: [],
-            path: "Sources/IssueReporting"),
-        .target(name: "KCasePaths",
-                dependencies: ["KIssueReporting"],
-                path: "Sources/CasePaths"),
-        .target(name: "KCustomDump",
-                dependencies: ["KIssueReporting"],
-                path: "Sources/CustomDump")
+            path: "Sources/KlaviyoSDKDependencies")
     ],
     swiftLanguageModes: [.v6])

Sources/KlaviyoCore/KlaviyoEnvironment.swift

@@ -5,9 +5,9 @@
 //  Created by Noah Durell on 9/28/22.
 //
 
-import AnyCodable
 import Combine
 import Foundation
+import KlaviyoSDKDependencies
 import UIKit
 
 // Though this is a var it should never be modified outside of tests.

Sources/KlaviyoCore/Models/APIModels/CreateEventPayload.swift

@@ -5,8 +5,8 @@
 //  Created by Ajay Subramanya on 8/5/24.
 //
 
-import AnyCodable
 import Foundation
+import KlaviyoSDKDependencies
 
 public struct CreateEventPayload: Equatable, Codable, Sendable {
     public struct Event: Equatable, Codable, Sendable {

Sources/KlaviyoCore/Models/APIModels/CreateProfilePayload.swift

@@ -5,8 +5,8 @@
 //  Created by Ajay Subramanya on 8/5/24.
 //
 
-import AnyCodable
 import Foundation
+import KlaviyoSDKDependencies
 
 public struct CreateProfilePayload: Equatable, Codable, Sendable {
     public init(data: ProfilePayload) {

Sources/KlaviyoCore/Models/APIModels/ProfilePayload.swift

@@ -5,8 +5,8 @@
 //  Created by Ajay Subramanya on 8/6/24.
 //
 
-import AnyCodable
 import Foundation
+import KlaviyoSDKDependencies
 
 /**
  Internal structure which has details not needed by the API.

Sources/KlaviyoCore/Networking/KlaviyoAPI.swift

@@ -5,8 +5,8 @@
 //  Created by Noah Durell on 11/8/22.
 //
 
-import AnyCodable
 import Foundation
+import KlaviyoSDKDependencies
 
 public struct KlaviyoAPI: Sendable {
     public var send: @Sendable (NetworkSession, KlaviyoRequest, Int) async -> Result<Data, KlaviyoAPIError>

Sources/KlaviyoCore/Networking/KlaviyoEndpoint.swift

@@ -6,8 +6,8 @@
 //  Created by Noah Durell on 11/25/22.
 //
 
-import AnyCodable
 import Foundation
+import KlaviyoSDKDependencies
 
 public enum KlaviyoEndpoint: Equatable, Codable, Sendable {
     case createProfile(CreateProfilePayload)

Sources/KlaviyoCore/Networking/KlaviyoRequest.swift

@@ -5,8 +5,8 @@
 //  Created by Ajay Subramanya on 8/5/24.
 //
 
-import AnyCodable
 import Foundation
+import KlaviyoSDKDependencies
 
 public struct KlaviyoRequest: Equatable, Codable, Sendable {
     public let apiKey: String

Sources/KlaviyoCore/Networking/SDKRequestIterator.swift

@@ -5,8 +5,8 @@
 //  Created by Noah Durell on 2/13/23.
 //
 
-import AnyCodable
 import Foundation
+import KlaviyoSDKDependencies
 
 @_spi(KlaviyoPrivate)
 public struct SDKRequest: Identifiable, Equatable {

Sources/CasePaths/AnyCasePath.swift → Sources/KlaviyoSDKDependencies/CasePaths/AnyCasePath.swift

@@ -31,7 +31,7 @@ public struct AnyCasePath<Root, Value>: Sendable {
       nonisolated(unsafe) let embed = embed
       return Self(embed: { embed($0) }, extract: extract)
     #else
-      @UncheckedSendable var embed = embed
+      @CasePathsUncheckedSendable var embed = embed
       return Self(embed: { [$embed] in $embed.wrappedValue($0) }, extract: extract)
     #endif
   }

Sources/CasePaths/CasePathable.swift → Sources/KlaviyoSDKDependencies/CasePaths/CasePathable.swift

@@ -1,4 +1,4 @@
-import KIssueReporting
+import KlaviyoSDKDependencies
 
 /// A type that provides a collection of all of its case paths.
 ///
@@ -85,7 +85,7 @@ extension Case {
     dynamicMember keyPath: KeyPath<Value.AllCasePaths, AnyCasePath<Value, AppendedValue>>
   ) -> Case<AppendedValue>
   where Value: CasePathable {
-    @UncheckedSendable var keyPath = keyPath
+    @CasePathsUncheckedSendable var keyPath = keyPath
     return Case<AppendedValue>(
       embed: { [$keyPath] in
         embed(Value.allCasePaths[keyPath: $keyPath.wrappedValue].embed($0))
@@ -549,7 +549,7 @@ extension AnyCasePath where Value: CasePathable {
   public subscript<AppendedValue>(
     dynamicMember keyPath: KeyPath<Value.AllCasePaths, AnyCasePath<Value, AppendedValue>>
   ) -> AnyCasePath<Root, AppendedValue> {
-    @UncheckedSendable var keyPath = keyPath
+    @CasePathsUncheckedSendable var keyPath = keyPath
     return AnyCasePath<Root, AppendedValue>(
       embed: { [$keyPath] in
         embed(Value.allCasePaths[keyPath: $keyPath.wrappedValue].embed($0))

Sources/CasePaths/EnumReflection.swift → Sources/KlaviyoSDKDependencies/CasePaths/EnumReflection.swift

@@ -20,7 +20,7 @@ extension AnyCasePath {
       optionalPromotedExtractHelp(unsafeBitCast(embed, to: (@Sendable (Value) -> Wrapped?).self))
         as! @Sendable (Root) -> Value?
     }
-    @UncheckedSendable var embed = embed
+    @CasePathsUncheckedSendable var embed = embed
     let extract =
       ((_Witness<Root>.self as? _AnyOptional.Type)?.wrappedType)
       .map { _openExistential($0, do: open) }
@@ -73,7 +73,7 @@ func extractHelp<Root, Value>(
     return { _ in nil }
   }
 
-  let cache = LockIsolated(Cache())
+  let cache = CasePathsLockIsolated(Cache())
 
   return { root in
     let rootTag = metadata.tag(of: root)
@@ -119,7 +119,7 @@ func optionalPromotedExtractHelp<Root, Value>(
     return { _ in nil }
   }
 
-  let cachedTag = LockIsolated<UInt32?>(nil)
+  let cachedTag = CasePathsLockIsolated<UInt32?>(nil)
 
   return { optionalRoot in
     guard let root = optionalRoot else { return nil }

Sources/CasePaths/Internal/LockIsolated.swift → Sources/KlaviyoSDKDependencies/CasePaths/Internal/CasePathsLockIsolated.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-final class LockIsolated<Value>: @unchecked Sendable {
+final class CasePathsLockIsolated<Value>: @unchecked Sendable {
   private var _value: Value
   private let lock = NSRecursiveLock()
   init(_ value: @autoclosure @Sendable () throws -> Value) rethrows {

Sources/CasePaths/Internal/UncheckedSendable.swift → Sources/KlaviyoSDKDependencies/CasePaths/Internal/CasePathsUncheckedSendable.swift

@@ -1,5 +1,5 @@
 @propertyWrapper
-struct UncheckedSendable<Value>: @unchecked Sendable {
+struct CasePathsUncheckedSendable<Value>: @unchecked Sendable {
   var wrappedValue: Value
   init(wrappedValue value: Value) {
     self.wrappedValue = value

Sources/ComposableArchitecture/Effect.swift → Sources/KlaviyoSDKDependencies/ComposableArchitecture/Effect.swift

@@ -1,8 +1,6 @@
 @preconcurrency import Combine
-import KConcurrencyExtras
-import KCustomDump
+import KlaviyoSDKDependencies
 import Foundation
-import KIssueReporting
 import SwiftUI
 
 public struct Effect<Action>: Sendable {