Replacement for #401: Update podspec for SQLCipher+fts3#503
Replacement for #401: Update podspec for SQLCipher+fts3#503evands wants to merge 4 commits intoccgus:masterfrom
Conversation
|
@stephanheilner - can you quickly review this (since you seem to use cocoa pods) and let me know if it looks OK? |
FMDB.podspec
Outdated
| ss.xcconfig = { 'OTHER_CFLAGS' => '$(inherited) -DSQLITE_HAS_CODEC -DHAVE_USLEEP=1' } | ||
| end | ||
|
|
||
| ss.dependency 'FMDB/common' |
There was a problem hiding this comment.
Though it wouldn't affect how this functions, the indentation on this is wrong:
ss.dependency 'SQLCipher'
ss.dependency 'FMDB/common'
ss.xcconfig = ...
|
I added some suggestions and made some comments inline. |
…ns: standard, standard/FTS, standalone, standalone/FTS, SQLCipher, and SQLCipher/FTS. Thanks to @stephanheilner for the helpful review.
|
@stephanheilner: Please see [300d0fe] and let me know if you have any further suggestions. I think we've got a much cleaner podspec now as a result of these efforts. |
|
Finally, we'll need to bump the podfile version number and have a corresponding git tag, once this is approved. |
|
So everyone is happy with this now? All I need to do is commit it? |
|
We'll need to update the version from 2.6.2 to whatever the next tag version will be, but we can do that right before @ccgus creates a new tag. Just give me a heads up, so I can make sure you bump the version in this file as well first. |
|
I'm having difficulty with custom tokenizers working in SQLCipher+FTS. Please don't commit yet -- investigating. |
|
OK, I figured out the problem but don't have an immediate solution. @stephanheilner would love your input.
|
|
Just wondering if this branch is still being worked on. |
|
I concluded it probably needs to be fixed at the level of SQLCipher if it is to be properly done and couldn't find anywhere to do that. I've just added this to my Podfile: |
|
|
It turned out to be significantly easier and clearer to just create a new branch and pull request for this fix. The first commit just simplifies the podspec to use dependencies to deduplicate code; the second adds FMDB/SQLCipher/FTS3