Skip to content

Android and Windows platform import/conditional accommodation#1850

Merged
groue merged 1 commit intogroue:developmentfrom
swift-everywhere:platform-fixes
Feb 4, 2026
Merged

Android and Windows platform import/conditional accommodation#1850
groue merged 1 commit intogroue:developmentfrom
swift-everywhere:platform-fixes

Conversation

@marcprux
Copy link
Copy Markdown
Contributor

@marcprux marcprux commented Feb 3, 2026

This PR contains a few miscellaneous fixes for non-Darwin platforms:

  1. Remove the #if !os(Windows) conditional for some of the type extensions. I'm not sure when/why they were added, but they seem to work fine in my other branch that builds/tests this against Windows: https://github.com/swift-everywhere/grdb-sqlcipher/actions/runs/21649487847
  2. Add a conditional import Android that is needed for standard C functions like strcmp
  3. Add a type annotation to AssociationTableAliasTestsSQLTests that was causing some "statement to complex" evaluation errors when building on other platforms.
  4. Handle both "commoncrypto" and "libtomcrypt" cipher names in EncryptionTests.testCipherProvider

Pull Request Checklist

  • CONTRIBUTING: You have read https://github.com/groue/GRDB.swift/blob/master/CONTRIBUTING.md
  • BRANCH: This pull request is submitted against the development branch.
  • DOCUMENTATION: Inline documentation has been updated.
  • DOCUMENTATION: README.md or another dedicated guide has been updated.
  • TESTS: Changes are tested.
  • TESTS: The make smokeTest terminal command runs without failure.

@groue
Copy link
Copy Markdown
Owner

groue commented Feb 4, 2026

Hello @marcprux,

Thank you very much 👍

For the record, #if !os(Windows) was added in c865a84 by @compnerd. Platform support has probably improved since then. Thank you for restoring those features, just as @thinkpractice did it for Linux.

@groue groue merged commit 7f9d150 into groue:development Feb 4, 2026
8 checks passed
@groue
Copy link
Copy Markdown
Owner

groue commented Feb 15, 2026

⛵ Thanks @marcprux, this PR and #1849 have just shipped in v7.10.0 :-)

https://hachyderm.io/@groue/116075269263911686

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants