Merge pull request #4 from narek-sv/unified-storage

Unified storage

.github/workflows/swift.yml

@@ -8,17 +8,23 @@ on:
 
 jobs:
   build:
-
-    runs-on: macos-latest
-
+    strategy:
+        matrix:
+          os: [macos-14]
+          swift: ["5.9"]
+    runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v3
-    #- uses: maxim-lobanov/setup-xcode@v1
-    #  with:
-    #    xcode-version: '>15.0'
+    - uses: swift-actions/setup-swift@v1
+      name: Set up Swift
+      with:
+        swift-version: ${{ matrix.swift }}
+    - name: Get Swift version
+      run: swift --version
+    - uses: actions/checkout@v4
+      name: Checkout
     - name: Build
       run: swift build -v
-    - name: Run tests
+    - name: Test
       run: swift test -v --enable-code-coverage
     - name: Upload to Codecov
-      uses: codecov/codecov-action@v3.1.0
+      uses: codecov/codecov-action@v3

Package.swift

@@ -1,30 +1,54 @@
-// swift-tools-version:5.0
+// 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: "KeyValueStorage",
     platforms: [
-        .iOS(.v9),
-        .macOS(.v10_10),
-        .watchOS(.v2),
-        .tvOS(.v9)
+        .iOS(.v13),
+        .macOS(.v10_15),
+        .watchOS(.v6),
+        .tvOS(.v13)
     ],
     products: [
         // Products define the executables and libraries a package produces, and make them visible to other packages.
         .library(
             name: "KeyValueStorage",
             targets: ["KeyValueStorage"]),
+        .library(
+            name: "KeyValueStorageWrapper",
+            targets: ["KeyValueStorageWrapper"]),
+        .library(
+            name: "KeyValueStorageSwiftUI",
+            targets: ["KeyValueStorageSwiftUI"]),
+        .library(
+            name: "UnifiedStorage",
+            targets: ["UnifiedStorage"]),
     ],
     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: "UnifiedStorage",
+            dependencies: [],
+            swiftSettings: [
+                .enableExperimentalFeature("StrictConcurrency"),
+            ]),
         .target(
             name: "KeyValueStorage",
             dependencies: []),
+        .target(
+            name: "KeyValueStorageWrapper",
+            dependencies: [.target(name: "KeyValueStorage")]),
+        .target(
+            name: "KeyValueStorageSwiftUI",
+            dependencies: [.target(name: "KeyValueStorageWrapper")]),
         .testTarget(
             name: "KeyValueStorageTests",
-            dependencies: ["KeyValueStorage"]),
+            dependencies: ["KeyValueStorage", "KeyValueStorageWrapper", "KeyValueStorageSwiftUI"]),
+        .testTarget(
+            name: "UnifiedStorageTests",
+            dependencies: ["UnifiedStorage"]),
     ]
 )