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

misc: v0.12.0-rc1 #708

Merged
merged 16 commits into from
Mar 14, 2023
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
24 changes: 12 additions & 12 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@ exclude = [
]

[workspace.package]
version = "0.11.0"
version = "0.12.0-rc1"
edition = "2021"
license = "Apache-2.0"
repository = "https://github.com/shuttle-hq/shuttle"

# https://doc.rust-lang.org/cargo/reference/workspaces.html#the-workspacedependencies-table
[workspace.dependencies]
shuttle-codegen = { path = "codegen", version = "0.11.0" }
shuttle-common = { path = "common", version = "0.11.2" }
shuttle-proto = { path = "proto", version = "0.11.0" }
shuttle-service = { path = "service", version = "0.11.0" }
shuttle-codegen = { path = "codegen", version = "0.12.0-rc1" }
shuttle-common = { path = "common", version = "0.12.0-rc1" }
shuttle-proto = { path = "proto", version = "0.12.0-rc1" }
shuttle-service = { path = "service", version = "0.12.0-rc1" }

anyhow = "1.0.66"
async-trait = "0.1.58"
Expand Down
2 changes: 1 addition & 1 deletion admin/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "shuttle-admin"
version = "0.11.0"
version = "0.12.0-rc1"
edition = "2021"

[dependencies]
Expand Down
4 changes: 2 additions & 2 deletions cargo-shuttle/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cargo-shuttle"
version = "0.11.2"
version = "0.12.0-rc1"
edition.workspace = true
license.workspace = true
repository.workspace = true
Expand Down Expand Up @@ -63,7 +63,7 @@ features = ["models"]
workspace = true

[dependencies.shuttle-secrets]
version = "0.11.0"
version = "0.12.0-rc1"
path = "../resources/secrets"

[dependencies.shuttle-service]
Expand Down
2 changes: 1 addition & 1 deletion cargo-shuttle/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ cargo shuttle init --rocket my-rocket-app
This should generate the following dependency in `Cargo.toml`:

```toml
shuttle-service = { version = "0.11.0", features = ["web-rocket"] }
shuttle-service = { version = "0.12.0-rc1", features = ["web-rocket"] }
```

The following boilerplate code should be generated into `src/lib.rs`:
Expand Down
2 changes: 1 addition & 1 deletion codegen/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "shuttle-codegen"
version = "0.11.0"
version = "0.12.0-rc1"
edition.workspace = true
license.workspace = true
repository.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion common/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "shuttle-common"
version = "0.11.2"
version = "0.12.0-rc1"
edition.workspace = true
license.workspace = true
repository.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion deployer/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "shuttle-deployer"
version = "0.11.1"
version = "0.12.0-rc1"
edition.workspace = true
license.workspace = true
description = "Service with instances created per project for handling the compilation, loading, and execution of Shuttle services"
Expand Down
2 changes: 1 addition & 1 deletion deployer/tests/deploy_layer/bind-panic/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ edition = "2021"
[workspace]

[dependencies]
shuttle-runtime = "0.1.0"
shuttle-runtime = "0.12.0-rc1"
tokio = "1.22"
2 changes: 1 addition & 1 deletion deployer/tests/deploy_layer/main-panic/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ edition = "2021"
[workspace]

[dependencies]
shuttle-runtime = "0.1.0"
shuttle-runtime = "0.12.0-rc1"
tokio = "1.22"
2 changes: 1 addition & 1 deletion deployer/tests/deploy_layer/self-stop/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ edition = "2021"
[workspace]

[dependencies]
shuttle-runtime = "0.1.0"
shuttle-runtime = "0.12.0-rc1"
tokio = "1.22"
2 changes: 1 addition & 1 deletion deployer/tests/deploy_layer/sleep-async/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ edition = "2021"
[workspace]

[dependencies]
shuttle-runtime = "0.1.0"
shuttle-runtime = "0.12.0-rc1"
tokio = { version = "1.0", features = ["time"]}
2 changes: 1 addition & 1 deletion examples
2 changes: 1 addition & 1 deletion gateway/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "shuttle-gateway"
version = "0.11.2"
version = "0.12.0-rc1"
edition.workspace = true
license.workspace = true
publish = false
Expand Down
3 changes: 2 additions & 1 deletion proto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ name = "shuttle-proto"
version.workspace = true
edition.workspace = true
license.workspace = true
publish = false
description = "Library for all the gRPC definitions used by shuttle"

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

[dependencies]
Expand Down
5 changes: 1 addition & 4 deletions proto/build.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
fn main() -> Result<(), Box<dyn std::error::Error>> {
tonic_build::configure().compile(
&["../proto/provisioner.proto", "../proto/runtime.proto"],
&["../proto"],
)?;
tonic_build::configure().compile(&["./provisioner.proto", "./runtime.proto"], &["./"])?;

Ok(())
}
4 changes: 2 additions & 2 deletions resources/aws-rds/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "shuttle-aws-rds"
version = "0.11.0"
version = "0.12.0-rc1"
edition = "2021"
license = "Apache-2.0"
description = "Plugin to provision AWS RDS resources"
Expand All @@ -10,7 +10,7 @@ keywords = ["shuttle-service", "rds"]
[dependencies]
async-trait = "0.1.56"
paste = "1.0.7"
shuttle-service = { path = "../../service", version = "0.11.0", default-features = false }
shuttle-service = { path = "../../service", version = "0.12.0-rc1", default-features = false }
sqlx = { version = "0.6.2", features = ["runtime-tokio-native-tls"] }

[features]
Expand Down
6 changes: 3 additions & 3 deletions resources/persist/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "shuttle-persist"
version = "0.11.0"
version = "0.12.0-rc1"
edition = "2021"
license = "Apache-2.0"
description = "Plugin for persist objects"
Expand All @@ -11,6 +11,6 @@ keywords = ["shuttle-service", "persistence"]
async-trait = "0.1.56"
bincode = "1.2.1"
serde = { version = "1.0.0", features = ["derive"] }
shuttle-common = { path = "../../common", version = "0.11.0", default-features = false }
shuttle-service = { path = "../../service", version = "0.11.0", default-features = false }
shuttle-common = { path = "../../common", version = "0.12.0-rc1", default-features = false }
shuttle-service = { path = "../../service", version = "0.12.0-rc1", default-features = false }
thiserror = "1.0.32"
4 changes: 2 additions & 2 deletions resources/secrets/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "shuttle-secrets"
version = "0.11.0"
version = "0.12.0-rc1"
edition = "2021"
license = "Apache-2.0"
description = "Plugin to for managing secrets on shuttle"
Expand All @@ -9,4 +9,4 @@ keywords = ["shuttle-service", "secrets"]

[dependencies]
async-trait = "0.1.56"
shuttle-service = { path = "../../service", version = "0.11.0", default-features = false }
shuttle-service = { path = "../../service", version = "0.12.0-rc1", default-features = false }
4 changes: 2 additions & 2 deletions resources/shared-db/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "shuttle-shared-db"
version = "0.11.0"
version = "0.12.0-rc1"
edition = "2021"
license = "Apache-2.0"
description = "Plugin for managing shared databases on shuttle"
Expand All @@ -10,7 +10,7 @@ keywords = ["shuttle-service", "database"]
[dependencies]
async-trait = "0.1.56"
mongodb = { version = "2.3.0", optional = true }
shuttle-service = { path = "../../service", version = "0.11.0", default-features = false }
shuttle-service = { path = "../../service", version = "0.12.0-rc1", default-features = false }
sqlx = { version = "0.6.2", features = ["runtime-tokio-native-tls"], optional = true }

[features]
Expand Down
4 changes: 2 additions & 2 deletions resources/static-folder/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "shuttle-static-folder"
version = "0.11.3"
version = "0.12.0-rc1"
edition = "2021"
license = "Apache-2.0"
description = "Plugin to get a static folder at runtime on shuttle"
Expand All @@ -10,7 +10,7 @@ keywords = ["shuttle-service", "static-folder"]
[dependencies]
async-trait = "0.1.56"
fs_extra = "1.3.0"
shuttle-service = { path = "../../service", version = "0.11.0", default-features = false }
shuttle-service = { path = "../../service", version = "0.12.0-rc1", default-features = false }
tracing = "0.1.37"

[dev-dependencies]
Expand Down
5 changes: 3 additions & 2 deletions runtime/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
[package]
name = "shuttle-runtime"
version = "0.1.0"
version = "0.12.0-rc1"
edition.workspace = true
license.workspace = true
publish = false
description = "Runtime to start and manage any service that runs on shuttle"

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

[[bin]]
Expand Down
2 changes: 1 addition & 1 deletion service/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "shuttle-service"
version = "0.11.0"
version = "0.12.0-rc1"
edition.workspace = true
license.workspace = true
repository.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions service/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
//! be a library crate with a `shuttle-service` dependency with the `web-rocket` feature on the `shuttle-service` dependency.
//!
//! ```toml
//! shuttle-service = { version = "0.11.0", features = ["web-rocket"] }
//! shuttle-service = { version = "0.12.0-rc1", features = ["web-rocket"] }
//! ```
//!
//! A boilerplate code for your rocket project can also be found in `src/lib.rs`:
Expand Down Expand Up @@ -107,7 +107,7 @@
//! Add `shuttle-shared-db` as a dependency with the `postgres` feature, and add `sqlx` as a dependency with the `runtime-tokio-native-tls` and `postgres` features inside `Cargo.toml`:
//!
//! ```toml
//! shuttle-shared-db = { version = "0.11.0", features = ["postgres"] }
//! shuttle-shared-db = { version = "0.12.0-rc1", features = ["postgres"] }
//! sqlx = { version = "0.6.2", features = ["runtime-tokio-native-tls", "postgres"] }
//! ```
//!
Expand Down
7 changes: 5 additions & 2 deletions services/shuttle-actix-web/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
[package]
name = "shuttle-actix-web"
version = "0.1.0"
version = "0.12.0-rc1"
edition = "2021"
license = "Apache-2.0"
description = "Service implementation to run an actix webserver on shuttle"
keywords = ["shuttle-service", "actix"]

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

[dependencies]
actix-web = { version = "4.3.1" }
shuttle-runtime = { path = "../../runtime", version = "0.1.0" }
shuttle-runtime = { path = "../../runtime", version = "0.12.0-rc1" }
num_cpus = "1.15.0"

[dev-dependencies]
Expand Down
Loading