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

chore: v0.3.2 #208

Merged
merged 2 commits into from
Jun 10, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
docs: v0.3.2
  • Loading branch information
chesedo committed Jun 10, 2022
commit 27f41796bf2d2c763e1b70487cc0b6a80ebe954f
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ crate-type = ["cdylib"]

[dependencies]
rocket = "0.5.0-rc.1"
shuttle-service = { version = "0.3", features = ["web-rocket"] }
shuttle-service = { version = "0.3.2", features = ["web-rocket"] }
```


Expand Down
5 changes: 4 additions & 1 deletion cargo-shuttle/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,10 @@ impl Shuttle {
let current_shuttle_version = &cargo_doc["dependencies"]["shuttle-service"]["version"];
let service_semver = Version::parse(current_shuttle_version.as_str().unwrap())?;
let server_version = client::shuttle_version(self.ctx.api_url()).await?;
let server_semver = VersionReq::parse(&server_version)?;
let server_version = Version::parse(&server_version)?;

let version_required = format!("{}.{}", server_version.major, server_version.minor);
let server_semver = VersionReq::parse(&version_required)?;

if server_semver.matches(&service_semver) {
Ok(())
Expand Down
2 changes: 1 addition & 1 deletion examples/axum/hello-world/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ crate-type = ["cdylib"]

[dependencies]
axum = "0.5"
shuttle-service = { version = "0.3.1", features = ["web-axum"] }
shuttle-service = { version = "0.3.2", features = ["web-axum"] }
sync_wrapper = "0.1"
2 changes: 1 addition & 1 deletion examples/axum/websocket/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ hyper = { version = "0.14", features = ["client", "http2"] }
hyper-tls = "0.5"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
shuttle-service = { version = "0.3.1", features = ["web-axum"] }
shuttle-service = { version = "0.3.2", features = ["web-axum"] }
sync_wrapper = "0.1"
tokio = { version = "1", features = ["full"] }
2 changes: 1 addition & 1 deletion examples/rocket/authentication/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ jsonwebtoken = {version = "8", default-features = false }
lazy_static = "1.4"
rocket = {version = "0.5.0-rc.1", features = ["json"] }
serde = {version = "1.0", features = ["derive"] }
shuttle-service = { version = "0.3.1", features = ["web-rocket"] }
shuttle-service = { version = "0.3.2", features = ["web-rocket"] }
2 changes: 1 addition & 1 deletion examples/rocket/hello-world/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ crate-type = ["cdylib"]

[dependencies]
rocket = "0.5.0-rc.1"
shuttle-service = { version = "0.3.1", features = ["web-rocket"] }
shuttle-service = { version = "0.3.2", features = ["web-rocket"] }
2 changes: 1 addition & 1 deletion examples/rocket/postgres/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ crate-type = ["cdylib"]
rocket = { version = "0.5.0-rc.1", features = ["json"] }
serde = "1.0"
sqlx = { version = "0.5", features = ["runtime-tokio-native-tls", "postgres"] }
shuttle-service = { version = "0.3.1", features = ["sqlx-postgres", "secrets", "web-rocket"] }
shuttle-service = { version = "0.3.2", features = ["sqlx-postgres", "secrets", "web-rocket"] }
2 changes: 1 addition & 1 deletion examples/tide/hello-world/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ crate-type = ["cdylib"]

[dependencies]
tide = "0.16.0"
shuttle-service = { version = "0.3.1", features = ["web-tide"] }
shuttle-service = { version = "0.3.2", features = ["web-tide"] }
2 changes: 1 addition & 1 deletion examples/tower/hello-world/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ crate-type = ["cdylib"]
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
shuttle-service = { version = "0.3.1", features = ["web-tower"] }
shuttle-service = { version = "0.3.2", features = ["web-tower"] }
tower = { version = "0.4", features = ["full"] }
hyper = { version = "0.14", features = ["full"] }
2 changes: 1 addition & 1 deletion examples/url-shortener/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ crate-type = ["cdylib"]
rocket = { version = "0.5.0-rc.1", features = ["json"] }
serde = "1.0"
sqlx = { version = "0.5", features = ["runtime-tokio-native-tls", "postgres"] }
shuttle-service = { version = "0.3.1", features = ["sqlx-postgres", "web-rocket"] }
shuttle-service = { version = "0.3.2", features = ["sqlx-postgres", "web-rocket"] }
nanoid = "0.4"
url ="2.2"
4 changes: 2 additions & 2 deletions service/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
//! by adding the `web-rocket` feature on the `shuttle-service` dependency.
//!
//! ```toml
//! shuttle-service = { version = "0.3", features = ["web-rocket"] }
//! shuttle-service = { version = "0.3.2", features = ["web-rocket"] }
//! ```
//!
//! Now replace `src/lib.rs` with the following content.
Expand Down Expand Up @@ -111,7 +111,7 @@
//! Add the `sqlx-postgres` feature to the `shuttle-service` dependency inside `Cargo.toml`:
//!
//! ```toml
//! shuttle-service = { version = "0.3", features = ["web-rocket", "sqlx-postgres"] }
//! shuttle-service = { version = "0.3.2", features = ["web-rocket", "sqlx-postgres"] }
//! ```
//!
//! Now update the `#[shuttle_service::main]` function to take in a `PgPool`:
Expand Down