-
Notifications
You must be signed in to change notification settings - Fork 247
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
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ekjotmultani
previously approved these changes
Oct 23, 2024
ekjotmultani
approved these changes
Oct 24, 2024
tyllark
approved these changes
Oct 28, 2024
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
pushed a commit
that referenced
this pull request
Nov 1, 2024
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.