From 5d2215b6d880efe2e0428aac1d3af75096aecbb2 Mon Sep 17 00:00:00 2001 From: Pieter Date: Mon, 17 Oct 2022 22:05:22 +0200 Subject: [PATCH] chore: v0.7.0 (#404) * chore: v0.7.0 * chore: resources v0.7.0 * docs: v0.7.0 * tests: v0.7.0 * misc: publish secrets first * tests: fix warp test (case) --- Cargo.lock | 26 ++++-- cargo-shuttle/Cargo.toml | 8 +- cargo-shuttle/README.md | 2 +- cargo-shuttle/tests/integration/run.rs | 2 +- codegen/Cargo.toml | 2 +- common/Cargo.toml | 2 +- deployer/Cargo.toml | 8 +- .../tests/deploy_layer/bind-panic/Cargo.toml | 2 +- .../tests/deploy_layer/main-panic/Cargo.toml | 2 +- .../tests/deploy_layer/self-stop/Cargo.toml | 2 +- .../tests/deploy_layer/sleep-async/Cargo.toml | 2 +- examples/axum/hello-world/Cargo.toml | 2 +- examples/axum/websocket/Cargo.toml | 2 +- examples/custom/main-custom/Cargo.toml | 9 -- examples/custom/main-custom/src/lib.rs | 93 ------------------- examples/poem/hello-world/Cargo.toml | 2 +- examples/poem/mongodb/Cargo.toml | 4 +- examples/poem/postgres/Cargo.toml | 4 +- examples/rocket/authentication/Cargo.toml | 2 +- examples/rocket/hello-world/Cargo.toml | 2 +- examples/rocket/persist/Cargo.toml | 4 +- examples/rocket/postgres/Cargo.toml | 4 +- examples/rocket/secrets/Cargo.toml | 4 +- examples/rocket/url-shortener/Cargo.toml | 4 +- examples/salvo/hello-world/Cargo.toml | 2 +- examples/serenity/hello-world/Cargo.toml | 4 +- examples/serenity/postgres/Cargo.toml | 6 +- examples/thruster/hello-world/Cargo.toml | 2 +- examples/thruster/postgres/Cargo.toml | 4 +- examples/tide/hello-world/Cargo.toml | 2 +- examples/tide/postgres/Cargo.toml | 4 +- examples/tower/hello-world/Cargo.toml | 2 +- examples/warp/hello-world/Cargo.toml | 2 +- gateway/Cargo.toml | 4 +- proto/Cargo.toml | 4 +- provisioner/Cargo.toml | 4 +- resources/aws-rds/Cargo.toml | 4 +- resources/persist/Cargo.toml | 6 +- resources/secrets/Cargo.toml | 4 +- resources/shared-db/Cargo.toml | 4 +- scripts/publish.sh | 2 +- service/Cargo.toml | 6 +- service/src/lib.rs | 4 +- .../tests/resources/not-shuttle/Cargo.toml | 2 +- 44 files changed, 86 insertions(+), 180 deletions(-) delete mode 100644 examples/custom/main-custom/Cargo.toml delete mode 100644 examples/custom/main-custom/src/lib.rs diff --git a/Cargo.lock b/Cargo.lock index 6a9b0ec3e..2426dbb41 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1181,7 +1181,7 @@ dependencies = [ [[package]] name = "cargo-shuttle" -version = "0.6.0" +version = "0.7.0" dependencies = [ "anyhow", "async-trait", @@ -5252,7 +5252,7 @@ checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f" [[package]] name = "shuttle-codegen" -version = "0.6.0" +version = "0.7.0" dependencies = [ "pretty_assertions", "proc-macro-error", @@ -5264,7 +5264,7 @@ dependencies = [ [[package]] name = "shuttle-common" -version = "0.6.0" +version = "0.7.0" dependencies = [ "chrono", "comfy-table", @@ -5281,7 +5281,7 @@ dependencies = [ [[package]] name = "shuttle-deployer" -version = "0.6.0" +version = "0.7.0" dependencies = [ "anyhow", "async-trait", @@ -5328,7 +5328,7 @@ dependencies = [ [[package]] name = "shuttle-gateway" -version = "0.6.0" +version = "0.7.0" dependencies = [ "anyhow", "async-trait", @@ -5365,7 +5365,7 @@ dependencies = [ [[package]] name = "shuttle-proto" -version = "0.6.0" +version = "0.7.0" dependencies = [ "prost", "shuttle-common", @@ -5375,7 +5375,7 @@ dependencies = [ [[package]] name = "shuttle-provisioner" -version = "0.6.0" +version = "0.7.0" dependencies = [ "aws-config", "aws-sdk-rds", @@ -5401,7 +5401,7 @@ dependencies = [ [[package]] name = "shuttle-secrets" -version = "0.6.0" +version = "0.7.0" dependencies = [ "async-trait", "shuttle-service", @@ -5410,7 +5410,7 @@ dependencies = [ [[package]] name = "shuttle-service" -version = "0.6.0" +version = "0.7.0" dependencies = [ "anyhow", "async-std", @@ -7380,3 +7380,11 @@ checksum = "94693807d016b2f2d2e14420eb3bfcca689311ff775dcf113d74ea624b7cdf07" [[patch.unused]] name = "shuttle-aws-rds" version = "0.6.0" + +[[patch.unused]] +name = "shuttle-persist" +version = "0.6.0" + +[[patch.unused]] +name = "shuttle-shared-db" +version = "0.6.0" diff --git a/cargo-shuttle/Cargo.toml b/cargo-shuttle/Cargo.toml index c2ef40bbc..00ed551af 100644 --- a/cargo-shuttle/Cargo.toml +++ b/cargo-shuttle/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cargo-shuttle" -version = "0.6.0" +version = "0.7.0" edition = "2021" license = "Apache-2.0" description = "A cargo command for the shuttle platform (https://www.shuttle.rs/)" @@ -40,15 +40,15 @@ uuid = { version = "1.1.2", features = ["v4"] } webbrowser = "0.7.1" [dependencies.shuttle-common] -version = "0.6.0" +version = "0.7.0" path = "../common" [dependencies.shuttle-secrets] -version = "0.6.0" +version = "0.7.0" path = "../resources/secrets" [dependencies.shuttle-service] -version = "0.6.0" +version = "0.7.0" path = "../service" features = ["loader"] diff --git a/cargo-shuttle/README.md b/cargo-shuttle/README.md index 8b32f4d48..691b861d9 100644 --- a/cargo-shuttle/README.md +++ b/cargo-shuttle/README.md @@ -90,7 +90,7 @@ $ cargo shuttle init --rocket my-rocket-app This should generate the following dependency in `Cargo.toml`: ```toml -shuttle-service = { version = "0.6.0", features = ["web-rocket"] } +shuttle-service = { version = "0.7.0", features = ["web-rocket"] } ``` The following boilerplate code should be generated into `src/lib.rs`: diff --git a/cargo-shuttle/tests/integration/run.rs b/cargo-shuttle/tests/integration/run.rs index a6a6c786c..d928c4f55 100644 --- a/cargo-shuttle/tests/integration/run.rs +++ b/cargo-shuttle/tests/integration/run.rs @@ -229,7 +229,7 @@ async fn warp_hello_world() { .await .unwrap(); - assert_eq!(request_text, "Hello, world!"); + assert_eq!(request_text, "Hello, World!"); } #[tokio::test(flavor = "multi_thread")] diff --git a/codegen/Cargo.toml b/codegen/Cargo.toml index dd35da2d3..df1bb4d26 100644 --- a/codegen/Cargo.toml +++ b/codegen/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shuttle-codegen" -version = "0.6.0" +version = "0.7.0" edition = "2021" license = "Apache-2.0" description = "Proc-macro code generator for the shuttle.rs service" diff --git a/common/Cargo.toml b/common/Cargo.toml index c5d50c4e4..8b10d111a 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shuttle-common" -version = "0.6.0" +version = "0.7.0" edition = "2021" license = "Apache-2.0" description = "Common library for the shuttle platform (https://www.shuttle.rs/)" diff --git a/deployer/Cargo.toml b/deployer/Cargo.toml index 8e20f4550..2e6ea3cb8 100644 --- a/deployer/Cargo.toml +++ b/deployer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shuttle-deployer" -version = "0.6.0" +version = "0.7.0" edition = "2021" description = "Service with instances created per project for handling the compilation, loading, and execution of Shuttle services" @@ -42,15 +42,15 @@ tracing-subscriber = { version = "0.3.11", features = ["env-filter"] } uuid = { version = "1.1.2", features = ["v4"] } [dependencies.shuttle-common] -version = "0.6.0" +version = "0.7.0" path = "../common" [dependencies.shuttle-proto] -version = "0.6.0" +version = "0.7.0" path = "../proto" [dependencies.shuttle-service] -version = "0.6.0" +version = "0.7.0" path = "../service" features = ["loader"] diff --git a/deployer/tests/deploy_layer/bind-panic/Cargo.toml b/deployer/tests/deploy_layer/bind-panic/Cargo.toml index 0cb719623..156d730a6 100644 --- a/deployer/tests/deploy_layer/bind-panic/Cargo.toml +++ b/deployer/tests/deploy_layer/bind-panic/Cargo.toml @@ -11,4 +11,4 @@ crate-type = ["cdylib"] [workspace] [dependencies] -shuttle-service = "0.6.0" +shuttle-service = "0.7.0" diff --git a/deployer/tests/deploy_layer/main-panic/Cargo.toml b/deployer/tests/deploy_layer/main-panic/Cargo.toml index 790fa1aca..27c1c18cb 100644 --- a/deployer/tests/deploy_layer/main-panic/Cargo.toml +++ b/deployer/tests/deploy_layer/main-panic/Cargo.toml @@ -11,4 +11,4 @@ crate-type = ["cdylib"] [workspace] [dependencies] -shuttle-service = "0.6.0" +shuttle-service = "0.7.0" diff --git a/deployer/tests/deploy_layer/self-stop/Cargo.toml b/deployer/tests/deploy_layer/self-stop/Cargo.toml index 96b202aec..4a05ac9ba 100644 --- a/deployer/tests/deploy_layer/self-stop/Cargo.toml +++ b/deployer/tests/deploy_layer/self-stop/Cargo.toml @@ -11,4 +11,4 @@ crate-type = ["cdylib"] [workspace] [dependencies] -shuttle-service = "0.6.0" +shuttle-service = "0.7.0" diff --git a/deployer/tests/deploy_layer/sleep-async/Cargo.toml b/deployer/tests/deploy_layer/sleep-async/Cargo.toml index e5943f9e9..b83c654da 100644 --- a/deployer/tests/deploy_layer/sleep-async/Cargo.toml +++ b/deployer/tests/deploy_layer/sleep-async/Cargo.toml @@ -12,4 +12,4 @@ crate-type = ["cdylib"] [dependencies] tokio = { version = "1.0", features = ["time"]} -shuttle-service = "0.6.0" +shuttle-service = "0.7.0" diff --git a/examples/axum/hello-world/Cargo.toml b/examples/axum/hello-world/Cargo.toml index 45fa32b0e..2ed0f8c58 100644 --- a/examples/axum/hello-world/Cargo.toml +++ b/examples/axum/hello-world/Cargo.toml @@ -7,5 +7,5 @@ edition = "2021" [dependencies] axum = "0.5" -shuttle-service = { version = "0.6.0", features = ["web-axum"] } +shuttle-service = { version = "0.7.0", features = ["web-axum"] } sync_wrapper = "0.1" diff --git a/examples/axum/websocket/Cargo.toml b/examples/axum/websocket/Cargo.toml index f24f21c2b..be6492154 100644 --- a/examples/axum/websocket/Cargo.toml +++ b/examples/axum/websocket/Cargo.toml @@ -13,6 +13,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.6.0", features = ["web-axum"] } +shuttle-service = { version = "0.7.0", features = ["web-axum"] } sync_wrapper = "0.1" tokio = { version = "1", features = ["full"] } diff --git a/examples/custom/main-custom/Cargo.toml b/examples/custom/main-custom/Cargo.toml deleted file mode 100644 index f326aa207..000000000 --- a/examples/custom/main-custom/Cargo.toml +++ /dev/null @@ -1,9 +0,0 @@ -[package] -name = "main-custom" -version = "0.1.0" -edition = "2021" - -[lib] - -[dependencies] -shuttle-service = "0.6.0" diff --git a/examples/custom/main-custom/src/lib.rs b/examples/custom/main-custom/src/lib.rs deleted file mode 100644 index 8223051ee..000000000 --- a/examples/custom/main-custom/src/lib.rs +++ /dev/null @@ -1,93 +0,0 @@ -use shuttle_service::{Error, Service}; - -#[derive(Clone)] -pub struct MyService; - -#[shuttle_service::async_trait] -impl Service for MyService { - async fn bind( - mut self: Box, - _addr: std::net::SocketAddr, - ) -> Result<(), shuttle_service::error::Error> { - println!("service is binding"); - Ok(()) - } -} - -#[shuttle_service::main] -async fn shuttle() -> Result { - Ok(MyService {}) -} - -// async fn __shuttle_wrapper( -// _factory: &mut dyn shuttle_service::Factory, -// runtime: &shuttle_service::Runtime, -// logger: Box, -// ) -> Result, Error> { -// runtime -// .spawn_blocking(move || { -// shuttle_service::log::set_boxed_logger(logger) -// .map(|()| { -// shuttle_service::log::set_max_level(shuttle_service::log::LevelFilter::Info) -// }) -// .expect("logger set should succeed"); -// }) -// .await -// .map_err(|e| { -// if e.is_panic() { -// let mes = e -// .into_panic() -// .downcast_ref::<&str>() -// .map(|x| x.to_string()) -// .unwrap_or_else(|| "".to_string()); - -// shuttle_service::Error::BuildPanic(mes) -// } else { -// shuttle_service::Error::Custom(shuttle_service::error::CustomError::new(e)) -// } -// })?; - -// runtime -// .spawn(async { -// shuttle() -// .await -// .map(|ok| Box::new(ok) as Box) -// }) -// .await -// .map_err(|e| { -// if e.is_panic() { -// let mes = e -// .into_panic() -// .downcast_ref::<&str>() -// .map(|x| x.to_string()) -// .unwrap_or_else(|| "".to_string()); - -// shuttle_service::Error::BuildPanic(mes) -// } else { -// shuttle_service::Error::Custom(shuttle_service::error::CustomError::new(e)) -// } -// })? -// } - -// fn __binder( -// service: Box, -// addr: std::net::SocketAddr, -// runtime: &shuttle_service::Runtime, -// ) -> shuttle_service::ServeHandle { -// runtime.spawn(async move { service.bind(addr).await }) -// } - -// #[no_mangle] -// pub extern "C" fn _create_service() -> *mut shuttle_service::Bootstrapper { -// let builder: shuttle_service::StateBuilder> = -// |factory, runtime, logger| Box::pin(__shuttle_wrapper(factory, runtime, logger)); - -// let bootstrapper = shuttle_service::Bootstrapper::new( -// builder, -// __binder, -// shuttle_service::Runtime::new().unwrap(), -// ); - -// let boxed = Box::new(bootstrapper); -// Box::into_raw(boxed) -// } diff --git a/examples/poem/hello-world/Cargo.toml b/examples/poem/hello-world/Cargo.toml index da9f6103f..74a34fded 100644 --- a/examples/poem/hello-world/Cargo.toml +++ b/examples/poem/hello-world/Cargo.toml @@ -7,4 +7,4 @@ edition = "2021" [dependencies] poem = "1.3.35" -shuttle-service = { version = "0.6.0", features = ["web-poem"] } +shuttle-service = { version = "0.7.0", features = ["web-poem"] } diff --git a/examples/poem/mongodb/Cargo.toml b/examples/poem/mongodb/Cargo.toml index d672b93db..41f6389b2 100644 --- a/examples/poem/mongodb/Cargo.toml +++ b/examples/poem/mongodb/Cargo.toml @@ -8,5 +8,5 @@ mongodb = "2.3.0" poem = "1.3.35" serde = { version = "1", features = ["derive"] } serde_json = "1" -shuttle-service = { version = "0.6.0", features = ["web-poem"] } -shuttle-shared-db = { version = "0.6.0", features = ["mongodb"] } +shuttle-service = { version = "0.7.0", features = ["web-poem"] } +shuttle-shared-db = { version = "0.7.0", features = ["mongodb"] } diff --git a/examples/poem/postgres/Cargo.toml b/examples/poem/postgres/Cargo.toml index 35ab281d9..5eb3e6b6e 100644 --- a/examples/poem/postgres/Cargo.toml +++ b/examples/poem/postgres/Cargo.toml @@ -8,6 +8,6 @@ edition = "2021" [dependencies] poem = "1.3.35" serde = "1.0" -shuttle-service = { version = "0.6.0", features = ["web-poem"] } -shuttle-shared-db = { version = "0.6.0", features = ["postgres"] } +shuttle-service = { version = "0.7.0", features = ["web-poem"] } +shuttle-shared-db = { version = "0.7.0", features = ["postgres"] } sqlx = { version = "0.6", features = ["runtime-tokio-native-tls", "postgres"] } diff --git a/examples/rocket/authentication/Cargo.toml b/examples/rocket/authentication/Cargo.toml index 496f00316..1b7fb7a03 100644 --- a/examples/rocket/authentication/Cargo.toml +++ b/examples/rocket/authentication/Cargo.toml @@ -11,4 +11,4 @@ jsonwebtoken = { version = "8", default-features = false } lazy_static = "1.4" rocket = { version = "0.5.0-rc.2", features = ["json"] } serde = { version = "1.0", features = ["derive"] } -shuttle-service = { version = "0.6.0", features = ["web-rocket"] } +shuttle-service = { version = "0.7.0", features = ["web-rocket"] } diff --git a/examples/rocket/hello-world/Cargo.toml b/examples/rocket/hello-world/Cargo.toml index a0015abf1..0c179d821 100644 --- a/examples/rocket/hello-world/Cargo.toml +++ b/examples/rocket/hello-world/Cargo.toml @@ -7,4 +7,4 @@ edition = "2021" [dependencies] rocket = "0.5.0-rc.2" -shuttle-service = { version = "0.6.0", features = ["web-rocket"] } +shuttle-service = { version = "0.7.0", features = ["web-rocket"] } diff --git a/examples/rocket/persist/Cargo.toml b/examples/rocket/persist/Cargo.toml index 0ea0b2ee7..1d893c6b6 100644 --- a/examples/rocket/persist/Cargo.toml +++ b/examples/rocket/persist/Cargo.toml @@ -8,5 +8,5 @@ edition = "2021" [dependencies] rocket = { version = "0.5.0-rc.1", features = ["json"] } serde = { version = "1.0", features = ["derive"] } -shuttle-persist = "0.6.0" -shuttle-service = { version = "0.6.0", features = ["web-rocket"] } +shuttle-persist = "0.7.0" +shuttle-service = { version = "0.7.0", features = ["web-rocket"] } diff --git a/examples/rocket/postgres/Cargo.toml b/examples/rocket/postgres/Cargo.toml index 66b4af3af..aca7ced72 100644 --- a/examples/rocket/postgres/Cargo.toml +++ b/examples/rocket/postgres/Cargo.toml @@ -8,6 +8,6 @@ edition = "2021" [dependencies] rocket = { version = "0.5.0-rc.1", features = ["json"] } serde = "1.0" -shuttle-service = { version = "0.6.0", features = ["web-rocket"] } -shuttle-shared-db = { version = "0.6.0", features = ["postgres"] } +shuttle-service = { version = "0.7.0", features = ["web-rocket"] } +shuttle-shared-db = { version = "0.7.0", features = ["postgres"] } sqlx = { version = "0.6", features = ["runtime-tokio-native-tls", "postgres"] } diff --git a/examples/rocket/secrets/Cargo.toml b/examples/rocket/secrets/Cargo.toml index 427741573..9526d6a60 100644 --- a/examples/rocket/secrets/Cargo.toml +++ b/examples/rocket/secrets/Cargo.toml @@ -8,5 +8,5 @@ edition = "2021" [dependencies] anyhow = "1.0.62" rocket = { version = "0.5.0-rc.1", features = ["json"] } -shuttle-secrets = "0.6.0" -shuttle-service = { version = "0.6.0", features = ["web-rocket"] } +shuttle-secrets = "0.7.0" +shuttle-service = { version = "0.7.0", features = ["web-rocket"] } diff --git a/examples/rocket/url-shortener/Cargo.toml b/examples/rocket/url-shortener/Cargo.toml index e4963181f..d33cba841 100644 --- a/examples/rocket/url-shortener/Cargo.toml +++ b/examples/rocket/url-shortener/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" nanoid = "0.4" rocket = { version = "0.5.0-rc.2", features = ["json"] } serde = "1.0" -shuttle-service = { version = "0.6.0", features = ["web-rocket"] } -shuttle-shared-db = { version = "0.6.0", features = ["postgres"] } +shuttle-service = { version = "0.7.0", features = ["web-rocket"] } +shuttle-shared-db = { version = "0.7.0", features = ["postgres"] } sqlx = { version = "0.6", features = ["runtime-tokio-native-tls", "postgres"] } url = "2.2" diff --git a/examples/salvo/hello-world/Cargo.toml b/examples/salvo/hello-world/Cargo.toml index 9c510e446..951a529c1 100644 --- a/examples/salvo/hello-world/Cargo.toml +++ b/examples/salvo/hello-world/Cargo.toml @@ -7,4 +7,4 @@ edition = "2021" [dependencies] salvo = "0.34.3" -shuttle-service = { version = "0.6.0", features = ["web-salvo"] } +shuttle-service = { version = "0.7.0", features = ["web-salvo"] } diff --git a/examples/serenity/hello-world/Cargo.toml b/examples/serenity/hello-world/Cargo.toml index ba1f6e90d..741dc89d0 100644 --- a/examples/serenity/hello-world/Cargo.toml +++ b/examples/serenity/hello-world/Cargo.toml @@ -8,6 +8,6 @@ edition = "2021" [dependencies] anyhow = "1.0.62" serenity = { version = "0.11.5", default-features = false, features = ["client", "gateway", "rustls_backend", "model"] } -shuttle-secrets = "0.6.0" -shuttle-service = { version = "0.6.0", features = ["bot-serenity"] } +shuttle-secrets = "0.7.0" +shuttle-service = { version = "0.7.0", features = ["bot-serenity"] } tracing = "0.1.35" diff --git a/examples/serenity/postgres/Cargo.toml b/examples/serenity/postgres/Cargo.toml index f96016791..8310116f2 100644 --- a/examples/serenity/postgres/Cargo.toml +++ b/examples/serenity/postgres/Cargo.toml @@ -9,8 +9,8 @@ edition = "2021" anyhow = "1.0.62" serde = "1.0" serenity = { version = "0.11.5", default-features = false, features = ["client", "gateway", "rustls_backend", "model"] } -shuttle-secrets = "0.6.0" -shuttle-service = { version = "0.6.0", features = ["bot-serenity"] } -shuttle-shared-db = { version = "0.6.0", features = ["postgres"] } +shuttle-secrets = "0.7.0" +shuttle-service = { version = "0.7.0", features = ["bot-serenity"] } +shuttle-shared-db = { version = "0.7.0", features = ["postgres"] } sqlx = { version = "0.6", features = ["runtime-tokio-native-tls", "postgres"] } tracing = "0.1.35" diff --git a/examples/thruster/hello-world/Cargo.toml b/examples/thruster/hello-world/Cargo.toml index d4108ef3a..ed56f40b7 100644 --- a/examples/thruster/hello-world/Cargo.toml +++ b/examples/thruster/hello-world/Cargo.toml @@ -6,5 +6,5 @@ edition = "2021" [lib] [dependencies] -shuttle-service = { version = "0.6.0", features = ["web-thruster"] } +shuttle-service = { version = "0.7.0", features = ["web-thruster"] } thruster = { version = "1.2.6", features = ["hyper_server"] } diff --git a/examples/thruster/postgres/Cargo.toml b/examples/thruster/postgres/Cargo.toml index 6d5b51f43..34f22dcbf 100644 --- a/examples/thruster/postgres/Cargo.toml +++ b/examples/thruster/postgres/Cargo.toml @@ -11,7 +11,7 @@ crate-type = ["cdylib"] hyper = "0.14.20" serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0" } -shuttle-aws-rds = { version = "0.6.0", features = ["postgres"] } -shuttle-service = { version = "0.6.0", features = ["web-thruster"] } +shuttle-aws-rds = { version = "0.7.0", features = ["postgres"] } +shuttle-service = { version = "0.7.0", features = ["web-thruster"] } sqlx = { version = "0.6", features = ["runtime-tokio-native-tls", "postgres"] } thruster = { version = "1.2.6", features = ["hyper_server"] } diff --git a/examples/tide/hello-world/Cargo.toml b/examples/tide/hello-world/Cargo.toml index 0307e584e..e331caaf4 100644 --- a/examples/tide/hello-world/Cargo.toml +++ b/examples/tide/hello-world/Cargo.toml @@ -6,5 +6,5 @@ edition = "2021" [lib] [dependencies] -shuttle-service = { version = "0.6.0", features = ["web-tide"] } +shuttle-service = { version = "0.7.0", features = ["web-tide"] } tide = "0.16.0" diff --git a/examples/tide/postgres/Cargo.toml b/examples/tide/postgres/Cargo.toml index 4b0b571ad..1c46c424a 100644 --- a/examples/tide/postgres/Cargo.toml +++ b/examples/tide/postgres/Cargo.toml @@ -9,7 +9,7 @@ crate-type = ["cdylib"] [dependencies] serde = { version = "1.0", features = ["derive"] } -shuttle-aws-rds = { version = "0.6.0", features = ["postgres"] } -shuttle-service = { version = "0.6.0", features = ["web-tide"] } +shuttle-aws-rds = { version = "0.7.0", features = ["postgres"] } +shuttle-service = { version = "0.7.0", features = ["web-tide"] } sqlx = { version = "0.6", features = ["runtime-tokio-native-tls", "postgres"] } tide = "0.16.0" diff --git a/examples/tower/hello-world/Cargo.toml b/examples/tower/hello-world/Cargo.toml index d8696d162..45fc5516c 100644 --- a/examples/tower/hello-world/Cargo.toml +++ b/examples/tower/hello-world/Cargo.toml @@ -7,5 +7,5 @@ edition = "2021" [dependencies] hyper = { version = "0.14", features = ["full"] } -shuttle-service = { version = "0.6.0", features = ["web-tower"] } +shuttle-service = { version = "0.7.0", features = ["web-tower"] } tower = { version = "0.4", features = ["full"] } diff --git a/examples/warp/hello-world/Cargo.toml b/examples/warp/hello-world/Cargo.toml index 2ca088fff..9bfc17ab5 100644 --- a/examples/warp/hello-world/Cargo.toml +++ b/examples/warp/hello-world/Cargo.toml @@ -6,5 +6,5 @@ edition = "2021" [lib] [dependencies] -shuttle-service = { version = "0.6.0", features = ["web-warp"] } +shuttle-service = { version = "0.7.0", features = ["web-warp"] } warp = "0.3.2" diff --git a/gateway/Cargo.toml b/gateway/Cargo.toml index b71ba1108..034d66282 100644 --- a/gateway/Cargo.toml +++ b/gateway/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shuttle-gateway" -version = "0.6.0" +version = "0.7.0" edition = "2021" publish = false @@ -33,7 +33,7 @@ tracing-opentelemetry = "0.17.4" tracing-subscriber = { version = "0.3.11", features = ["env-filter"] } [dependencies.shuttle-common] -version = "0.6.0" +version = "0.7.0" path = "../common" [dev-dependencies] diff --git a/proto/Cargo.toml b/proto/Cargo.toml index a7eb18d91..0ae1a34d9 100644 --- a/proto/Cargo.toml +++ b/proto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shuttle-proto" -version = "0.6.0" +version = "0.7.0" edition = "2021" publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -10,7 +10,7 @@ prost = "0.11.0" tonic = "0.8.0" [dependencies.shuttle-common] -version = "0.6.0" +version = "0.7.0" path = "../common" [build-dependencies] diff --git a/provisioner/Cargo.toml b/provisioner/Cargo.toml index dcf419a67..69954ecc2 100644 --- a/provisioner/Cargo.toml +++ b/provisioner/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shuttle-provisioner" -version = "0.6.0" +version = "0.7.0" edition = "2021" description = "Service responsible for provisioning and managing resources for services" publish = false @@ -23,7 +23,7 @@ tracing = "0.1.36" tracing-subscriber = "0.3.15" [dependencies.shuttle-proto] -version = "0.6.0" +version = "0.7.0" path = "../proto" [dev-dependencies] diff --git a/resources/aws-rds/Cargo.toml b/resources/aws-rds/Cargo.toml index 8a2a62434..1b17ac11a 100644 --- a/resources/aws-rds/Cargo.toml +++ b/resources/aws-rds/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shuttle-aws-rds" -version = "0.6.0" +version = "0.7.0" edition = "2021" license = "Apache-2.0" description = "Plugin to provision AWS RDS resources" @@ -10,7 +10,7 @@ keywords = ["shuttle-service", "rds"] [dependencies] async-trait = "0.1.56" paste = "1.0.7" -shuttle-service = { path = "../../service", version = "0.6.0", default-features = false } +shuttle-service = { path = "../../service", version = "0.7.0", default-features = false } sqlx = { version = "0.6.0", features = ["runtime-tokio-native-tls"] } tokio = { version = "1.19.2", features = ["rt"] } diff --git a/resources/persist/Cargo.toml b/resources/persist/Cargo.toml index 00f109f13..ee13d37f3 100644 --- a/resources/persist/Cargo.toml +++ b/resources/persist/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shuttle-persist" -version = "0.6.0" +version = "0.7.0" edition = "2021" license = "Apache-2.0" description = "Plugin for persist objects" @@ -11,7 +11,7 @@ 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.6.0" } -shuttle-service = { path = "../../service", version = "0.6.0", default-features = false } +shuttle-common = { path = "../../common", version = "0.7.0" } +shuttle-service = { path = "../../service", version = "0.7.0", default-features = false } thiserror = "1.0.32" tokio = { version = "1.19.2", features = ["rt"] } diff --git a/resources/secrets/Cargo.toml b/resources/secrets/Cargo.toml index 214498cf6..0bbecd62c 100644 --- a/resources/secrets/Cargo.toml +++ b/resources/secrets/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shuttle-secrets" -version = "0.6.0" +version = "0.7.0" edition = "2021" license = "Apache-2.0" description = "Plugin to for managing secrets on shuttle" @@ -9,5 +9,5 @@ keywords = ["shuttle-service", "secrets"] [dependencies] async-trait = "0.1.56" -shuttle-service = { path = "../../service", version = "0.6.0", default-features = false } +shuttle-service = { path = "../../service", version = "0.7.0", default-features = false } tokio = { version = "1.19.2", features = ["rt"] } diff --git a/resources/shared-db/Cargo.toml b/resources/shared-db/Cargo.toml index f372258f7..fce73e2cf 100644 --- a/resources/shared-db/Cargo.toml +++ b/resources/shared-db/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shuttle-shared-db" -version = "0.6.0" +version = "0.7.0" edition = "2021" license = "Apache-2.0" description = "Plugin for managing shared databases on shuttle" @@ -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.6.0", default-features = false } +shuttle-service = { path = "../../service", version = "0.7.0", default-features = false } sqlx = { version = "0.6.1", features = ["runtime-tokio-native-tls"], optional = true } tokio = { version = "1.19.2", features = ["rt"] } diff --git a/scripts/publish.sh b/scripts/publish.sh index d80bd0bfb..a879a795d 100755 --- a/scripts/publish.sh +++ b/scripts/publish.sh @@ -28,11 +28,11 @@ function main() publish-folder "common" publish-folder "codegen" publish-folder "service" + publish-folder "resources/secrets" publish-folder "cargo-shuttle" publish-folder "resources/aws-rds" publish-folder "resources/persist" - publish-folder "resources/secrets" publish-folder "resources/shared-db" git tag "v$version" diff --git a/service/Cargo.toml b/service/Cargo.toml index 53d6a79bb..5b1695b93 100644 --- a/service/Cargo.toml +++ b/service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shuttle-service" -version = "0.6.0" +version = "0.7.0" edition = "2021" license = "Apache-2.0" description = "Service traits and macros to deploy on the shuttle platform (https://www.shuttle.rs/)" @@ -46,7 +46,7 @@ optional = true features = ["tokio1"] [dependencies.shuttle-codegen] -version = "0.6.0" +version = "0.7.0" path = "../codegen" optional = true @@ -57,7 +57,7 @@ tokio = { version = "1.20.1", features = ["macros"] } uuid = { version = "1.1.2", features = ["v4"] } [dependencies.shuttle-common] -version = "0.6.0" +version = "0.7.0" default-features = false path = "../common" diff --git a/service/src/lib.rs b/service/src/lib.rs index a8a015af5..ce39ce9f0 100644 --- a/service/src/lib.rs +++ b/service/src/lib.rs @@ -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.6.0", features = ["web-rocket"] } +//! shuttle-service = { version = "0.7.0", features = ["web-rocket"] } //! ``` //! //! A boilerplate code for your rocket project can also be found in `src/lib.rs`: @@ -108,7 +108,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.6.0", features = ["postgres"] } +//! shuttle-shared-db = { version = "0.7.0", features = ["postgres"] } //! sqlx = { version = "0.6.1", features = ["runtime-tokio-native-tls", "postgres"] } //! ``` //! diff --git a/service/tests/resources/not-shuttle/Cargo.toml b/service/tests/resources/not-shuttle/Cargo.toml index 20163c7fb..99bfa8a3c 100644 --- a/service/tests/resources/not-shuttle/Cargo.toml +++ b/service/tests/resources/not-shuttle/Cargo.toml @@ -9,4 +9,4 @@ crate-type = ["cdylib"] [workspace] [dependencies] -shuttle-service = "0.6.0" +shuttle-service = "0.7.0"