➕ Added LogsSheetKit as dependency

riiid · Oct 5, 2022 · 35d63b4 · 35d63b4
1 parent 5941201
commit 35d63b4
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 23 deletions.
diff --git a/...hareddata/xcschemes/LogsSheetKit.xcscheme → ...xcschemes/ComposableLogsSheetKit.xcscheme b/...hareddata/xcschemes/LogsSheetKit.xcscheme → ...xcschemes/ComposableLogsSheetKit.xcscheme
@@ -14,9 +14,9 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "LogsSheetKit"
-               BuildableName = "LogsSheetKit"
-               BlueprintName = "LogsSheetKit"
+               BlueprintIdentifier = "ComposableLogsSheetKit"
+               BuildableName = "ComposableLogsSheetKit"
+               BlueprintName = "ComposableLogsSheetKit"
                ReferencedContainer = "container:">
             </BuildableReference>
          </BuildActionEntry>
@@ -28,9 +28,9 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "LogsSheetKitTests"
-               BuildableName = "LogsSheetKitTests"
-               BlueprintName = "LogsSheetKitTests"
+               BlueprintIdentifier = "ComposableLogsSheetKitTests"
+               BuildableName = "ComposableLogsSheetKitTests"
+               BlueprintName = "ComposableLogsSheetKitTests"
                ReferencedContainer = "container:">
             </BuildableReference>
          </BuildActionEntry>
@@ -46,9 +46,9 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "LogsSheetKitTests"
-               BuildableName = "LogsSheetKitTests"
-               BlueprintName = "LogsSheetKitTests"
+               BlueprintIdentifier = "ComposableLogsSheetKitTests"
+               BuildableName = "ComposableLogsSheetKitTests"
+               BlueprintName = "ComposableLogsSheetKitTests"
                ReferencedContainer = "container:">
             </BuildableReference>
          </TestableReference>
@@ -74,9 +74,9 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "LogsSheetKit"
-            BuildableName = "LogsSheetKit"
-            BlueprintName = "LogsSheetKit"
+            BlueprintIdentifier = "ComposableLogsSheetKit"
+            BuildableName = "ComposableLogsSheetKit"
+            BlueprintName = "ComposableLogsSheetKit"
             ReferencedContainer = "container:">
          </BuildableReference>
       </MacroExpansion>

diff --git a/...data/xcschemes/LogsSheetKitTests.xcscheme → ...emes/ComposableLogsSheetKitTests.xcscheme b/...data/xcschemes/LogsSheetKitTests.xcscheme → ...emes/ComposableLogsSheetKitTests.xcscheme
@@ -14,9 +14,9 @@
             buildForAnalyzing = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "LogsSheetKitTests"
-               BuildableName = "LogsSheetKitTests"
-               BlueprintName = "LogsSheetKitTests"
+               BlueprintIdentifier = "ComposableLogsSheetKitTests"
+               BuildableName = "ComposableLogsSheetKitTests"
+               BlueprintName = "ComposableLogsSheetKitTests"
                ReferencedContainer = "container:">
             </BuildableReference>
          </BuildActionEntry>
@@ -32,9 +32,9 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "LogsSheetKitTests"
-               BuildableName = "LogsSheetKitTests"
-               BlueprintName = "LogsSheetKitTests"
+               BlueprintIdentifier = "ComposableLogsSheetKitTests"
+               BuildableName = "ComposableLogsSheetKitTests"
+               BlueprintName = "ComposableLogsSheetKitTests"
                ReferencedContainer = "container:">
             </BuildableReference>
          </TestableReference>
@@ -60,9 +60,9 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "LogsSheetKitTests"
-            BuildableName = "LogsSheetKitTests"
-            BlueprintName = "LogsSheetKitTests"
+            BlueprintIdentifier = "ComposableLogsSheetKitTests"
+            BuildableName = "ComposableLogsSheetKitTests"
+            BlueprintName = "ComposableLogsSheetKitTests"
             ReferencedContainer = "container:">
          </BuildableReference>
       </MacroExpansion>

diff --git a/Package.resolved b/Package.resolved
@@ -9,6 +9,15 @@
         "version" : "0.8.0"
       }
     },
+    {
+      "identity" : "logssheetkit",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/riiid/LogsSheetKit",
+      "state" : {
+        "revision" : "5bb7cc405d718e86f9362e6a335230e2e295801b",
+        "version" : "0.9.0"
+      }
+    },
     {
       "identity" : "spindicator",
       "kind" : "remoteSourceControl",

diff --git a/Package.swift b/Package.swift
@@ -14,17 +14,22 @@ let package = Package(
   ],
   dependencies: [
     .package(url: "https://github.com/ivanvorobei/SPIndicator", .upToNextMajor(from: "1.6.0")),
-    .package(url: "https://github.com/pointfreeco/swift-composable-architecture", .upToNextMajor(from: "0.40.0"))
+    .package(url: "https://github.com/pointfreeco/swift-composable-architecture", .upToNextMajor(from: "0.40.0")),
+    .package(url: "https://github.com/riiid/LogsSheetKit", .upToNextMajor(from: "0.9.0"))
   ],
   targets: [
     .target(
       name: "ComposableLogsSheetKit",
       dependencies: [
         "SPIndicator",
+        "LogsSheetKit",
         .product(name: "ComposableArchitecture", package: "swift-composable-architecture")
       ]),
     .testTarget(
       name: "ComposableLogsSheetKitTests",
-      dependencies: ["ComposableLogsSheetKit"]),
+      dependencies: [
+        "ComposableLogsSheetKit",
+        "LogsSheetKit"
+      ]),
   ]
 )
diff --git a/Sources/ComposableLogsSheetKit/LoggableState.swift b/Sources/ComposableLogsSheetKit/LoggableState.swift
@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import LogsSheetKit
 
 public protocol LoggableState: Equatable {
   var logs: [ActionLog] { get set }

diff --git a/Tests/ComposableLogsSheetKitTests/LoggableStateTests.swift b/Tests/ComposableLogsSheetKitTests/LoggableStateTests.swift
@@ -7,6 +7,7 @@
 //
 
 import XCTest
+import LogsSheetKit
 @testable import ComposableLogsSheetKit
 
 final class LoggableStateTests: XCTestCase {