Skip to content

Commit 7e0e7ed

Browse files
authored
Become a proper Swift package (#2)
1 parent 03580f7 commit 7e0e7ed

4 files changed

Lines changed: 20 additions & 15 deletions

File tree

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Swift Package Manager
2+
Package.resolved
3+
14
# macOS
25
#
36
*.DS_Store

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
[submodule "Dependencies/OpenSSL"]
2-
path = Dependencies/OpenSSL
3-
url = https://github.com/rileytestut/OpenSSL
41
[submodule "Dependencies/ldid"]
52
path = Dependencies/ldid
63
url = https://github.com/rileytestut/ldid.git

Dependencies/OpenSSL

Lines changed: 0 additions & 1 deletion
This file was deleted.

Package.swift

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,31 @@ let package = Package(
1111
.macOS(.v10_14),
1212
],
1313
products: [
14-
.library(
14+
/*.library(
1515
name: "AltSign-Dynamic",
1616
type: .dynamic,
17-
targets: ["AltSign", "CAltSign", "CoreCrypto", "CCoreCrypto", "ldid", "ldid-core", "OpenSSL"]
18-
),
17+
targets: ["AltSign", "CAltSign", "CoreCrypto", "CCoreCrypto", "ldid", "ldid-core"]
18+
),*/
1919
.library(
20-
name: "AltSign-Static",
20+
name: "AltSign",
21+
//type: .static,
2122
targets: ["AltSign", "CAltSign", "CoreCrypto", "CCoreCrypto", "ldid", "ldid-core"]
2223
),
2324
],
24-
dependencies: [],
25+
26+
dependencies: [
27+
.package(url: "https://github.com/krzyzanowskim/OpenSSL.git", .upToNextMinor(from: "1.1.180"))
28+
],
29+
2530
targets: [
26-
.binaryTarget(
31+
/*.binaryTarget(
2732
name: "OpenSSL",
2833
path: "Dependencies/OpenSSL/Frameworks/OpenSSL.xcframework"
29-
),
34+
),*/
3035

3136
.target(
3237
name: "ldid-core",
38+
dependencies: ["OpenSSL"],
3339
path: "Dependencies/ldid",
3440
exclude: [
3541
"ldid.hpp",
@@ -77,7 +83,7 @@ let package = Package(
7783
.headerSearchPath("libplist/include"),
7884
.headerSearchPath("libplist/src"),
7985
.headerSearchPath("libplist/libcnary/include"),
80-
.headerSearchPath("../OpenSSL/ios/include"),
86+
// .headerSearchPath("../OpenSSL/ios/include"),
8187
]
8288
),
8389
.target(
@@ -96,7 +102,7 @@ let package = Package(
96102
.headerSearchPath("../../Dependencies/ldid/libplist/include"),
97103
.headerSearchPath("../../Dependencies/ldid/libplist/src"),
98104
.headerSearchPath("../../Dependencies/ldid/libplist/libcnary/include"),
99-
.headerSearchPath("../../Dependencies/OpenSSL/ios/include"),
105+
// .headerSearchPath("../../Dependencies/OpenSSL/ios/include"),
100106
]
101107
),
102108

@@ -137,7 +143,7 @@ let package = Package(
137143
"AltSign/include/module.modulemap",
138144
"Dependencies/corecrypto",
139145
"Dependencies/ldid",
140-
"Dependencies/OpenSSL",
146+
// "Dependencies/OpenSSL",
141147
"Dependencies/minizip/iowin32.c",
142148
"Dependencies/minizip/Makefile",
143149
"Dependencies/minizip/minizip.c",
@@ -150,7 +156,7 @@ let package = Package(
150156
.headerSearchPath("AltSign/ldid"),
151157
.headerSearchPath("Dependencies/minizip"),
152158
.headerSearchPath("AltSign/Capabilities"),
153-
.headerSearchPath("Dependencies/OpenSSL/ios/include"),
159+
// .headerSearchPath("Dependencies/OpenSSL/ios/include"),
154160
.headerSearchPath("Dependencies/ldid/libplist/include"),
155161
.headerSearchPath("Dependencies/ldid"),
156162
.define("unix=1"),

0 commit comments

Comments
 (0)