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

fix(common): db_common windows sqlite3 collision #5481

Merged
merged 9 commits into from
Oct 29, 2024

Conversation

Equartey
Copy link
Member

@Equartey Equartey commented Sep 20, 2024

Issue #, if available:
#5477
Description of changes:
This updates the CMakeLists.txt for the amplify_db_common package to avoid conflicts when an app also depends on sqlite3. It introduces a conditional check to add the sqlite3 library only if it has not already been defined by another package, preventing redefinition errors. Additionally, it creates an alias named sqlite3_amplify_db_common that allows the plugin to reference sqlite3 without clashing with other packages. This ensures compatibility when consumers of amplify_db_common also include dependencies on sqlite3, allowing seamless integration and avoiding build-time collisions.

Also updates sqlite3 version.

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

@Equartey Equartey marked this pull request as ready for review October 23, 2024 18:11
@Equartey Equartey requested a review from a team as a code owner October 23, 2024 18:11
ekjotmultani
ekjotmultani previously approved these changes Oct 23, 2024
@Equartey Equartey merged commit df38424 into main Oct 29, 2024
121 checks passed
@Equartey Equartey deleted the fix/db-common-cmake-collision branch October 29, 2024 13:39
tyllark pushed a commit to tyllark/amplify-flutter that referenced this pull request Oct 31, 2024
tyllark added a commit to tyllark/amplify-flutter that referenced this pull request Oct 31, 2024
### Features
- feat(auth, authenticator): Add support for Email OTP MFA ([aws-amplify#5449](aws-amplify#5449)) (aws-amplify#5472)

### Fixes
- fix(common): db_common windows sqlite3 collision ([aws-amplify#5481](aws-amplify#5481))

Updated-Components: amplify_lints, Amplify Flutter, Amplify Dart, Amplify UI, DB Common, Secure Storage, AWS Common, Smithy, Worker Bee
tyllark added a commit that referenced this pull request Oct 31, 2024
### Features
- feat(auth, authenticator): Add support for Email OTP MFA ([#5449](#5449)) (#5472)

### Fixes
- fix(common): db_common windows sqlite3 collision ([#5481](#5481))

Updated-Components: amplify_lints, Amplify Flutter, Amplify Dart, Amplify UI, DB Common, Secure Storage, AWS Common, Smithy, Worker Bee
tyllark added a commit that referenced this pull request Nov 1, 2024
### Features
- feat(auth, authenticator): Add support for Email OTP MFA ([#5449](#5449)) (#5472)

### Fixes
- fix(common): db_common windows sqlite3 collision ([#5481](#5481))

Updated-Components: amplify_lints, Amplify Flutter, Amplify Dart, Amplify UI, DB Common, Secure Storage, AWS Common, Smithy, Worker Bee
tyllark added a commit to tyllark/amplify-flutter that referenced this pull request Nov 1, 2024
### Features
- feat(auth, authenticator): Add support for Email OTP MFA ([aws-amplify#5449](aws-amplify#5449)) (aws-amplify#5472)

### Fixes
- fix(common): db_common windows sqlite3 collision ([aws-amplify#5481](aws-amplify#5481))

Updated-Components: amplify_lints, Amplify Flutter, Amplify Dart, Amplify UI, DB Common, Secure Storage, AWS Common, Smithy, Worker Bee
tyllark added a commit that referenced this pull request Nov 5, 2024
### Features
- feat(auth, authenticator): Add support for Email OTP MFA ([#5449](#5449)) (#5472)

### Fixes
- fix(common): db_common windows sqlite3 collision ([#5481](#5481))

Updated-Components: amplify_lints, Amplify Flutter, Amplify Dart, Amplify UI, DB Common, Secure Storage, AWS Common, Smithy, Worker Bee
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.

3 participants