Skip to content

Commit f63aca4

Browse files
committed
Fix podspec, update docs
1 parent 136c8a8 commit f63aca4

File tree

4 files changed

+11
-26
lines changed

4 files changed

+11
-26
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
* Fix incorrect spelling of `remove_diacritics` ([#1128][])
1111
* Fix project build order ([#1131][])
1212
* Performance improvements ([#1109][], [#1115][], [#1132][])
13+
* Removed FTS3/4 tokenizer integration (`registerTokenizer`, [#1104][], [#1144[]])
1314

1415
0.13.3 (27-03-2022), [diff][diff-0.13.3]
1516
========================================
@@ -166,6 +167,7 @@
166167
[#1098]: https://github.com/stephencelis/SQLite.swift/issues/1098
167168
[#1100]: https://github.com/stephencelis/SQLite.swift/pull/1100
168169
[#1101]: https://github.com/stephencelis/SQLite.swift/issues/1101
170+
[#1104]: https://github.com/stephencelis/SQLite.swift/issues/1104
169171
[#1105]: https://github.com/stephencelis/SQLite.swift/pull/1105
170172
[#1109]: https://github.com/stephencelis/SQLite.swift/issues/1109
171173
[#1110]: https://github.com/stephencelis/SQLite.swift/pull/1110
@@ -182,3 +184,4 @@
182184
[#1139]: https://github.com/stephencelis/SQLite.swift/pull/1139
183185
[#1141]: https://github.com/stephencelis/SQLite.swift/pull/1141
184186
[#1142]: https://github.com/stephencelis/SQLite.swift/pull/1142
187+
[#1144]: https://github.com/stephencelis/SQLite.swift/pull/1144

Documentation/Index.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1983,8 +1983,6 @@ try db.run(emails.create(.FTS5(config)))
19831983
// the last FTS4 query above as:
19841984
let replies = emails.filter(emails.match("subject:\"Re:\"*"))
19851985
// SELECT * FROM "emails" WHERE "emails" MATCH 'subject:"Re:"*'
1986-
1987-
// https://www.sqlite.org/fts5.html#_changes_to_select_statements_
19881986
```
19891987

19901988
## Executing Arbitrary SQL

Package.swift

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -39,23 +39,10 @@ let package = Package(
3939
)
4040

4141
#if os(Linux)
42-
package.dependencies = [.package(url: "https://github.com/stephencelis/CSQLite.git", from: "0.0.3")]
43-
package.targets = [
44-
.target(
45-
name: "SQLite",
46-
dependencies: [.product(name: "CSQLite", package: "CSQLite")],
47-
exclude: ["Extensions/FTS4.swift", "Extensions/FTS5.swift"]
48-
),
49-
.testTarget(
50-
name: "SQLiteTests",
51-
dependencies: ["SQLite"],
52-
path: "Tests/SQLiteTests",
53-
exclude: [
54-
"FTSIntegrationTests.swift",
55-
"FTS4Tests.swift",
56-
"FTS5Tests.swift"
57-
],
58-
resources: [ .copy("Resources") ]
59-
)
42+
package.dependencies = [
43+
.package(url: "https://github.com/stephencelis/CSQLite.git", from: "0.0.3")
44+
]
45+
package.targets.first?.dependencies += [
46+
.product(name: "CSQLite", package: "CSQLite")
6047
]
6148
#endif

SQLite.swift.podspec

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@ Pod::Spec.new do |s|
2929
s.watchos.deployment_target = watchos_deployment_target
3030

3131
s.subspec 'standard' do |ss|
32-
ss.source_files = 'Sources/{SQLite,SQLiteObjc}/**/*.{c,h,m,swift}'
32+
ss.source_files = 'Sources/SQLite/**/*.{c,h,m,swift}'
3333
ss.exclude_files = 'Sources/**/Cipher.swift'
34-
ss.private_header_files = 'Sources/SQLiteObjc/fts3_tokenizer.h'
3534
ss.library = 'sqlite3'
3635

3736
ss.test_spec 'tests' do |test_spec|
@@ -44,9 +43,8 @@ Pod::Spec.new do |s|
4443
end
4544

4645
s.subspec 'standalone' do |ss|
47-
ss.source_files = 'Sources/{SQLite,SQLiteObjc}/**/*.{c,h,m,swift}'
46+
ss.source_files = 'Sources/SQLite/**/*.{c,h,m,swift}'
4847
ss.exclude_files = 'Sources/**/Cipher.swift'
49-
ss.private_header_files = 'Sources/SQLiteObjc/fts3_tokenizer.h'
5048

5149
ss.xcconfig = {
5250
'OTHER_SWIFT_FLAGS' => '$(inherited) -DSQLITE_SWIFT_STANDALONE',
@@ -64,8 +62,7 @@ Pod::Spec.new do |s|
6462
end
6563

6664
s.subspec 'SQLCipher' do |ss|
67-
ss.source_files = 'Sources/{SQLite,SQLiteObjc}/**/*.{c,h,m,swift}'
68-
ss.private_header_files = 'Sources/SQLiteObjc/fts3_tokenizer.h'
65+
ss.source_files = 'Sources/SQLite/**/*.{c,h,m,swift}'
6966
ss.xcconfig = {
7067
'OTHER_SWIFT_FLAGS' => '$(inherited) -DSQLITE_SWIFT_SQLCIPHER',
7168
'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) SQLITE_HAS_CODEC=1 SQLITE_SWIFT_SQLCIPHER=1'

0 commit comments

Comments
 (0)