Release/26.8.1.1

.github/workflows/beta-release.yml

@@ -24,7 +24,9 @@ jobs:
     - name: Deploy to Cocoapods
       run: |
            set -eo pipefail
-           pod lib lint --allow-warnings
-           pod trunk push --allow-warnings
+           pod lib lint Skyflow.podspec --allow-warnings
+           pod lib lint SkyflowFlowVault.podspec --allow-warnings
+           pod trunk push Skyflow.podspec --allow-warnings
+           pod trunk push SkyflowFlowVault.podspec --allow-warnings
       env:
         COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}

.github/workflows/bump_version.yml

@@ -8,7 +8,7 @@ on:
     paths-ignore:
       - 'Skyflow.podspec'
       - '*.md'
-      - 'Sources/Skyflow/Version.swift'
+      - 'SkyflowCore/Sources/Version.swift'
     branches: 
       - public-release/*
 
@@ -41,7 +41,7 @@ jobs:
       run: |
            git config user.name ${{ github.actor }}
            git config user.email ${{ github.actor }}@users.noreply.github.com
-           git add Skyflow.podspec 
-           git add Sources/Skyflow/Version.swift
+           git add Skyflow.podspec SkyflowFlowVault.podspec
+           git add SkyflowCore/Sources/Version.swift
            git commit -m "[AUTOMATED] Public Release ${{ steps.version.outputs.version }}"
            git push origin

.github/workflows/internal_release.yml

@@ -7,8 +7,9 @@ on:
       - '*'
     paths-ignore:
       - 'Skyflow.podspec'
+      - 'SkyflowFlowVault.podspec'
       - '*.md'
-      - 'Sources/Skyflow/Version.swift'
+      - 'SkyflowCore/Sources/Version.swift'
     branches: 
       - release/*
 
@@ -36,8 +37,8 @@ jobs:
       run: |
            git config user.name ${{ github.actor }}
            git config user.email ${{ github.actor }}@users.noreply.github.com
-           git add Skyflow.podspec
-           git add Sources/Skyflow/Version.swift
+           git add Skyflow.podspec SkyflowFlowVault.podspec
+           git add SkyflowCore/Sources/Version.swift
            git commit -m "[AUTOMATED] Private Release ${{ steps.previoustag.outputs.tag }}.$(git rev-parse --short $GITHUB_SHA)"
            git push origin
 
@@ -53,4 +54,5 @@ jobs:
       run: |
            pod repo add private_spec git@github.com:skyflowapi/skyflow-iOS-private-spec.git
            pod repo push private_spec ./Skyflow.podspec --allow-warnings
+           pod repo push private_spec ./SkyflowFlowVault.podspec --allow-warnings
            echo "Published as Private pod"

.github/workflows/pr.yml

@@ -44,7 +44,7 @@ jobs:
           xcrun simctl list devices booted
 
       - name: Build and Test
-        run: xcodebuild clean -workspace .swiftpm/xcode/package.xcworkspace -scheme Skyflow -enableCodeCoverage YES -destination "platform=iOS Simulator,OS=18.6,name=iPhone 16" VAULT_URL="${{ secrets.VAULT_URL }}" TEST_SKYFLOW_ID1="${{ secrets.TEST_SKYFLOW_ID1 }}" TEST_SKYFLOW_ID2="${{ secrets.TEST_SKYFLOW_ID2 }}" TEST_SKYFLOW_ID3="${{ secrets.TEST_SKYFLOW_ID3 }}" TEST_SKYFLOW_ID4="${{ secrets.TEST_SKYFLOW_ID4 }}" VAULT_ID="${{ secrets.VAULT_ID }}" test        
+        run: xcodebuild clean -workspace .swiftpm/xcode/package.xcworkspace -scheme Skyflow-Package -enableCodeCoverage YES -destination "platform=iOS Simulator,OS=18.6,name=iPhone 16" VAULT_URL="${{ secrets.VAULT_URL }}" TEST_SKYFLOW_ID1="${{ secrets.TEST_SKYFLOW_ID1 }}" TEST_SKYFLOW_ID2="${{ secrets.TEST_SKYFLOW_ID2 }}" TEST_SKYFLOW_ID3="${{ secrets.TEST_SKYFLOW_ID3 }}" TEST_SKYFLOW_ID4="${{ secrets.TEST_SKYFLOW_ID4 }}" VAULT_ID="${{ secrets.VAULT_ID }}" test        
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v4

.github/workflows/release.yml

@@ -26,7 +26,9 @@ jobs:
     - name: Deploy to Cocoapods
       run: |
            set -eo pipefail
-           pod lib lint --allow-warnings
-           pod trunk push --allow-warnings
+           pod lib lint Skyflow.podspec --allow-warnings
+           pod lib lint SkyflowFlowVault.podspec --allow-warnings
+           pod trunk push Skyflow.podspec --allow-warnings
+           pod trunk push SkyflowFlowVault.podspec --allow-warnings
       env:
         COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}

Package.swift

@@ -1,47 +1,90 @@
-// swift-tools-version:5.3
+// swift-tools-version:5.9
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
     name: "Skyflow",
+    platforms: [
+        .iOS(.v13)
+    ],
     products: [
-        // Products define the executables and libraries a package produces, and make them visible to other packages.
+        // PDB vault SDK
         .library(
             name: "Skyflow",
             targets: ["Skyflow"]),
+        // FlowVault SDK
+        .library(
+            name: "SkyflowFlowVault",
+            targets: ["SkyflowFlowVault"]),
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
         // .package(url: /* package url */, from: "1.0.0"),
     ],
     targets: [
-        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
-        // Targets can depend on other targets in this package, and on products in packages this package depends on.
         .target(
-            name: "Skyflow",
+            name: "SkyflowCore",
             dependencies: [],
+            path: "SkyflowCore/Sources",
             resources: [
                    .process("Resources")
                  ]
             ),
+        // Legacy (v1) contract layer.
+        .target(
+            name: "Skyflow",
+            dependencies: ["SkyflowCore"],
+            path: "Skyflow/Sources"
+            ),
+        // FlowVault (v2) contract layer.
+        .target(
+            name: "SkyflowFlowVault",
+            dependencies: ["SkyflowCore"],
+            path: "SkyflowFlowVault/Sources"
+            ),
+        // Tests for the legacy (v1) SDK live under Skyflow/Tests/,
+        // FlowVault (v2) SDK tests under SkyflowFlowVault/Tests/.
         .testTarget(
             name: "skyflow-iOS-collectTests",
-            dependencies: ["Skyflow"]),
+            dependencies: ["SkyflowFlowVault", "SkyflowCore"],
+            path: "SkyflowFlowVault/Tests/skyflow-iOS-collectTests"),
         .testTarget(name: "skyflow-iOS-revealTests",
-                    dependencies: ["Skyflow"]),
+                    dependencies: ["SkyflowFlowVault", "SkyflowCore"],
+                    path: "SkyflowFlowVault/Tests/skyflow-iOS-revealTests"),
         .testTarget(name: "skyflow-iOS-errorTests",
-                    dependencies: ["Skyflow"]),
+                    dependencies: ["SkyflowFlowVault", "SkyflowCore"],
+                    path: "SkyflowFlowVault/Tests/skyflow-iOS-errorTests"),
         .testTarget(name: "skyflow-iOS-getByIdTests",
-                        dependencies: ["Skyflow"]),
+                        dependencies: ["Skyflow", "SkyflowCore"],
+                        path: "Skyflow/Tests/skyflow-iOS-getByIdTests"),
         .testTarget(name: "skyflow-iOS-elementTests",
-                    dependencies: ["Skyflow"]),
+                    dependencies: ["SkyflowFlowVault", "SkyflowCore"],
+                    path: "SkyflowFlowVault/Tests/skyflow-iOS-elementTests"),
         .testTarget(name: "skyflow-iOS-utilTests",
-                        dependencies: ["Skyflow"]),
+                        dependencies: ["SkyflowFlowVault", "SkyflowCore"],
+                        path: "SkyflowFlowVault/Tests/skyflow-iOS-utilTests"),
+        .testTarget(name: "skyflow-iOS-legacyTests",
+                        dependencies: ["Skyflow", "SkyflowCore"],
+                        path: "Skyflow/Tests/skyflow-iOS-legacyTests"),
         .testTarget(name: "skyflow-iOS-scenarioTests",
-                            dependencies: ["Skyflow"]),
+                            dependencies: ["Skyflow", "SkyflowCore"],
+                            path: "Skyflow/Tests/skyflow-iOS-scenarioTests"),
         .testTarget(name: "skyflow-iOS-getTests",
-                   dependencies: ["Skyflow"]),
-        .testTarget(name: "skyflow-iOS-composableTests", dependencies: ["Skyflow"])
+                   dependencies: ["Skyflow", "SkyflowCore"],
+                   path: "Skyflow/Tests/skyflow-iOS-getTests"),
+        .testTarget(name: "skyflow-iOS-composableTests",
+                    dependencies: ["SkyflowFlowVault", "SkyflowCore"],
+                    path: "SkyflowFlowVault/Tests/skyflow-iOS-composableTests"),
+        // Dual-SDK coexistence tests: import both products side by side,
+        // public API only, the way an app installing both pods would.
+        .testTarget(name: "skyflow-iOS-coexistenceTests",
+                    dependencies: ["Skyflow", "SkyflowFlowVault"],
+                    path: "Tests/skyflow-iOS-coexistenceTests"),
+        // Shared-core logic tests: depend only on SkyflowCore, so core
+        // regressions surface here independently of either SDK.
+        .testTarget(name: "skyflow-iOS-coreTests",
+                    dependencies: ["SkyflowCore"],
+                    path: "SkyflowCore/Tests/skyflow-iOS-coreTests")
     ]
 )