From 54c991dcec58feb2754adf809ddb74c3a043e12f Mon Sep 17 00:00:00 2001 From: chesedo Date: Tue, 14 Mar 2023 13:45:44 +0200 Subject: [PATCH 01/16] misc: v0.12.0-rc1 --- Cargo.lock | 24 +++++++++---------- Cargo.toml | 10 ++++---- admin/Cargo.toml | 2 +- cargo-shuttle/Cargo.toml | 4 ++-- cargo-shuttle/README.md | 2 +- codegen/Cargo.toml | 2 +- common/Cargo.toml | 2 +- deployer/Cargo.toml | 2 +- .../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 | 2 +- gateway/Cargo.toml | 2 +- resources/aws-rds/Cargo.toml | 4 ++-- resources/persist/Cargo.toml | 6 ++--- resources/secrets/Cargo.toml | 4 ++-- resources/shared-db/Cargo.toml | 4 ++-- resources/static-folder/Cargo.toml | 4 ++-- runtime/Cargo.toml | 2 +- service/Cargo.toml | 2 +- service/src/lib.rs | 4 ++-- services/shuttle-actix-web/Cargo.toml | 4 ++-- services/shuttle-axum/Cargo.toml | 4 ++-- services/shuttle-poem/Cargo.toml | 4 ++-- services/shuttle-poise/Cargo.toml | 4 ++-- services/shuttle-rocket/Cargo.toml | 4 ++-- services/shuttle-salvo/Cargo.toml | 4 ++-- services/shuttle-serenity/Cargo.toml | 4 ++-- services/shuttle-thruster/Cargo.toml | 4 ++-- services/shuttle-tide/Cargo.toml | 4 ++-- services/shuttle-tower/Cargo.toml | 4 ++-- services/shuttle-warp/Cargo.toml | 4 ++-- 33 files changed, 67 insertions(+), 67 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0ace53bce..058004ef8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -971,7 +971,7 @@ dependencies = [ [[package]] name = "cargo-shuttle" -version = "0.11.2" +version = "0.12.0-rc1" dependencies = [ "anyhow", "assert_cmd", @@ -4537,7 +4537,7 @@ dependencies = [ [[package]] name = "shuttle-admin" -version = "0.11.0" +version = "0.12.0-rc1" dependencies = [ "anyhow", "clap 4.0.27", @@ -4554,7 +4554,7 @@ dependencies = [ [[package]] name = "shuttle-auth" -version = "0.11.0" +version = "0.12.0-rc1" dependencies = [ "anyhow", "async-trait", @@ -4583,7 +4583,7 @@ dependencies = [ [[package]] name = "shuttle-codegen" -version = "0.11.0" +version = "0.12.0-rc1" dependencies = [ "pretty_assertions", "proc-macro-error", @@ -4595,7 +4595,7 @@ dependencies = [ [[package]] name = "shuttle-common" -version = "0.11.2" +version = "0.12.0-rc1" dependencies = [ "anyhow", "async-trait", @@ -4640,7 +4640,7 @@ dependencies = [ [[package]] name = "shuttle-deployer" -version = "0.11.1" +version = "0.12.0-rc1" dependencies = [ "anyhow", "async-trait", @@ -4688,7 +4688,7 @@ dependencies = [ [[package]] name = "shuttle-gateway" -version = "0.11.2" +version = "0.12.0-rc1" dependencies = [ "acme2", "anyhow", @@ -4753,7 +4753,7 @@ dependencies = [ [[package]] name = "shuttle-proto" -version = "0.11.0" +version = "0.12.0-rc1" dependencies = [ "anyhow", "chrono", @@ -4770,7 +4770,7 @@ dependencies = [ [[package]] name = "shuttle-provisioner" -version = "0.11.0" +version = "0.12.0-rc1" dependencies = [ "aws-config", "aws-sdk-rds", @@ -4796,7 +4796,7 @@ dependencies = [ [[package]] name = "shuttle-runtime" -version = "0.1.0" +version = "0.12.0-rc1" dependencies = [ "anyhow", "async-trait", @@ -4828,7 +4828,7 @@ dependencies = [ [[package]] name = "shuttle-secrets" -version = "0.11.0" +version = "0.12.0-rc1" dependencies = [ "async-trait", "shuttle-service", @@ -4836,7 +4836,7 @@ dependencies = [ [[package]] name = "shuttle-service" -version = "0.11.0" +version = "0.12.0-rc1" dependencies = [ "anyhow", "async-trait", diff --git a/Cargo.toml b/Cargo.toml index 86627999b..5d9f5960b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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" diff --git a/admin/Cargo.toml b/admin/Cargo.toml index 20b4127a7..8177eba5a 100644 --- a/admin/Cargo.toml +++ b/admin/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shuttle-admin" -version = "0.11.0" +version = "0.12.0-rc1" edition = "2021" [dependencies] diff --git a/cargo-shuttle/Cargo.toml b/cargo-shuttle/Cargo.toml index d053b2860..efccd1efb 100644 --- a/cargo-shuttle/Cargo.toml +++ b/cargo-shuttle/Cargo.toml @@ -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 @@ -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] diff --git a/cargo-shuttle/README.md b/cargo-shuttle/README.md index ae1da5f10..d81ae7a43 100644 --- a/cargo-shuttle/README.md +++ b/cargo-shuttle/README.md @@ -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`: diff --git a/codegen/Cargo.toml b/codegen/Cargo.toml index faff07977..1a270570b 100644 --- a/codegen/Cargo.toml +++ b/codegen/Cargo.toml @@ -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 diff --git a/common/Cargo.toml b/common/Cargo.toml index 49c4f736f..c7678719a 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -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 diff --git a/deployer/Cargo.toml b/deployer/Cargo.toml index 9c6f7ab23..f1cde9eb1 100644 --- a/deployer/Cargo.toml +++ b/deployer/Cargo.toml @@ -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" diff --git a/deployer/tests/deploy_layer/bind-panic/Cargo.toml b/deployer/tests/deploy_layer/bind-panic/Cargo.toml index 632c09176..be2f6ab65 100644 --- a/deployer/tests/deploy_layer/bind-panic/Cargo.toml +++ b/deployer/tests/deploy_layer/bind-panic/Cargo.toml @@ -8,5 +8,5 @@ edition = "2021" [workspace] [dependencies] -shuttle-runtime = "0.1.0" +shuttle-runtime = "0.12.0-rc1" tokio = "1.22" diff --git a/deployer/tests/deploy_layer/main-panic/Cargo.toml b/deployer/tests/deploy_layer/main-panic/Cargo.toml index 9632a72d7..098c09b10 100644 --- a/deployer/tests/deploy_layer/main-panic/Cargo.toml +++ b/deployer/tests/deploy_layer/main-panic/Cargo.toml @@ -8,5 +8,5 @@ edition = "2021" [workspace] [dependencies] -shuttle-runtime = "0.1.0" +shuttle-runtime = "0.12.0-rc1" tokio = "1.22" diff --git a/deployer/tests/deploy_layer/self-stop/Cargo.toml b/deployer/tests/deploy_layer/self-stop/Cargo.toml index bab0ac511..4ae9c37fe 100644 --- a/deployer/tests/deploy_layer/self-stop/Cargo.toml +++ b/deployer/tests/deploy_layer/self-stop/Cargo.toml @@ -8,5 +8,5 @@ edition = "2021" [workspace] [dependencies] -shuttle-runtime = "0.1.0" +shuttle-runtime = "0.12.0-rc1" tokio = "1.22" diff --git a/deployer/tests/deploy_layer/sleep-async/Cargo.toml b/deployer/tests/deploy_layer/sleep-async/Cargo.toml index ed33c2630..e9cbb4ae9 100644 --- a/deployer/tests/deploy_layer/sleep-async/Cargo.toml +++ b/deployer/tests/deploy_layer/sleep-async/Cargo.toml @@ -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"]} diff --git a/examples b/examples index c35653890..330d3488e 160000 --- a/examples +++ b/examples @@ -1 +1 @@ -Subproject commit c35653890aa7b0d8e4cb70131027990d4ed6afa6 +Subproject commit 330d3488ede46b4449fd219574620bd4a712a319 diff --git a/gateway/Cargo.toml b/gateway/Cargo.toml index 9f3c867dd..1819b87b5 100644 --- a/gateway/Cargo.toml +++ b/gateway/Cargo.toml @@ -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 diff --git a/resources/aws-rds/Cargo.toml b/resources/aws-rds/Cargo.toml index 951ced4d5..c1d92ec52 100644 --- a/resources/aws-rds/Cargo.toml +++ b/resources/aws-rds/Cargo.toml @@ -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" @@ -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] diff --git a/resources/persist/Cargo.toml b/resources/persist/Cargo.toml index dd0ed1860..590e0235a 100644 --- a/resources/persist/Cargo.toml +++ b/resources/persist/Cargo.toml @@ -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" @@ -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" diff --git a/resources/secrets/Cargo.toml b/resources/secrets/Cargo.toml index 599ce1a82..582867062 100644 --- a/resources/secrets/Cargo.toml +++ b/resources/secrets/Cargo.toml @@ -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" @@ -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 } diff --git a/resources/shared-db/Cargo.toml b/resources/shared-db/Cargo.toml index 3d78638e5..9e8ce42a5 100644 --- a/resources/shared-db/Cargo.toml +++ b/resources/shared-db/Cargo.toml @@ -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" @@ -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] diff --git a/resources/static-folder/Cargo.toml b/resources/static-folder/Cargo.toml index 23a200eec..de8002f6c 100644 --- a/resources/static-folder/Cargo.toml +++ b/resources/static-folder/Cargo.toml @@ -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" @@ -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] diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 0a417f502..38ab974d4 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shuttle-runtime" -version = "0.1.0" +version = "0.12.0-rc1" edition.workspace = true license.workspace = true publish = false diff --git a/service/Cargo.toml b/service/Cargo.toml index 64178f863..69f30b7ff 100644 --- a/service/Cargo.toml +++ b/service/Cargo.toml @@ -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 diff --git a/service/src/lib.rs b/service/src/lib.rs index 030a4c9ae..b67937eee 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.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`: @@ -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"] } //! ``` //! diff --git a/services/shuttle-actix-web/Cargo.toml b/services/shuttle-actix-web/Cargo.toml index b80256c5c..f8ca84ce1 100644 --- a/services/shuttle-actix-web/Cargo.toml +++ b/services/shuttle-actix-web/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shuttle-actix-web" -version = "0.1.0" +version = "0.12.0-rc1" edition = "2021" [workspace] @@ -8,7 +8,7 @@ edition = "2021" [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] diff --git a/services/shuttle-axum/Cargo.toml b/services/shuttle-axum/Cargo.toml index dc7002c3d..771d561ae 100644 --- a/services/shuttle-axum/Cargo.toml +++ b/services/shuttle-axum/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shuttle-axum" -version = "0.1.0" +version = "0.12.0-rc1" edition = "2021" [workspace] @@ -8,7 +8,7 @@ edition = "2021" [dependencies] axum = { version = "0.6.10" } -shuttle-runtime = { path = "../../runtime", version = "0.1.0" } +shuttle-runtime = { path = "../../runtime", version = "0.12.0-rc1" } [dev-dependencies] tokio = { version = "1.26.0", features = ["macros", "rt-multi-thread"] } diff --git a/services/shuttle-poem/Cargo.toml b/services/shuttle-poem/Cargo.toml index 9b68f4cee..6ed73c329 100644 --- a/services/shuttle-poem/Cargo.toml +++ b/services/shuttle-poem/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shuttle-poem" -version = "0.1.0" +version = "0.12.0-rc1" edition = "2021" [workspace] @@ -8,7 +8,7 @@ edition = "2021" [dependencies] poem = { version = "1.3.55" } -shuttle-runtime = { path = "../../runtime", version = "0.1.0" } +shuttle-runtime = { path = "../../runtime", version = "0.12.0-rc1" } [dev-dependencies] tokio = { version = "1.26.0", features = ["macros", "rt-multi-thread"] } diff --git a/services/shuttle-poise/Cargo.toml b/services/shuttle-poise/Cargo.toml index 8f153217d..cd9af7d51 100644 --- a/services/shuttle-poise/Cargo.toml +++ b/services/shuttle-poise/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shuttle-poise" -version = "0.1.0" +version = "0.12.0-rc1" edition = "2021" [workspace] @@ -8,7 +8,7 @@ edition = "2021" [dependencies] poise = { version = "0.5.2" } -shuttle-runtime = { path = "../../runtime", version = "0.1.0" } +shuttle-runtime = { path = "../../runtime", version = "0.12.0-rc1" } [dev-dependencies] shuttle-secrets = { path = "../../resources/secrets" } diff --git a/services/shuttle-rocket/Cargo.toml b/services/shuttle-rocket/Cargo.toml index ac2337964..7d2701a58 100644 --- a/services/shuttle-rocket/Cargo.toml +++ b/services/shuttle-rocket/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shuttle-rocket" -version = "0.1.0" +version = "0.12.0-rc1" edition = "2021" [workspace] @@ -8,7 +8,7 @@ edition = "2021" [dependencies] rocket = { version = "0.5.0-rc.2" } -shuttle-runtime = { path = "../../runtime", version = "0.1.0" } +shuttle-runtime = { path = "../../runtime", version = "0.12.0-rc1" } [dev-dependencies] tokio = { version = "1.26.0", features = ["macros", "rt-multi-thread"] } diff --git a/services/shuttle-salvo/Cargo.toml b/services/shuttle-salvo/Cargo.toml index 4568225fe..54ce1e37b 100644 --- a/services/shuttle-salvo/Cargo.toml +++ b/services/shuttle-salvo/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shuttle-salvo" -version = "0.1.0" +version = "0.12.0-rc1" edition = "2021" [workspace] @@ -8,7 +8,7 @@ edition = "2021" [dependencies] salvo = { version = "0.37.5" } -shuttle-runtime = { path = "../../runtime", version = "0.1.0" } +shuttle-runtime = { path = "../../runtime", version = "0.12.0-rc1" } [dev-dependencies] tokio = { version = "1.26.0", features = ["macros", "rt-multi-thread"] } diff --git a/services/shuttle-serenity/Cargo.toml b/services/shuttle-serenity/Cargo.toml index c1e768f5a..9eb215dbb 100644 --- a/services/shuttle-serenity/Cargo.toml +++ b/services/shuttle-serenity/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shuttle-serenity" -version = "0.1.0" +version = "0.12.0-rc1" edition = "2021" [workspace] @@ -8,7 +8,7 @@ edition = "2021" [dependencies] serenity = { version = "0.11.5", default-features = false, features = ["client", "gateway", "rustls_backend", "model"] } -shuttle-runtime = { path = "../../runtime", version = "0.1.0" } +shuttle-runtime = { path = "../../runtime", version = "0.12.0-rc1" } [dev-dependencies] anyhow = "1.0.69" diff --git a/services/shuttle-thruster/Cargo.toml b/services/shuttle-thruster/Cargo.toml index af839c677..8f6bb1d6f 100644 --- a/services/shuttle-thruster/Cargo.toml +++ b/services/shuttle-thruster/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shuttle-thruster" -version = "0.1.0" +version = "0.12.0-rc1" edition = "2021" [workspace] @@ -8,7 +8,7 @@ edition = "2021" [dependencies] thruster = { version = "1.3.0" } -shuttle-runtime = { path = "../../runtime", version = "0.1.0" } +shuttle-runtime = { path = "../../runtime", version = "0.12.0-rc1" } [dev-dependencies] thruster = { version = "1.3.0", features = ["hyper_server"] } diff --git a/services/shuttle-tide/Cargo.toml b/services/shuttle-tide/Cargo.toml index 41ec5df63..3966c2f86 100644 --- a/services/shuttle-tide/Cargo.toml +++ b/services/shuttle-tide/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shuttle-tide" -version = "0.1.0" +version = "0.12.0-rc1" edition = "2021" [workspace] @@ -8,7 +8,7 @@ edition = "2021" [dependencies] tide = { version = "0.16.0" } -shuttle-runtime = { path = "../../runtime", version = "0.1.0" } +shuttle-runtime = { path = "../../runtime", version = "0.12.0-rc1" } # Tide does not have tokio support. So make sure async-std is compatible with tokio # https://github.com/http-rs/tide/issues/791 diff --git a/services/shuttle-tower/Cargo.toml b/services/shuttle-tower/Cargo.toml index 162508255..2a43179a3 100644 --- a/services/shuttle-tower/Cargo.toml +++ b/services/shuttle-tower/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shuttle-tower" -version = "0.1.0" +version = "0.12.0-rc1" edition = "2021" [workspace] @@ -8,7 +8,7 @@ edition = "2021" [dependencies] hyper = { version = "0.14.23", features = ["server", "tcp", "http1"] } -shuttle-runtime = { path = "../../runtime", version = "0.1.0" } +shuttle-runtime = { path = "../../runtime", version = "0.12.0-rc1" } tower = { version = "0.4.13", features = ["make"] } [dev-dependencies] diff --git a/services/shuttle-warp/Cargo.toml b/services/shuttle-warp/Cargo.toml index 7953981a2..02c14ab9e 100644 --- a/services/shuttle-warp/Cargo.toml +++ b/services/shuttle-warp/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shuttle-warp" -version = "0.1.0" +version = "0.12.0-rc1" edition = "2021" [workspace] @@ -8,7 +8,7 @@ edition = "2021" [dependencies] warp = { version = "0.3.3" } -shuttle-runtime = { path = "../../runtime", version = "0.1.0" } +shuttle-runtime = { path = "../../runtime", version = "0.12.0-rc1" } [dev-dependencies] tokio = { version = "1.26.0", features = ["macros", "rt-multi-thread"] } From 6c152fbcbabcca3786262ee1605506f9b0a51c06 Mon Sep 17 00:00:00 2001 From: chesedo Date: Tue, 14 Mar 2023 14:04:23 +0200 Subject: [PATCH 02/16] misc: publish proto --- proto/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proto/Cargo.toml b/proto/Cargo.toml index bb6725807..512de3273 100644 --- a/proto/Cargo.toml +++ b/proto/Cargo.toml @@ -3,7 +3,7 @@ name = "shuttle-proto" version.workspace = true edition.workspace = true license.workspace = true -publish = false + # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] From 1fea5c0e53fb0c268d3262bfb6385107243f79bb Mon Sep 17 00:00:00 2001 From: chesedo Date: Tue, 14 Mar 2023 14:09:23 +0200 Subject: [PATCH 03/16] refactor: remove relative from build.rs --- proto/build.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/proto/build.rs b/proto/build.rs index 0edbacf8c..685a01573 100644 --- a/proto/build.rs +++ b/proto/build.rs @@ -1,8 +1,5 @@ fn main() -> Result<(), Box> { - tonic_build::configure().compile( - &["../proto/provisioner.proto", "../proto/runtime.proto"], - &["../proto"], - )?; + tonic_build::configure().compile(&["./provisioner.proto", "./runtime.proto"], &["./"])?; Ok(()) } From 6a27ab8ba4924d2aba77853941198108166cd949 Mon Sep 17 00:00:00 2001 From: chesedo Date: Tue, 14 Mar 2023 14:11:21 +0200 Subject: [PATCH 04/16] refactor: add description to proto --- proto/Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/proto/Cargo.toml b/proto/Cargo.toml index 512de3273..44e2d990c 100644 --- a/proto/Cargo.toml +++ b/proto/Cargo.toml @@ -3,6 +3,7 @@ name = "shuttle-proto" version.workspace = true edition.workspace = true license.workspace = true +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 From 469ea3716c844d3add894e258c430b68e49d00c0 Mon Sep 17 00:00:00 2001 From: chesedo Date: Tue, 14 Mar 2023 14:16:04 +0200 Subject: [PATCH 05/16] refactor: make runtime publishable --- runtime/Cargo.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 38ab974d4..23f13a28d 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -3,7 +3,8 @@ name = "shuttle-runtime" 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]] From 9aeb295097d9d4ed83cde155b517630692780160 Mon Sep 17 00:00:00 2001 From: chesedo Date: Tue, 14 Mar 2023 14:22:03 +0200 Subject: [PATCH 06/16] refactor: make actix publishable --- services/shuttle-actix-web/Cargo.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/shuttle-actix-web/Cargo.toml b/services/shuttle-actix-web/Cargo.toml index f8ca84ce1..6b0d262a6 100644 --- a/services/shuttle-actix-web/Cargo.toml +++ b/services/shuttle-actix-web/Cargo.toml @@ -2,6 +2,9 @@ name = "shuttle-actix-web" 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 From 3814961b598f402085d8cd8a30bebdaeb2f91e1e Mon Sep 17 00:00:00 2001 From: oddgrd <29732646+oddgrd@users.noreply.github.com> Date: Tue, 14 Mar 2023 13:27:32 +0100 Subject: [PATCH 07/16] feat: make shuttle-axum publishable --- services/shuttle-axum/Cargo.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/shuttle-axum/Cargo.toml b/services/shuttle-axum/Cargo.toml index 771d561ae..0de287235 100644 --- a/services/shuttle-axum/Cargo.toml +++ b/services/shuttle-axum/Cargo.toml @@ -2,6 +2,9 @@ name = "shuttle-axum" version = "0.12.0-rc1" edition = "2021" +license = "Apache-2.0" +description = "Service implementation to run an axum webserver on shuttle" +keywords = ["shuttle-service", "axum"] [workspace] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html From 326bec4e0b511503d533ec334ae2c292388c5da1 Mon Sep 17 00:00:00 2001 From: oddgrd <29732646+oddgrd@users.noreply.github.com> Date: Tue, 14 Mar 2023 13:30:04 +0100 Subject: [PATCH 08/16] feat: make poem publishable --- services/shuttle-poem/Cargo.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/shuttle-poem/Cargo.toml b/services/shuttle-poem/Cargo.toml index 6ed73c329..fccef51da 100644 --- a/services/shuttle-poem/Cargo.toml +++ b/services/shuttle-poem/Cargo.toml @@ -2,6 +2,9 @@ name = "shuttle-poem" version = "0.12.0-rc1" edition = "2021" +license = "Apache-2.0" +description = "Service implementation to run a poem webserver on shuttle" +keywords = ["shuttle-service", "poem"] [workspace] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html From c0b2ed666204edfb0e8bd80ec26d1bc56d6cc5a9 Mon Sep 17 00:00:00 2001 From: oddgrd <29732646+oddgrd@users.noreply.github.com> Date: Tue, 14 Mar 2023 13:33:59 +0100 Subject: [PATCH 09/16] feat: make poise publishable --- services/shuttle-poise/Cargo.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/shuttle-poise/Cargo.toml b/services/shuttle-poise/Cargo.toml index cd9af7d51..4da1a48ac 100644 --- a/services/shuttle-poise/Cargo.toml +++ b/services/shuttle-poise/Cargo.toml @@ -2,6 +2,9 @@ name = "shuttle-poise" version = "0.12.0-rc1" edition = "2021" +license = "Apache-2.0" +description = "Service implementation to run a poise discord bot on shuttle" +keywords = ["shuttle-service", "poise", "discord-bot", "serenity"] [workspace] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html From 904196e27c04a46ea7a5b1cc37bc9ad6b10d582c Mon Sep 17 00:00:00 2001 From: oddgrd <29732646+oddgrd@users.noreply.github.com> Date: Tue, 14 Mar 2023 13:35:47 +0100 Subject: [PATCH 10/16] feat: make shuttle-rocket publishable --- services/shuttle-rocket/Cargo.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/shuttle-rocket/Cargo.toml b/services/shuttle-rocket/Cargo.toml index 7d2701a58..821d3223d 100644 --- a/services/shuttle-rocket/Cargo.toml +++ b/services/shuttle-rocket/Cargo.toml @@ -2,6 +2,9 @@ name = "shuttle-rocket" version = "0.12.0-rc1" edition = "2021" +license = "Apache-2.0" +description = "Service implementation to run a rocket webserver on shuttle" +keywords = ["shuttle-service", "rocket"] [workspace] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html From 6431ca00084ebad62d042b0c829493aabf10c2b4 Mon Sep 17 00:00:00 2001 From: chesedo Date: Tue, 14 Mar 2023 14:26:25 +0200 Subject: [PATCH 11/16] refactor: make warp publishable --- services/shuttle-warp/Cargo.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/shuttle-warp/Cargo.toml b/services/shuttle-warp/Cargo.toml index 02c14ab9e..004110884 100644 --- a/services/shuttle-warp/Cargo.toml +++ b/services/shuttle-warp/Cargo.toml @@ -2,6 +2,9 @@ name = "shuttle-warp" version = "0.12.0-rc1" edition = "2021" +license = "Apache-2.0" +description = "Service implementation to run a warp webserver on shuttle" +keywords = ["shuttle-service", "warp"] [workspace] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html From c75640adf808b68a2ce9d4a0d772946c1bdac07c Mon Sep 17 00:00:00 2001 From: chesedo Date: Tue, 14 Mar 2023 14:27:51 +0200 Subject: [PATCH 12/16] refactor: make tower publishable --- services/shuttle-tower/Cargo.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/shuttle-tower/Cargo.toml b/services/shuttle-tower/Cargo.toml index 2a43179a3..fc676c468 100644 --- a/services/shuttle-tower/Cargo.toml +++ b/services/shuttle-tower/Cargo.toml @@ -2,6 +2,9 @@ name = "shuttle-tower" version = "0.12.0-rc1" edition = "2021" +license = "Apache-2.0" +description = "Service implementation to run a tower webserver on shuttle" +keywords = ["shuttle-service", "tower"] [workspace] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html From d4362e6d97770745955581adbafa8a2542eb1bce Mon Sep 17 00:00:00 2001 From: chesedo Date: Tue, 14 Mar 2023 14:29:47 +0200 Subject: [PATCH 13/16] refactor: make tide publishable --- services/shuttle-tide/Cargo.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/shuttle-tide/Cargo.toml b/services/shuttle-tide/Cargo.toml index 3966c2f86..e1a78e2dd 100644 --- a/services/shuttle-tide/Cargo.toml +++ b/services/shuttle-tide/Cargo.toml @@ -2,6 +2,9 @@ name = "shuttle-tide" version = "0.12.0-rc1" edition = "2021" +license = "Apache-2.0" +description = "Service implementation to run a tide webserver on shuttle" +keywords = ["shuttle-service", "tide"] [workspace] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html From cae2826177682ab31358679342ab3c92948044bc Mon Sep 17 00:00:00 2001 From: chesedo Date: Tue, 14 Mar 2023 14:31:25 +0200 Subject: [PATCH 14/16] refactor: make thruster publishable --- services/shuttle-thruster/Cargo.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/shuttle-thruster/Cargo.toml b/services/shuttle-thruster/Cargo.toml index 8f6bb1d6f..a77df0029 100644 --- a/services/shuttle-thruster/Cargo.toml +++ b/services/shuttle-thruster/Cargo.toml @@ -2,6 +2,9 @@ name = "shuttle-thruster" version = "0.12.0-rc1" edition = "2021" +license = "Apache-2.0" +description = "Service implementation to run a thruster webserver on shuttle" +keywords = ["shuttle-service", "thruster"] [workspace] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html From 75b993bb6f95eb6b18ebbc9555cf768e014c12c8 Mon Sep 17 00:00:00 2001 From: chesedo Date: Tue, 14 Mar 2023 14:32:46 +0200 Subject: [PATCH 15/16] refactor: make serenity publishable --- services/shuttle-serenity/Cargo.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/shuttle-serenity/Cargo.toml b/services/shuttle-serenity/Cargo.toml index 9eb215dbb..5c504cbe8 100644 --- a/services/shuttle-serenity/Cargo.toml +++ b/services/shuttle-serenity/Cargo.toml @@ -2,6 +2,9 @@ name = "shuttle-serenity" version = "0.12.0-rc1" edition = "2021" +license = "Apache-2.0" +description = "Service implementation to run a serenity server on shuttle" +keywords = ["shuttle-service", "serenity"] [workspace] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html From 0841e4e170742d7874d4287269ecf4beb018b1b9 Mon Sep 17 00:00:00 2001 From: chesedo Date: Tue, 14 Mar 2023 14:35:07 +0200 Subject: [PATCH 16/16] refactor: make salvo publishable --- services/shuttle-salvo/Cargo.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/shuttle-salvo/Cargo.toml b/services/shuttle-salvo/Cargo.toml index 54ce1e37b..d71780480 100644 --- a/services/shuttle-salvo/Cargo.toml +++ b/services/shuttle-salvo/Cargo.toml @@ -2,6 +2,9 @@ name = "shuttle-salvo" version = "0.12.0-rc1" edition = "2021" +license = "Apache-2.0" +description = "Service implementation to run a salvo webserver on shuttle" +keywords = ["shuttle-service", "salvo"] [workspace] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html