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

[PLATFORM-514]: [Esrs] Update sqlx & uuid #91

Merged
merged 5 commits into from
Jun 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Changelog

All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

### Changed

- Bump min version of supported Rust to 1.58 since <1.58 fails to resolve sqlx-core dep

[Unreleased]: https://github.com/primait/event_sourcing.rs/compare/0.6.1...HEAD
34 changes: 17 additions & 17 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
[package]
name = "esrs"
version = "0.6.1"
authors = ["Simone Cottini <[email protected]>"]
categories = ["rust-patterns", "web-programming", "asynchronous", "data-structures"]
description = "A Prima.it-opinionated library to achieve cqrs/es"
edition = "2018"
keywords = ["architecture", "ddd", "event-sourcing", "cqrs", "es"]
license = "MIT OR Apache-2.0"
name = "esrs"
readme = "README.md"
edition = "2018"
description = "A Prima.it-opinionated library to achieve cqrs/es"
repository = "https://github.com/primait/event_sourcing.rs"
categories = ["rust-patterns", "web-programming", "asynchronous", "data-structures"]
keywords = ["architecture", "ddd", "event-sourcing", "cqrs", "es"]
authors = ["Simone Cottini <[email protected]>"]
rust-version = "1.58.0"
version = "0.6.1"

[workspace]
members = ["examples/postgres_payments", "examples/sqlite_payments"]
Expand All @@ -27,22 +28,21 @@ sqlite = ["sqlx/sqlite"]

[dependencies]
# Serialization/Deserialization
serde = { version = "^1.0", features = ["derive"] }
serde_json = "^1.0"
serde = {version = "1.0", features = ["derive"]}
serde_json = "1.0"
# Uuid generation
uuid = { version = "^0.8.1", features = ["serde", "v4"] }
uuid = {version = "1.1", features = ["serde", "v4"]}
# Time esrs-core
chrono = { version = "^0.4", features = ["serde"] }
chrono = {version = "0.4", features = ["serde"]}
# Build async trait
async-trait = "0.1.50"

# Sql library for async impl
sqlx = { version = "0.5", features = ["runtime-tokio-native-tls", "uuid", "json", "chrono"] }
sqlx = {version = "0.6", features = ["runtime-tokio-native-tls", "uuid", "json", "chrono"]}
# To stream over sqlx results
futures = { version = "0.3" }
futures = "0.3"

[dev-dependencies]
postgres-payments = { path = "examples/postgres_payments" }
sqlite-payments = { path = "examples/sqlite_payments" }
tokio = { version = "1.6", features = ["full"] }

postgres-payments = {path = "examples/postgres_payments"}
sqlite-payments = {path = "examples/sqlite_payments"}
tokio = {version = "1.6", features = ["full"]}
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM public.ecr.aws/prima/rust:1.56.0-1
FROM public.ecr.aws/prima/rust:1.58.0-1

# Serve per avere l'owner dei file scritti dal container uguale all'utente Linux sull'host
USER app
Expand Down
24 changes: 12 additions & 12 deletions examples/postgres_payments/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
[package]
name = "postgres-payments"
version = "0.1.0"
license = "MIT OR Apache-2.0"
description = "Example of an esrs implementation for postgres"
authors = ["Simone Cottini <[email protected]>"]
description = "Example of an esrs implementation for postgres"
edition = "2018"
license = "MIT OR Apache-2.0"
name = "postgres-payments"
version = "0.1.0"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]

# async main
tokio = { version = "1.6", features = ["full"] }
tokio = {version = "1.6", features = ["full"]}

esrs = { version = "*", path = "../../", features = ["postgres"] }
esrs = {version = "*", path = "../../", features = ["postgres"]}
# Sql library for async impl
sqlx = { version = "0.5", features = ["runtime-tokio-native-tls", "uuid", "json", "chrono"] }
sqlx = {version = "0.6", features = ["runtime-tokio-native-tls", "uuid", "json", "chrono"]}

async-trait = "0.1.50"
chrono = { version = "^0.4", features = ["serde"] }
serde = { version = "^1.0", features = ["derive"] }
serde_json = "^1.0"
uuid = { version = "^0.8.1", features = ["serde", "v4"] }
thiserror = "^1.0"
chrono = {version = "0.4", features = ["serde"]}
serde = {version = "1.0", features = ["derive"]}
serde_json = "1.0"
thiserror = "1.0"
uuid = {version = "1.0", features = ["serde", "v4"]}
24 changes: 12 additions & 12 deletions examples/sqlite_payments/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
[package]
name = "sqlite-payments"
version = "0.1.0"
license = "MIT OR Apache-2.0"
description = "Example of an esrs implementation for sqlite"
authors = ["Simone Cottini <[email protected]>"]
description = "Example of an esrs implementation for sqlite"
edition = "2018"
license = "MIT OR Apache-2.0"
name = "sqlite-payments"
version = "0.1.0"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]

# async main
tokio = { version = "1.6", features = ["full"] }
tokio = {version = "1.6", features = ["full"]}

esrs = { version = "*", path = "../../", features = ["sqlite"] }
esrs = {version = "*", path = "../../", features = ["sqlite"]}
# Sql library for async impl
sqlx = { version = "0.5", features = ["runtime-tokio-native-tls", "uuid", "json", "chrono"] }
sqlx = {version = "0.6", features = ["runtime-tokio-native-tls", "uuid", "json", "chrono"]}

async-trait = "0.1.50"
chrono = { version = "^0.4", features = ["serde"] }
serde = { version = "^1.0", features = ["derive"] }
serde_json = "^1.0"
uuid = { version = "^0.8.1", features = ["serde", "v4"] }
thiserror = "^1.0"
chrono = {version = "0.4", features = ["serde"]}
serde = {version = "1.0", features = ["derive"]}
serde_json = "1.0"
thiserror = "1.0"
uuid = {version = "1.0", features = ["serde", "v4"]}