diff --git a/README.md b/README.md index cc4787653..34745779d 100644 --- a/README.md +++ b/README.md @@ -102,7 +102,7 @@ Jacquard is broken up into several crates for modularity. The correct one to use Highlights: - A ton of new lexicons included in `jacquard-api` -- `jacquard-axum` Axum extractor and a number of improvements to lifetimes and (de)serialization required to make that work (thanks [@thoth.ptnote.dev] for helping provide feedback and sample code to test against) +- `jacquard-axum` Axum extractor and a number of improvements to lifetimes and (de)serialization required to make that work (thanks [@thoth.ptnote.dev](https://tangled.org/@thoth.ptnote.dev) for helping provide feedback and sample code to test against) - `from_data`, `from_raw_data`, `to_data`, and `to_raw_data` to serialize to and deserialize from the loosely typed value data formats (think `serde_json::from_value` and company). Particularly useful for second-stage deserialization of type "unknown" fields in lexicons, such as `PostView.record`. - better API code generation diff --git a/crates/jacquard-api/Cargo.toml b/crates/jacquard-api/Cargo.toml index ab2bfa29e..0afdae3b9 100644 --- a/crates/jacquard-api/Cargo.toml +++ b/crates/jacquard-api/Cargo.toml @@ -17,8 +17,8 @@ features = [ "bluesky", "other", "lexicon_community", "ufos" ] [dependencies] bon.workspace = true bytes = { workspace = true, features = ["serde"] } -jacquard-common = { version = "*", path = "../jacquard-common" } -jacquard-derive = { version = "*", path = "../jacquard-derive" } +jacquard-common = { version = "0.4", path = "../jacquard-common" } +jacquard-derive = { version = "0.4", path = "../jacquard-derive" } miette.workspace = true serde.workspace = true thiserror.workspace = true diff --git a/crates/jacquard-axum/Cargo.toml b/crates/jacquard-axum/Cargo.toml index 3d149c290..968c546ab 100644 --- a/crates/jacquard-axum/Cargo.toml +++ b/crates/jacquard-axum/Cargo.toml @@ -24,8 +24,8 @@ path = "src/main.rs" axum = "0.8.6" axum-macros = "0.5.0" bytes.workspace = true -jacquard = { version = "*", path = "../jacquard" } -jacquard-common = { version = "*", path = "../jacquard-common", features = ["reqwest-client"] } +jacquard = { version = "0.4", path = "../jacquard" } +jacquard-common = { version = "0.4", path = "../jacquard-common", features = ["reqwest-client"] } miette.workspace = true serde.workspace = true serde_html_form.workspace = true diff --git a/crates/jacquard-derive/Cargo.toml b/crates/jacquard-derive/Cargo.toml index f2cfecc3a..5deaa5d12 100644 --- a/crates/jacquard-derive/Cargo.toml +++ b/crates/jacquard-derive/Cargo.toml @@ -28,4 +28,4 @@ syn.workspace = true [dev-dependencies] -jacquard-common = { version = "*", path = "../jacquard-common" } +jacquard-common = { version = "0.4", path = "../jacquard-common" } diff --git a/crates/jacquard-identity/Cargo.toml b/crates/jacquard-identity/Cargo.toml index 322360101..5a481e6d8 100644 --- a/crates/jacquard-identity/Cargo.toml +++ b/crates/jacquard-identity/Cargo.toml @@ -19,8 +19,8 @@ dns = ["dep:hickory-resolver"] async-trait.workspace = true bon.workspace = true bytes.workspace = true -jacquard-common = { version = "*", path = "../jacquard-common", features = ["reqwest-client"] } -jacquard-api = { version = "*", path = "../jacquard-api" } +jacquard-common = { version = "0.4", path = "../jacquard-common", features = ["reqwest-client"] } +jacquard-api = { version = "0.4", path = "../jacquard-api" } percent-encoding.workspace = true reqwest.workspace = true url.workspace = true diff --git a/crates/jacquard-lexicon/Cargo.toml b/crates/jacquard-lexicon/Cargo.toml index 13eeeeceb..814269c85 100644 --- a/crates/jacquard-lexicon/Cargo.toml +++ b/crates/jacquard-lexicon/Cargo.toml @@ -25,9 +25,9 @@ clap.workspace = true glob = "0.3" heck.workspace = true itertools.workspace = true -jacquard-api = { version = "*", path = "../jacquard-api" } -jacquard-common = { version = "*", path = "../jacquard-common" } -jacquard-identity = { version = "*", path = "../jacquard-identity" } +jacquard-api = { version = "0.4", path = "../jacquard-api" } +jacquard-common = { version = "0.4", path = "../jacquard-common" } +jacquard-identity = { version = "0.4", path = "../jacquard-identity" } kdl = "6" miette = { workspace = true, features = ["fancy"] } prettyplease.workspace = true diff --git a/crates/jacquard-oauth/Cargo.toml b/crates/jacquard-oauth/Cargo.toml index 157d5c02f..cc6b68468 100644 --- a/crates/jacquard-oauth/Cargo.toml +++ b/crates/jacquard-oauth/Cargo.toml @@ -12,8 +12,8 @@ exclude.workspace = true license.workspace = true [dependencies] -jacquard-common = { version = "*", path = "../jacquard-common", features = ["reqwest-client"] } -jacquard-identity = { version = "*", path = "../jacquard-identity" } +jacquard-common = { version = "0.4", path = "../jacquard-common", features = ["reqwest-client"] } +jacquard-identity = { version = "0.4", path = "../jacquard-identity" } serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } url = { workspace = true } diff --git a/crates/jacquard/Cargo.toml b/crates/jacquard/Cargo.toml index 6a671010f..e70c85e65 100644 --- a/crates/jacquard/Cargo.toml +++ b/crates/jacquard/Cargo.toml @@ -33,11 +33,11 @@ path = "src/main.rs" [dependencies] -jacquard-api = { version = "*", path = "../jacquard-api" } -jacquard-common = { version = "*", path = "../jacquard-common", features = ["reqwest-client"] } -jacquard-oauth = { version = "*", path = "../jacquard-oauth" } -jacquard-derive = { version = "*", path = "../jacquard-derive", optional = true } -jacquard-identity = { version = "*", path = "../jacquard-identity" } +jacquard-api = { version = "0.4", path = "../jacquard-api" } +jacquard-common = { version = "0.4", path = "../jacquard-common", features = ["reqwest-client"] } +jacquard-oauth = { version = "0.4", path = "../jacquard-oauth" } +jacquard-derive = { version = "0.4", path = "../jacquard-derive", optional = true } +jacquard-identity = { version = "0.4", path = "../jacquard-identity" } bon.workspace = true async-trait.workspace = true diff --git a/nix/modules/rust.nix b/nix/modules/rust.nix index 854357ee9..75df3b3ba 100644 --- a/nix/modules/rust.nix +++ b/nix/modules/rust.nix @@ -91,6 +91,36 @@ }; }; }; + "jacquard-identity" = { + imports = [globalCrateConfig]; + autoWire = ["crate" "clippy"]; + path = ./../../crates/jacquard-identity; + crane = { + args = { + buildInputs = commonBuildInputs; + }; + }; + }; + "jacquard-oauth" = { + imports = [globalCrateConfig]; + autoWire = ["crate" "clippy"]; + path = ./../../crates/jacquard-oauth; + crane = { + args = { + buildInputs = commonBuildInputs; + }; + }; + }; + "jacquard-axum" = { + imports = [globalCrateConfig]; + autoWire = ["crate" "clippy"]; + path = ./../../crates/jacquard-axum; + crane = { + args = { + buildInputs = commonBuildInputs; + }; + }; + }; }; }; packages.default = self'.packages.jacquard;