Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade SQLCipher to 3.4.2, enable FTS5 on GRDBCipher and new pod GRDBPlus #393

Merged
merged 26 commits into from
Aug 6, 2018

Conversation

groue
Copy link
Owner

@groue groue commented Jul 30, 2018

This PR addresses #373 and #392.

Thank you very much, @Marus: cherry-picking your commits was flawless 👍

  • Upgrade SQLCipher to 3.4.2
  • Activate FTS5 support in the GRDBCipher CocoaPod
  • Activate FTS5 support in the new GRDBPlus CocoaPod (requires iOS 11.4+ / macOS 10.13+ / watchOS 4.3+)

@Marus
Copy link
Collaborator

Marus commented Jul 31, 2018

Thanks; will be great to have this exposed.

groue and others added 13 commits August 3, 2018 08:24
- Enable
- Add -DSQLITE_ENABLE_FTS5 to the CFLAGS for SQLCipher (SQLCipher/src/sqlcipher.xcconfig) (via submodule update)
- Add -D SQLITE_ENABLE_FTS5 to swift flags for GRDBCipher (SQLCipher/GRDBCipher.xcconfig)
- Add -D SQLITE_ENABLE_FTS5 to the GRDBCipher Testing Projects
- Updated message in EncryptionTests - SQLCipher changed the message “file is encrypted or is not a database” back to just “file is not a database” in 3.4.2 - seems like an odd choice on their part but is behaving as expected.
@groue groue force-pushed the SQLCipher-3.4.2 branch from 9586672 to 2c35ca5 Compare August 3, 2018 06:25
@groue groue changed the title Upgrade SQLCipher to 3.4.2 and enable FTS5 on GRDBCipher Upgrade SQLCipher to 3.4.2, enable FTS5 on GRDBCipher and new pod GRDBPlus Aug 5, 2018
@groue groue merged commit 566dae0 into development Aug 6, 2018
@groue groue deleted the SQLCipher-3.4.2 branch August 6, 2018 11:33
@groue
Copy link
Owner Author

groue commented Sep 6, 2018

Shipped in v3.3.0-beta1 :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants