From 83146df5a3cc82a6ae09a4c961e90c626be8e53b Mon Sep 17 00:00:00 2001 From: hi2gage Date: Fri, 18 Oct 2024 00:52:18 -0600 Subject: [PATCH 1/6] Fix xcschemes --- .swiftpm/xcode/xcshareddata/xcschemes/LibFido2Swift.xcscheme | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/LibFido2Swift.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/LibFido2Swift.xcscheme index 98a8c27..17f8d36 100644 --- a/.swiftpm/xcode/xcshareddata/xcschemes/LibFido2Swift.xcscheme +++ b/.swiftpm/xcode/xcshareddata/xcschemes/LibFido2Swift.xcscheme @@ -1,11 +1,10 @@ + version = "1.7"> + buildImplicitDependencies = "YES"> Date: Fri, 18 Oct 2024 00:52:25 -0600 Subject: [PATCH 2/6] downgrade platforms --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index ae1de59..ef51b43 100644 --- a/Package.swift +++ b/Package.swift @@ -5,7 +5,7 @@ import PackageDescription let package = Package( name: "LibFido2Swift", - platforms: [.macOS(.v13)], + platforms: [.macOS(.v10_15)], products: [ // Products define the executables and libraries a package produces, making them visible to other packages. .library( From 543843dce8bdde411b4e6d2698f1e39a542041e8 Mon Sep 17 00:00:00 2001 From: hi2gage Date: Fri, 18 Oct 2024 00:38:43 -0600 Subject: [PATCH 3/6] link libraries to package --- Package.swift | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index ef51b43..87cf760 100644 --- a/Package.swift +++ b/Package.swift @@ -18,7 +18,12 @@ let package = Package( .target( name: "LibFido2Swift", dependencies: ["LibCrypto", "libfido2", "LibCbor"], - path: "LibFido2Swift" + path: "LibFido2Swift", + linkerSettings: [ + .linkedLibrary("LibCbor"), + .linkedLibrary("LibCrypto"), + .linkedLibrary("libfido2"), + ] ), .binaryTarget(name: "LibCbor", path: "./Frameworks/LibCbor.xcframework"), .binaryTarget(name: "LibCrypto", path: "./Frameworks/LibCrypto.xcframework"), From ac05b0cde1fb28da1511e40c60b94ac8879f98c6 Mon Sep 17 00:00:00 2001 From: hi2gage Date: Fri, 18 Oct 2024 01:40:32 -0600 Subject: [PATCH 4/6] changes to lib --- Package.swift | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Package.swift b/Package.swift index 87cf760..5e563ff 100644 --- a/Package.swift +++ b/Package.swift @@ -17,16 +17,16 @@ let package = Package( // Targets can depend on other targets in this package and products from dependencies. .target( name: "LibFido2Swift", - dependencies: ["LibCrypto", "libfido2", "LibCbor"], + dependencies: ["libCrypto", "libfido2", "libCbor"], path: "LibFido2Swift", linkerSettings: [ - .linkedLibrary("LibCbor"), - .linkedLibrary("LibCrypto"), + .linkedLibrary("libCbor"), + .linkedLibrary("libCrypto"), .linkedLibrary("libfido2"), ] ), - .binaryTarget(name: "LibCbor", path: "./Frameworks/LibCbor.xcframework"), - .binaryTarget(name: "LibCrypto", path: "./Frameworks/LibCrypto.xcframework"), + .binaryTarget(name: "libCbor", path: "./Frameworks/libCbor.xcframework"), + .binaryTarget(name: "libCrypto", path: "./Frameworks/libCrypto.xcframework"), .binaryTarget(name: "libfido2", path: "./Frameworks/libfido2.xcframework"), ] ) From 91327dbbcfe4d031de94f4c8eeaef686ce7cf54a Mon Sep 17 00:00:00 2001 From: hi2gage Date: Fri, 18 Oct 2024 01:55:13 -0600 Subject: [PATCH 5/6] linkedFramework --- Package.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Package.swift b/Package.swift index 5e563ff..afec223 100644 --- a/Package.swift +++ b/Package.swift @@ -20,9 +20,9 @@ let package = Package( dependencies: ["libCrypto", "libfido2", "libCbor"], path: "LibFido2Swift", linkerSettings: [ - .linkedLibrary("libCbor"), - .linkedLibrary("libCrypto"), - .linkedLibrary("libfido2"), + .linkedFramework("libCbor"), + .linkedFramework("libCrypto"), + .linkedFramework("libfido2"), ] ), .binaryTarget(name: "libCbor", path: "./Frameworks/libCbor.xcframework"), From f99bcc28ed641ac06c58c32c029fba1175193e80 Mon Sep 17 00:00:00 2001 From: hi2gage Date: Fri, 18 Oct 2024 10:38:11 -0600 Subject: [PATCH 6/6] revert naming --- Package.swift | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Package.swift b/Package.swift index afec223..88903b7 100644 --- a/Package.swift +++ b/Package.swift @@ -17,16 +17,16 @@ let package = Package( // Targets can depend on other targets in this package and products from dependencies. .target( name: "LibFido2Swift", - dependencies: ["libCrypto", "libfido2", "libCbor"], + dependencies: ["LibCrypto", "libfido2", "LibCbor"], path: "LibFido2Swift", linkerSettings: [ - .linkedFramework("libCbor"), - .linkedFramework("libCrypto"), + .linkedFramework("LibCbor"), + .linkedFramework("LibCrypto"), .linkedFramework("libfido2"), ] ), - .binaryTarget(name: "libCbor", path: "./Frameworks/libCbor.xcframework"), - .binaryTarget(name: "libCrypto", path: "./Frameworks/libCrypto.xcframework"), + .binaryTarget(name: "LibCbor", path: "./Frameworks/libCbor.xcframework"), + .binaryTarget(name: "LibCrypto", path: "./Frameworks/libCrypto.xcframework"), .binaryTarget(name: "libfido2", path: "./Frameworks/libfido2.xcframework"), ] )