Skip to content

Commit ba095b4

Browse files
committed
Fix compile error of SPM in Xcode 16
1 parent 2cff478 commit ba095b4

File tree

2 files changed

+169
-6
lines changed

2 files changed

+169
-6
lines changed

Package.swift

Lines changed: 168 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ let package = Package(
1515
.library(name: "WCDBSwiftDynamic", type: .dynamic, targets: ["WCDBSwift"]),
1616
],
1717
dependencies: [
18-
.package(url: "https://github.com/Tencent/sqlcipher", .exactItem("1.4.5"))
18+
.package(url: "https://github.com/Tencent/sqlcipher", .exactItem("1.4.6"))
1919
],
2020
targets: [
2121
.target(
@@ -24,7 +24,68 @@ let package = Package(
2424
sources: ["WCTFileManager.mm", "WCTFoundation.mm", "WCTFTSTokenizerUtil.mm", "WCTOperationQueue.mm"],
2525
publicHeadersPath:"",
2626
cSettings: [
27-
.headerSearchPath("../../**"),
27+
// .headerSearchPath("../../**"),
28+
.headerSearchPath("../../bridge"),
29+
.headerSearchPath("../../objc"),
30+
.headerSearchPath("../../bridge/objcbridge"),
31+
.headerSearchPath("../../bridge/cppbridge"),
32+
.headerSearchPath("../../bridge/winqbridge"),
33+
.headerSearchPath("../../bridge/base"),
34+
.headerSearchPath("../../bridge/winqbridge/statement"),
35+
.headerSearchPath("../../bridge/winqbridge/identifier"),
36+
.headerSearchPath("../../common/core"),
37+
.headerSearchPath("../../common/platform"),
38+
.headerSearchPath("../../common/winq"),
39+
.headerSearchPath("../../common/repair"),
40+
.headerSearchPath("../../common/base"),
41+
.headerSearchPath("../../common/utility"),
42+
.headerSearchPath("../../common/core/config"),
43+
.headerSearchPath("../../common/core/assemble"),
44+
.headerSearchPath("../../common/core/vacuum"),
45+
.headerSearchPath("../../common/core/cipher"),
46+
.headerSearchPath("../../common/core/sqlite"),
47+
.headerSearchPath("../../common/core/function"),
48+
.headerSearchPath("../../common/core/fts"),
49+
.headerSearchPath("../../common/core/operate"),
50+
.headerSearchPath("../../common/core/compression"),
51+
.headerSearchPath("../../common/core/integrity"),
52+
.headerSearchPath("../../common/core/migration"),
53+
.headerSearchPath("../../common/core/function/scalar"),
54+
.headerSearchPath("../../common/core/fts/auxfunction"),
55+
.headerSearchPath("../../common/core/fts/tokenizer"),
56+
.headerSearchPath("../../common/winq/extension"),
57+
.headerSearchPath("../../common/winq/statement"),
58+
.headerSearchPath("../../common/winq/identifier"),
59+
.headerSearchPath("../../common/winq/syntax"),
60+
.headerSearchPath("../../common/winq/syntax/stmt"),
61+
.headerSearchPath("../../common/winq/syntax/const"),
62+
.headerSearchPath("../../common/winq/syntax/identifier"),
63+
.headerSearchPath("../../common/repair/mechanic"),
64+
.headerSearchPath("../../common/repair/parse"),
65+
.headerSearchPath("../../common/repair/basic"),
66+
.headerSearchPath("../../common/repair/sqlite"),
67+
.headerSearchPath("../../common/repair/crawl"),
68+
.headerSearchPath("../../common/repair/factory"),
69+
.headerSearchPath("../../common/repair/utility"),
70+
.headerSearchPath("../../objc/transaction"),
71+
.headerSearchPath("../../objc/database"),
72+
.headerSearchPath("../../objc/monitor"),
73+
.headerSearchPath("../../objc/core"),
74+
.headerSearchPath("../../objc/handle"),
75+
.headerSearchPath("../../objc/bridge"),
76+
.headerSearchPath("../../objc/statement"),
77+
.headerSearchPath("../../objc/fts"),
78+
.headerSearchPath("../../objc/chaincall"),
79+
.headerSearchPath("../../objc/table"),
80+
.headerSearchPath("../../objc/compression"),
81+
.headerSearchPath("../../objc/orm"),
82+
.headerSearchPath("../../objc/convenient"),
83+
.headerSearchPath("../../objc/migration"),
84+
.headerSearchPath("../../objc/builtin"),
85+
.headerSearchPath("../../objc/orm/accessor"),
86+
.headerSearchPath("../../objc/orm/binding"),
87+
.headerSearchPath("../../objc/orm/macro"),
88+
.headerSearchPath("../../objc/orm/coding")
2889
],
2990
linkerSettings: [
3091
.linkedFramework("UIKit", .when(platforms: [.iOS])),
@@ -52,7 +113,41 @@ let package = Package(
52113
.define("SQLITE_DEFAULT_WAL_SYNCHRONOUS", to: "1"),
53114
.define("SQLITE_DEFAULT_LOCKING_MODE", to: "0"),
54115
.define("SQLITE_DEFAULT_WAL_AUTOCHECKPOINT", to: "0"),
55-
.headerSearchPath("**")
116+
// .headerSearchPath("**")
117+
.headerSearchPath("core"),
118+
.headerSearchPath("platform"),
119+
.headerSearchPath("winq"),
120+
.headerSearchPath("repair"),
121+
.headerSearchPath("base"),
122+
.headerSearchPath("utility"),
123+
.headerSearchPath("core/config"),
124+
.headerSearchPath("core/assemble"),
125+
.headerSearchPath("core/vacuum"),
126+
.headerSearchPath("core/cipher"),
127+
.headerSearchPath("core/sqlite"),
128+
.headerSearchPath("core/function"),
129+
.headerSearchPath("core/fts"),
130+
.headerSearchPath("core/operate"),
131+
.headerSearchPath("core/compression"),
132+
.headerSearchPath("core/integrity"),
133+
.headerSearchPath("core/migration"),
134+
.headerSearchPath("core/function/scalar"),
135+
.headerSearchPath("core/fts/auxfunction"),
136+
.headerSearchPath("core/fts/tokenizer"),
137+
.headerSearchPath("winq/extension"),
138+
.headerSearchPath("winq/statement"),
139+
.headerSearchPath("winq/identifier"),
140+
.headerSearchPath("winq/syntax"),
141+
.headerSearchPath("winq/syntax/stmt"),
142+
.headerSearchPath("winq/syntax/const"),
143+
.headerSearchPath("winq/syntax/identifier"),
144+
.headerSearchPath("repair/mechanic"),
145+
.headerSearchPath("repair/parse"),
146+
.headerSearchPath("repair/basic"),
147+
.headerSearchPath("repair/sqlite"),
148+
.headerSearchPath("repair/crawl"),
149+
.headerSearchPath("repair/factory"),
150+
.headerSearchPath("repair/utility")
56151
],
57152
linkerSettings: [
58153
.linkedLibrary("z"),
@@ -66,7 +161,68 @@ let package = Package(
66161
"tests",
67162
],
68163
cSettings: [
69-
.headerSearchPath("../**")
164+
// .headerSearchPath("../**")
165+
.headerSearchPath("../bridge"),
166+
.headerSearchPath("../objc"),
167+
.headerSearchPath("../bridge/objcbridge"),
168+
.headerSearchPath("../bridge/cppbridge"),
169+
.headerSearchPath("../bridge/winqbridge"),
170+
.headerSearchPath("../bridge/base"),
171+
.headerSearchPath("../bridge/winqbridge/statement"),
172+
.headerSearchPath("../bridge/winqbridge/identifier"),
173+
.headerSearchPath("../common/core"),
174+
.headerSearchPath("../common/platform"),
175+
.headerSearchPath("../common/winq"),
176+
.headerSearchPath("../common/repair"),
177+
.headerSearchPath("../common/base"),
178+
.headerSearchPath("../common/utility"),
179+
.headerSearchPath("../common/core/config"),
180+
.headerSearchPath("../common/core/assemble"),
181+
.headerSearchPath("../common/core/vacuum"),
182+
.headerSearchPath("../common/core/cipher"),
183+
.headerSearchPath("../common/core/sqlite"),
184+
.headerSearchPath("../common/core/function"),
185+
.headerSearchPath("../common/core/fts"),
186+
.headerSearchPath("../common/core/operate"),
187+
.headerSearchPath("../common/core/compression"),
188+
.headerSearchPath("../common/core/integrity"),
189+
.headerSearchPath("../common/core/migration"),
190+
.headerSearchPath("../common/core/function/scalar"),
191+
.headerSearchPath("../common/core/fts/auxfunction"),
192+
.headerSearchPath("../common/core/fts/tokenizer"),
193+
.headerSearchPath("../common/winq/extension"),
194+
.headerSearchPath("../common/winq/statement"),
195+
.headerSearchPath("../common/winq/identifier"),
196+
.headerSearchPath("../common/winq/syntax"),
197+
.headerSearchPath("../common/winq/syntax/stmt"),
198+
.headerSearchPath("../common/winq/syntax/const"),
199+
.headerSearchPath("../common/winq/syntax/identifier"),
200+
.headerSearchPath("../common/repair/mechanic"),
201+
.headerSearchPath("../common/repair/parse"),
202+
.headerSearchPath("../common/repair/basic"),
203+
.headerSearchPath("../common/repair/sqlite"),
204+
.headerSearchPath("../common/repair/crawl"),
205+
.headerSearchPath("../common/repair/factory"),
206+
.headerSearchPath("../common/repair/utility"),
207+
.headerSearchPath("../objc/transaction"),
208+
.headerSearchPath("../objc/database"),
209+
.headerSearchPath("../objc/monitor"),
210+
.headerSearchPath("../objc/core"),
211+
.headerSearchPath("../objc/handle"),
212+
.headerSearchPath("../objc/bridge"),
213+
.headerSearchPath("../objc/statement"),
214+
.headerSearchPath("../objc/fts"),
215+
.headerSearchPath("../objc/chaincall"),
216+
.headerSearchPath("../objc/table"),
217+
.headerSearchPath("../objc/compression"),
218+
.headerSearchPath("../objc/orm"),
219+
.headerSearchPath("../objc/convenient"),
220+
.headerSearchPath("../objc/migration"),
221+
.headerSearchPath("../objc/builtin"),
222+
.headerSearchPath("../objc/orm/accessor"),
223+
.headerSearchPath("../objc/orm/binding"),
224+
.headerSearchPath("../objc/orm/macro"),
225+
.headerSearchPath("../objc/orm/coding")
70226
]
71227
),
72228
.target(
@@ -78,7 +234,14 @@ let package = Package(
78234
],
79235
publicHeadersPath: ".",
80236
cSettings: [
81-
.headerSearchPath("../bridge/**")
237+
// .headerSearchPath("../bridge/**")
238+
.headerSearchPath("../bridge"),
239+
.headerSearchPath("../bridge/objcbridge"),
240+
.headerSearchPath("../bridge/cppbridge"),
241+
.headerSearchPath("../bridge/winqbridge"),
242+
.headerSearchPath("../bridge/base"),
243+
.headerSearchPath("../bridge/winqbridge/statement"),
244+
.headerSearchPath("../bridge/winqbridge/identifier")
82245
]
83246
)
84247
],

sqlcipher

0 commit comments

Comments
 (0)