From dcaea991890ac741d86669cdd9dc0beaa0991451 Mon Sep 17 00:00:00 2001 From: Zak Knudsen <7200184+dotZak@users.noreply.github.com> Date: Fri, 17 Oct 2025 15:29:01 +0200 Subject: [PATCH 1/5] Bump rust edition from `2021` to `2024` in blueprints/*/Cargo.toml. --- blueprint/cli/Cargo.toml.liquid | 2 +- blueprint/config/Cargo.toml.liquid | 2 +- blueprint/db/Cargo.toml.liquid | 2 +- blueprint/macros/Cargo.toml.liquid | 2 +- blueprint/web/Cargo.toml.liquid | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/blueprint/cli/Cargo.toml.liquid b/blueprint/cli/Cargo.toml.liquid index 227e9505..89c9f087 100644 --- a/blueprint/cli/Cargo.toml.liquid +++ b/blueprint/cli/Cargo.toml.liquid @@ -1,7 +1,7 @@ [package] name = "{{project-name}}-cli" version = "0.0.1" -edition = "2021" +edition = "2024" publish = false [lib] diff --git a/blueprint/config/Cargo.toml.liquid b/blueprint/config/Cargo.toml.liquid index 51830949..d8f54d2d 100644 --- a/blueprint/config/Cargo.toml.liquid +++ b/blueprint/config/Cargo.toml.liquid @@ -1,7 +1,7 @@ [package] name = "{{project-name}}-config" version = "0.0.1" -edition = "2021" +edition = "2024" publish = false [lib] diff --git a/blueprint/db/Cargo.toml.liquid b/blueprint/db/Cargo.toml.liquid index c2ebe090..b7f399e6 100644 --- a/blueprint/db/Cargo.toml.liquid +++ b/blueprint/db/Cargo.toml.liquid @@ -1,7 +1,7 @@ [package] name = "{{project-name}}-db" version = "0.1.0" -edition = "2021" +edition = "2024" publish = false [lib] diff --git a/blueprint/macros/Cargo.toml.liquid b/blueprint/macros/Cargo.toml.liquid index e57ebf34..46c54b00 100644 --- a/blueprint/macros/Cargo.toml.liquid +++ b/blueprint/macros/Cargo.toml.liquid @@ -1,7 +1,7 @@ [package] name = "{{project-name}}-macros" version = "0.0.1" -edition = "2021" +edition = "2024" publish = false [lib] diff --git a/blueprint/web/Cargo.toml.liquid b/blueprint/web/Cargo.toml.liquid index 9dbe2196..4046b327 100644 --- a/blueprint/web/Cargo.toml.liquid +++ b/blueprint/web/Cargo.toml.liquid @@ -1,7 +1,7 @@ [package] name = "{{project-name}}-web" version = "0.0.1" -edition = "2021" +edition = "2024" publish = false [lib] From be24d10f4a4266c3a18ee18f170f90c8fc17c1ad Mon Sep 17 00:00:00 2001 From: Zak Knudsen <7200184+dotZak@users.noreply.github.com> Date: Fri, 17 Oct 2025 15:38:38 +0200 Subject: [PATCH 2/5] Upgrade `cli` crate dependencies using `cargo upgrade` (via `cargo-edit) --- blueprint/cli/Cargo.toml.liquid | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/blueprint/cli/Cargo.toml.liquid b/blueprint/cli/Cargo.toml.liquid index 89c9f087..85577c78 100644 --- a/blueprint/cli/Cargo.toml.liquid +++ b/blueprint/cli/Cargo.toml.liquid @@ -12,6 +12,7 @@ doctest = false [[bin]] name = "db" path = "src/bin/db.rs" + {% endif -%} [[bin]] name = "generate" @@ -19,18 +20,26 @@ path = "src/bin/generate.rs" [dependencies] anyhow = "1" -clap = { version = "4.4", features = ["derive"] } +clap = { version = "4.5", features = ["derive"] } cruet = "0.15" guppy = "0.17" include_dir = "0.7" liquid = "~0.26" {{project-name}}-config = { path = "../config" } {% unless template_type == "minimal" -%} -regex = "1.11" -sqlx = { version = "0.8", features = [ "runtime-tokio", "tls-rustls", "postgres", "macros", "uuid", "migrate", "chrono" ] } +regex = "1.12" +sqlx = { version = "0.8", features = [ + "runtime-tokio", + "tls-rustls", + "postgres", + "macros", + "uuid", + "migrate", + "chrono", +] } url = "2.5" {%- endunless %} -tokio = { version = "1.34", features = ["full"] } +tokio = { version = "1.48", features = ["full"] } [dev-dependencies] -insta = "1.38" +insta = "1.43" From 9874d1888ededde2d0b5897cfcaf2355b4ee3a06 Mon Sep 17 00:00:00 2001 From: Zak Knudsen <7200184+dotZak@users.noreply.github.com> Date: Fri, 17 Oct 2025 15:40:10 +0200 Subject: [PATCH 3/5] Upgrade `db` crate dependencies using `cargo upgrade` (via `cargo-edit) --- blueprint/db/Cargo.toml.liquid | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/blueprint/db/Cargo.toml.liquid b/blueprint/db/Cargo.toml.liquid index b7f399e6..046c3142 100644 --- a/blueprint/db/Cargo.toml.liquid +++ b/blueprint/db/Cargo.toml.liquid @@ -13,12 +13,12 @@ test-helpers = ["dep:fake", "dep:rand", "dep:regex"] [dependencies] anyhow = "1.0" -fake = { version = "4.0", features = ["derive"], optional = true } +fake = { version = "4.4", features = ["derive"], optional = true } {{project-name}}-config = { path = "../config" } rand = { version = "0.9", optional = true } -regex = { version = "1.10", optional = true } +regex = { version = "1.12", optional = true } serde = { version = "1.0", features = ["derive"] } sqlx = { version = "0.8", features = [ "runtime-tokio", "tls-rustls", "postgres", "macros", "uuid", "migrate", "chrono" ] } thiserror = "2.0" -uuid = { version = "1.5", features = ["serde"] } +uuid = { version = "1.18", features = ["serde"] } validator = { version = "0.20", features = ["derive"] } From 317c1e343d359c9461f451e21adf2cc6da9b684c Mon Sep 17 00:00:00 2001 From: Zak Knudsen <7200184+dotZak@users.noreply.github.com> Date: Fri, 17 Oct 2025 15:42:44 +0200 Subject: [PATCH 4/5] Upgrade `web` crate dependencies using `cargo upgrade` (via `cargo-edit) --- blueprint/web/Cargo.toml.liquid | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/blueprint/web/Cargo.toml.liquid b/blueprint/web/Cargo.toml.liquid index 4046b327..7cf600d8 100644 --- a/blueprint/web/Cargo.toml.liquid +++ b/blueprint/web/Cargo.toml.liquid @@ -19,18 +19,22 @@ axum = { version = "0.8", features = ["macros"] } {{project-name}}-db = { path = "../db" } {%- endunless %} serde = { version = "1.0", features = ["derive"] } -tokio = { version = "1.34", features = ["full"] } +tokio = { version = "1.48", features = ["full"] } tower-http = { version = "0.6", features = ["full"] } tracing = "0.1" tracing-panic = "0.1" -tracing-subscriber = { version = "0.3", features = ["env-filter", "registry", "fmt"] } +tracing-subscriber = { version = "0.3", features = [ + "env-filter", + "registry", + "fmt", +] } {% unless template_type == "minimal" -%} -uuid = { version = "1.6", features = ["serde"] } +uuid = { version = "1.18", features = ["serde"] } {%- endunless %} serde_json = { version = "1.0", optional = true } thiserror = "2.0" tower = { version = "0.5", features = ["util"], optional = true } -hyper = { version = "1.0", features = ["full"], optional = true } +hyper = { version = "1.7", features = ["full"], optional = true } {% unless template_type == "minimal" -%} validator = "0.20" {%- endunless %} From 62974a7d5ebcf9b1641ac21c3a30337540c44adb Mon Sep 17 00:00:00 2001 From: Zak Knudsen <7200184+dotZak@users.noreply.github.com> Date: Fri, 17 Oct 2025 16:03:09 +0200 Subject: [PATCH 5/5] Bump version to `0.0.8`. --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 13530c27..7b1a5f74 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -658,7 +658,7 @@ dependencies = [ [[package]] name = "gerust" -version = "0.0.7" +version = "0.0.8" dependencies = [ "anyhow", "cargo-generate", diff --git a/Cargo.toml b/Cargo.toml index 67ff43fa..1d4e26f0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "gerust" -version = "0.0.7" +version = "0.0.8" edition = "2024" authors = ["Marco Otte-Witte "] description = "Gerust takes care of the accidental complexity of Rust backend projects so you can stay focused on what matters."