From c00a77f0c7ed95685bbbba10e74288946582368b Mon Sep 17 00:00:00 2001 From: Max Goedjen Date: Sat, 11 Dec 2021 16:09:13 -0800 Subject: [PATCH] . --- Package.swift | 12 +++++++++--- Sources/SecretAgentKit/SigningRequestTracer.swift | 1 + Sources/SecretAgentKitHeaders/Stub.swift | 1 + .../include}/SecretAgentKit.h | 0 Sources/SecretAgentKitHeaders/module.modulemap | 4 ++++ Tests/SecretAgentKitTests/StubFileHandleWriter.swift | 1 + Tests/SecretAgentKitTests/StubStore.swift | 1 + 7 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 Sources/SecretAgentKitHeaders/Stub.swift rename Sources/{SecretAgentKit => SecretAgentKitHeaders/include}/SecretAgentKit.h (100%) create mode 100644 Sources/SecretAgentKitHeaders/module.modulemap diff --git a/Package.swift b/Package.swift index 56ea7f8..831927c 100644 --- a/Package.swift +++ b/Package.swift @@ -14,7 +14,10 @@ let package = Package( targets: ["SecretKit"]), .library( name: "SecretAgentKit", - targets: ["SecretKit"]), + targets: ["SecretAgentKit"]), + .library( + name: "SecretAgentKitHeaders", + targets: ["SecretAgentKitHeaders"]), .library( name: "Brief", targets: ["Brief"]), @@ -54,7 +57,7 @@ let package = Package( linkerSettings: [.unsafeFlags( ["-sectcreate", "__TEXT", "__info_plist", - "Sources/TesTest SecretAgent/Resources/Info.plist"]) + "Sources/SecretAgent/Resources/Info.plist"]) ] ), .target( @@ -67,7 +70,10 @@ let package = Package( ), .target( name: "SecretAgentKit", - dependencies: [] + dependencies: ["SecretAgentKitHeaders"] + ), + .systemLibrary( + name: "SecretAgentKitHeaders" ), .testTarget( name: "SecretAgentKitTests", diff --git a/Sources/SecretAgentKit/SigningRequestTracer.swift b/Sources/SecretAgentKit/SigningRequestTracer.swift index 54923ce..ff91f4d 100644 --- a/Sources/SecretAgentKit/SigningRequestTracer.swift +++ b/Sources/SecretAgentKit/SigningRequestTracer.swift @@ -2,6 +2,7 @@ import Foundation import AppKit import Security import SecretKit +import SecretAgentKitHeaders struct SigningRequestTracer { } diff --git a/Sources/SecretAgentKitHeaders/Stub.swift b/Sources/SecretAgentKitHeaders/Stub.swift new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/Sources/SecretAgentKitHeaders/Stub.swift @@ -0,0 +1 @@ + diff --git a/Sources/SecretAgentKit/SecretAgentKit.h b/Sources/SecretAgentKitHeaders/include/SecretAgentKit.h similarity index 100% rename from Sources/SecretAgentKit/SecretAgentKit.h rename to Sources/SecretAgentKitHeaders/include/SecretAgentKit.h diff --git a/Sources/SecretAgentKitHeaders/module.modulemap b/Sources/SecretAgentKitHeaders/module.modulemap new file mode 100644 index 0000000..7fceeab --- /dev/null +++ b/Sources/SecretAgentKitHeaders/module.modulemap @@ -0,0 +1,4 @@ +module SecretAgentKitHeaders [system] { + header "include/SecretAgentKit.h" + export * +} diff --git a/Tests/SecretAgentKitTests/StubFileHandleWriter.swift b/Tests/SecretAgentKitTests/StubFileHandleWriter.swift index 5b63eff..cc23bdf 100644 --- a/Tests/SecretAgentKitTests/StubFileHandleWriter.swift +++ b/Tests/SecretAgentKitTests/StubFileHandleWriter.swift @@ -1,4 +1,5 @@ import SecretAgentKit +import Foundation class StubFileHandleWriter: FileHandleWriter { diff --git a/Tests/SecretAgentKitTests/StubStore.swift b/Tests/SecretAgentKitTests/StubStore.swift index 42db26a..a66ebe9 100644 --- a/Tests/SecretAgentKitTests/StubStore.swift +++ b/Tests/SecretAgentKitTests/StubStore.swift @@ -1,4 +1,5 @@ import SecretKit +import Foundation import CryptoKit struct Stub {}